From 073357cfca13ca61032ac30c0c676e3c15fb005a Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Tue, 13 Nov 2012 13:01:26 -0800
Subject: [PATCH 01/76] Bug 809661 - Need a speedy way to construct a thread
 list for SMS messages. r=sicking

---
 dom/sms/Makefile.in                          |   2 +-
 dom/sms/interfaces/nsIDOMSmsManager.idl      |   4 +-
 dom/sms/interfaces/nsISmsDatabaseService.idl |   4 +-
 dom/sms/interfaces/nsISmsRequest.idl         |  14 +-
 dom/sms/src/SmsManager.cpp                   |  14 +
 dom/sms/src/SmsRequest.cpp                   | 151 ++++++++++-
 dom/sms/src/SmsRequest.h                     |  21 +-
 dom/sms/src/android/SmsDatabaseService.cpp   |   7 +
 dom/sms/src/fallback/SmsDatabaseService.cpp  |   7 +
 dom/sms/src/ipc/PSms.ipdl                    |   5 +
 dom/sms/src/ipc/PSmsRequest.ipdl             |  20 ++
 dom/sms/src/ipc/SmsChild.cpp                 |   8 +
 dom/sms/src/ipc/SmsIPCService.cpp            |   7 +
 dom/sms/src/ipc/SmsParent.cpp                |  17 ++
 dom/sms/src/ipc/SmsParent.h                  |   3 +
 dom/sms/src/ril/SmsDatabaseService.js        | 262 +++++++++++++++----
 js/xpconnect/src/dictionary_helper_gen.conf  |   3 +-
 17 files changed, 492 insertions(+), 57 deletions(-)

diff --git a/dom/sms/Makefile.in b/dom/sms/Makefile.in
index 8196e39412c6..14338d78479a 100644
--- a/dom/sms/Makefile.in
+++ b/dom/sms/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PARALLEL_DIRS = interfaces src
+DIRS = interfaces src
 
 TEST_DIRS += tests
 ifdef ENABLE_TESTS
diff --git a/dom/sms/interfaces/nsIDOMSmsManager.idl b/dom/sms/interfaces/nsIDOMSmsManager.idl
index a6ce0e457df5..36eca7954a43 100644
--- a/dom/sms/interfaces/nsIDOMSmsManager.idl
+++ b/dom/sms/interfaces/nsIDOMSmsManager.idl
@@ -8,7 +8,7 @@ interface nsIDOMEventListener;
 interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 
-[scriptable, builtinclass, uuid(1bee1224-56a2-4935-af7b-0011746306cb)]
+[scriptable, builtinclass, uuid(caaf5c38-a730-4dbb-a0f0-12384bfac8e3)]
 interface nsIDOMMozSmsManager : nsIDOMEventTarget
 {
   unsigned short getNumberOfMessagesForText(in DOMString text);
@@ -29,6 +29,8 @@ interface nsIDOMMozSmsManager : nsIDOMEventTarget
 
   nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue);
 
+  nsIDOMMozSmsRequest getThreadList();
+
   [implicit_jscontext] attribute jsval onreceived;
   [implicit_jscontext] attribute jsval onsent;
   [implicit_jscontext] attribute jsval ondeliverysuccess;
diff --git a/dom/sms/interfaces/nsISmsDatabaseService.idl b/dom/sms/interfaces/nsISmsDatabaseService.idl
index 157f0462c13a..cff1a6d8550d 100644
--- a/dom/sms/interfaces/nsISmsDatabaseService.idl
+++ b/dom/sms/interfaces/nsISmsDatabaseService.idl
@@ -14,7 +14,7 @@
 interface nsIDOMMozSmsFilter;
 interface nsISmsRequest;
 
-[scriptable, uuid(6ad55465-6937-4491-93ca-29dad9775d46)]
+[scriptable, uuid(c2cb2af7-6b96-4915-bcc8-54ad705d6110)]
 interface nsISmsDatabaseService : nsISupports
 {
   // Takes some information required to save the message and returns its id.
@@ -30,4 +30,6 @@ interface nsISmsDatabaseService : nsISupports
   void getNextMessageInList(in long listId, in nsISmsRequest request);
   void clearMessageList(in long listId);
   void markMessageRead(in long messageId, in boolean value, in nsISmsRequest request);
+
+  void getThreadList(in nsISmsRequest request);
 };
diff --git a/dom/sms/interfaces/nsISmsRequest.idl b/dom/sms/interfaces/nsISmsRequest.idl
index 8ce490fcf6a9..993cb43ae2a1 100644
--- a/dom/sms/interfaces/nsISmsRequest.idl
+++ b/dom/sms/interfaces/nsISmsRequest.idl
@@ -6,7 +6,15 @@
 
 interface nsIDOMMozSmsMessage;
 
-[scriptable, builtinclass, uuid(97067327-64b9-4e26-848b-59e443c55db9)]
+dictionary SmsThreadListItem
+{
+  DOMString senderOrReceiver;
+  unsigned long long timestamp;
+  DOMString body;
+  unsigned long long unreadCount;
+};
+
+[scriptable, builtinclass, uuid(82a6d16d-cf33-4745-8662-8b5d441f512f)]
 interface nsISmsRequest : nsISupports
 {
   /**
@@ -37,4 +45,8 @@ interface nsISmsRequest : nsISupports
 
   void notifyMessageMarkedRead(in boolean read);
   void notifyMarkMessageReadFailed(in long error);
+
+  [implicit_jscontext]
+  void notifyThreadList(in jsval threadList);
+  void notifyThreadListFailed(in long error);
 };
diff --git a/dom/sms/src/SmsManager.cpp b/dom/sms/src/SmsManager.cpp
index 40493d00aebf..d022cc680fb2 100644
--- a/dom/sms/src/SmsManager.cpp
+++ b/dom/sms/src/SmsManager.cpp
@@ -303,6 +303,20 @@ SmsManager::MarkMessageRead(int32_t aId, bool aValue,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+SmsManager::GetThreadList(nsIDOMMozSmsRequest** aRequest)
+{
+  nsCOMPtr<nsIDOMMozSmsRequest> req = SmsRequest::Create(this);
+  nsCOMPtr<nsISmsDatabaseService> smsDBService =
+    do_GetService(SMS_DATABASE_SERVICE_CONTRACTID);
+  NS_ENSURE_TRUE(smsDBService, NS_ERROR_FAILURE);
+  nsCOMPtr<nsISmsRequest> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  smsDBService->GetThreadList(forwarder);
+  req.forget(aRequest);
+  return NS_OK;
+}
+
 nsresult
 SmsManager::DispatchTrustedSmsEventToSelf(const nsAString& aEventName, nsIDOMMozSmsMessage* aMessage)
 {
diff --git a/dom/sms/src/SmsRequest.cpp b/dom/sms/src/SmsRequest.cpp
index 2630e499c65c..6ca0f6de3a70 100644
--- a/dom/sms/src/SmsRequest.cpp
+++ b/dom/sms/src/SmsRequest.cpp
@@ -9,11 +9,16 @@
 #include "nsDOMString.h"
 #include "nsContentUtils.h"
 #include "nsIDOMSmsMessage.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsPIDOMWindow.h"
 #include "SmsCursor.h"
 #include "SmsMessage.h"
 #include "SmsManager.h"
 #include "mozilla/dom/DOMError.h"
 #include "SmsParent.h"
+#include "jsapi.h"
+#include "DictionaryHelpers.h"
+#include "xpcpublic.h"
 
 #define SUCCESS_EVENT_NAME NS_LITERAL_STRING("success")
 #define ERROR_EVENT_NAME   NS_LITERAL_STRING("error")
@@ -145,12 +150,7 @@ SmsRequest::SetSuccess(nsIDOMMozSmsMessage* aMessage)
 void
 SmsRequest::SetSuccess(bool aResult)
 {
-  NS_PRECONDITION(!mDone, "mDone shouldn't have been set to true already!");
-  NS_PRECONDITION(!mError, "mError shouldn't have been set!");
-  NS_PRECONDITION(mResult == JSVAL_NULL, "mResult shouldn't have been set!");
-
-  mResult.setBoolean(aResult);
-  mDone = true;
+  SetSuccess(aResult ? JSVAL_TRUE : JSVAL_FALSE);
 }
 
 void
@@ -168,6 +168,17 @@ SmsRequest::SetSuccess(nsIDOMMozSmsCursor* aCursor)
   }
 }
 
+void
+SmsRequest::SetSuccess(const jsval& aResult)
+{
+  NS_PRECONDITION(!mDone, "mDone shouldn't have been set to true already!");
+  NS_PRECONDITION(!mError, "mError shouldn't have been set!");
+  NS_PRECONDITION(JSVAL_IS_VOID(mResult), "mResult shouldn't have been set!");
+
+  mResult = aResult;
+  mDone = true;
+}
+
 bool
 SmsRequest::SetSuccessInternal(nsISupports* aObject)
 {
@@ -445,6 +456,134 @@ SmsRequest::NotifyMarkMessageReadFailed(int32_t aError)
   return NotifyError(aError);
 }
 
+NS_IMETHODIMP
+SmsRequest::NotifyThreadList(const jsval& aThreadList, JSContext* aCx)
+{
+  MOZ_ASSERT(aThreadList.isObject());
+
+  if (mParent) {
+    JSObject* array = const_cast<JSObject*>(&aThreadList.toObject());
+
+    uint32_t length;
+    bool ok = JS_GetArrayLength(aCx, array, &length);
+    NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+    ReplyThreadList reply;
+    InfallibleTArray<ThreadListItem>& ipcItems = reply.items();
+
+    if (length) {
+      ipcItems.SetCapacity(length);
+
+      for (uint32_t i = 0; i < length; i++) {
+        jsval arrayEntry;
+        ok = JS_GetElement(aCx, array, i, &arrayEntry);
+        NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+        MOZ_ASSERT(arrayEntry.isObject());
+
+        SmsThreadListItem item;
+        nsresult rv = item.Init(aCx, &arrayEntry);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        ThreadListItem* ipcItem = ipcItems.AppendElement();
+        ipcItem->senderOrReceiver() = item.senderOrReceiver;
+        ipcItem->timestamp() = item.timestamp;
+        ipcItem->body() = item.body;
+        ipcItem->unreadCount() = item.unreadCount;
+      }
+    }
+
+    return SendMessageReply(reply);
+  }
+
+  return NotifySuccess(aThreadList);
+}
+
+NS_IMETHODIMP
+SmsRequest::NotifyThreadListFailed(int32_t aError)
+{
+  if (mParent) {
+    return SendMessageReply(MessageReply(ReplyThreadListFail(aError)));
+  }
+  return NotifyError(aError);
+}
+
+void
+SmsRequest::NotifyThreadList(const InfallibleTArray<ThreadListItem>& aItems)
+{
+  MOZ_ASSERT(!mParent);
+  MOZ_ASSERT(GetOwner());
+
+  nsresult rv;
+  nsIScriptContext* sc = GetContextForEventHandlers(&rv);
+  NS_ENSURE_SUCCESS_VOID(rv);
+  NS_ENSURE_TRUE_VOID(sc);
+
+  JSContext* cx = sc->GetNativeContext();
+  MOZ_ASSERT(cx);
+
+  nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(GetOwner());
+
+  JSObject* ownerObj = sgo->GetGlobalJSObject();
+  NS_ENSURE_TRUE_VOID(ownerObj);
+
+  nsCxPusher pusher;
+  NS_ENSURE_TRUE_VOID(pusher.Push(cx, false));
+
+  JSAutoRequest ar(cx);
+  JSAutoCompartment ac(cx, ownerObj);
+
+  JSObject* array = JS_NewArrayObject(cx, aItems.Length(), nullptr);
+  NS_ENSURE_TRUE_VOID(array);
+
+  bool ok;
+
+  for (uint32_t i = 0; i < aItems.Length(); i++) {
+    const ThreadListItem& source = aItems[i];
+
+    nsString temp = source.senderOrReceiver();
+
+    jsval senderOrReceiver;
+    ok = xpc::StringToJsval(cx, temp, &senderOrReceiver);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    JSObject* timestampObj = JS_NewDateObjectMsec(cx, source.timestamp());
+    NS_ENSURE_TRUE_VOID(timestampObj);
+
+    jsval timestamp = OBJECT_TO_JSVAL(timestampObj);
+
+    temp = source.body();
+
+    jsval body;
+    ok = xpc::StringToJsval(cx, temp, &body);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    jsval unreadCount = JS_NumberValue(double(source.unreadCount()));
+
+    JSObject* elementObj = JS_NewObject(cx, nullptr, nullptr, nullptr);
+    NS_ENSURE_TRUE_VOID(elementObj);
+
+    ok = JS_SetProperty(cx, elementObj, "senderOrReceiver", &senderOrReceiver);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    ok = JS_SetProperty(cx, elementObj, "timestamp", &timestamp);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    ok = JS_SetProperty(cx, elementObj, "body", &body);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    ok = JS_SetProperty(cx, elementObj, "unreadCount", &unreadCount);
+    NS_ENSURE_TRUE_VOID(ok);
+
+    jsval element = OBJECT_TO_JSVAL(elementObj);
+
+    ok = JS_SetElement(cx, array, i, &element);
+    NS_ENSURE_TRUE_VOID(ok);
+  }
+
+  NotifyThreadList(OBJECT_TO_JSVAL(array), cx);
+}
+
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/SmsRequest.h b/dom/sms/src/SmsRequest.h
index e27cf80b005a..7abe4b1b9809 100644
--- a/dom/sms/src/SmsRequest.h
+++ b/dom/sms/src/SmsRequest.h
@@ -17,24 +17,33 @@ namespace mozilla {
 namespace dom {
 namespace sms {
 
+class SmsRequestChild;
 class SmsRequestParent;
 class MessageReply;
+class ThreadListItem;
 
 // We need this forwarder to avoid a QI to nsIClassInfo.
 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=775997#c51 
 class SmsRequestForwarder : public nsISmsRequest
 {
-  NS_FORWARD_NSISMSREQUEST(mRealRequest->)
+  friend class SmsRequestChild;
 
+public:
   NS_DECL_ISUPPORTS
+  NS_FORWARD_NSISMSREQUEST(mRealRequest->)
 
   SmsRequestForwarder(nsISmsRequest* aRealRequest) {
     mRealRequest = aRealRequest;
   }
+
+private:
   virtual
   ~SmsRequestForwarder() {}
 
-private:
+  nsISmsRequest* GetRealRequest() {
+    return mRealRequest;
+  }
+
   nsCOMPtr<nsISmsRequest> mRealRequest;
 };
 
@@ -66,6 +75,9 @@ public:
     mParentAlive = false;
   }
 
+  void
+  NotifyThreadList(const InfallibleTArray<ThreadListItem>& aItems);
+
 private:
   SmsRequest() MOZ_DELETE;
 
@@ -100,6 +112,11 @@ private:
    */
   void SetSuccess(nsIDOMMozSmsCursor* aCursor);
 
+  /**
+   * Set the object in a success state with the result being the given jsval.
+   */
+  void SetSuccess(const jsval& aVal);
+
   /**
    * Set the object in an error state with the error type being aError.
    */
diff --git a/dom/sms/src/android/SmsDatabaseService.cpp b/dom/sms/src/android/SmsDatabaseService.cpp
index b68ad3233c77..bcf527f1e868 100644
--- a/dom/sms/src/android/SmsDatabaseService.cpp
+++ b/dom/sms/src/android/SmsDatabaseService.cpp
@@ -112,6 +112,13 @@ SmsDatabaseService::MarkMessageRead(int32_t aMessageId, bool aValue,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+SmsDatabaseService::GetThreadList(nsISmsRequest* aRequest)
+{
+  NS_NOTYETIMPLEMENTED("Implement me!");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/fallback/SmsDatabaseService.cpp b/dom/sms/src/fallback/SmsDatabaseService.cpp
index cb66dbf36432..35b0e69095e4 100644
--- a/dom/sms/src/fallback/SmsDatabaseService.cpp
+++ b/dom/sms/src/fallback/SmsDatabaseService.cpp
@@ -90,6 +90,13 @@ SmsDatabaseService::MarkMessageRead(int32_t aMessageId,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+SmsDatabaseService::GetThreadList(nsISmsRequest* aRequest)
+{
+  NS_ERROR("We should not be here!");
+  return NS_OK;
+}
+
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/PSms.ipdl b/dom/sms/src/ipc/PSms.ipdl
index 9059832425c1..139d8b75d3c3 100644
--- a/dom/sms/src/ipc/PSms.ipdl
+++ b/dom/sms/src/ipc/PSms.ipdl
@@ -53,6 +53,10 @@ struct MarkMessageReadRequest
   bool value;
 };
 
+struct GetThreadListRequest
+{
+};
+
 union IPCSmsRequest
 {
   SendMessageRequest;
@@ -61,6 +65,7 @@ union IPCSmsRequest
   CreateMessageListRequest;
   GetNextMessageInListRequest;
   MarkMessageReadRequest;
+  GetThreadListRequest;
 };
 
 sync protocol PSms {
diff --git a/dom/sms/src/ipc/PSmsRequest.ipdl b/dom/sms/src/ipc/PSmsRequest.ipdl
index ef4b9b40d83e..6949eea9b473 100644
--- a/dom/sms/src/ipc/PSmsRequest.ipdl
+++ b/dom/sms/src/ipc/PSmsRequest.ipdl
@@ -85,6 +85,24 @@ struct ReplyNoMessageInList
 {
 };
 
+struct ThreadListItem
+{
+  nsString senderOrReceiver;
+  uint64_t timestamp;
+  nsString body;
+  uint64_t unreadCount;
+};
+
+struct ReplyThreadList
+{
+  ThreadListItem[] items;
+};
+
+struct ReplyThreadListFail
+{
+  int32_t error;
+};
+
 union MessageReply
 {
   ReplyMessageSend;
@@ -99,6 +117,8 @@ union MessageReply
   ReplyGetNextMessage;
   ReplyMarkeMessageRead;
   ReplyMarkeMessageReadFail;
+  ReplyThreadList;
+  ReplyThreadListFail;
 };
 
 } // namespace sms
diff --git a/dom/sms/src/ipc/SmsChild.cpp b/dom/sms/src/ipc/SmsChild.cpp
index 1314267001c0..ada82e852e86 100644
--- a/dom/sms/src/ipc/SmsChild.cpp
+++ b/dom/sms/src/ipc/SmsChild.cpp
@@ -161,6 +161,14 @@ SmsRequestChild::Recv__delete__(const MessageReply& aReply)
     case MessageReply::TReplyMarkeMessageReadFail:
       mReplyRequest->NotifyMarkMessageReadFailed(aReply.get_ReplyMarkeMessageReadFail().error());
       break;
+    case MessageReply::TReplyThreadList: {
+      SmsRequestForwarder* forwarder = static_cast<SmsRequestForwarder*>(mReplyRequest.get());
+      SmsRequest* request = static_cast<SmsRequest*>(forwarder->GetRealRequest());
+      request->NotifyThreadList(aReply.get_ReplyThreadList().items());
+    } break;
+    case MessageReply::TReplyThreadListFail:
+      mReplyRequest->NotifyThreadListFailed(aReply.get_ReplyThreadListFail().error());
+      break;
     default:
       MOZ_NOT_REACHED("Received invalid response parameters!");
       return false;
diff --git a/dom/sms/src/ipc/SmsIPCService.cpp b/dom/sms/src/ipc/SmsIPCService.cpp
index a700669acc42..b1b2cde7691a 100644
--- a/dom/sms/src/ipc/SmsIPCService.cpp
+++ b/dom/sms/src/ipc/SmsIPCService.cpp
@@ -179,6 +179,13 @@ SmsIPCService::MarkMessageRead(int32_t aMessageId,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+SmsIPCService::GetThreadList(nsISmsRequest* aRequest)
+{
+  SendRequest(GetThreadListRequest(), aRequest);
+  return NS_OK;
+}
+
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/SmsParent.cpp b/dom/sms/src/ipc/SmsParent.cpp
index aabf3ebdd4e3..caf1d17e8361 100644
--- a/dom/sms/src/ipc/SmsParent.cpp
+++ b/dom/sms/src/ipc/SmsParent.cpp
@@ -203,6 +203,8 @@ SmsParent::RecvPSmsRequestConstructor(PSmsRequestParent* aActor,
       return actor->DoRequest(aRequest.get_GetNextMessageInListRequest());
     case IPCSmsRequest::TMarkMessageReadRequest:
       return actor->DoRequest(aRequest.get_MarkMessageReadRequest());
+    case IPCSmsRequest::TGetThreadListRequest:
+      return actor->DoRequest(aRequest.get_GetThreadListRequest());
     default:
       MOZ_NOT_REACHED("Unknown type!");
       return false;
@@ -347,6 +349,21 @@ SmsRequestParent::DoRequest(const MarkMessageReadRequest& aRequest)
   return true;
 }
 
+bool
+SmsRequestParent::DoRequest(const GetThreadListRequest& aRequest)
+{
+  nsCOMPtr<nsISmsDatabaseService> smsDBService =
+    do_GetService(SMS_DATABASE_SERVICE_CONTRACTID);
+
+  NS_ENSURE_TRUE(smsDBService, true);
+  mSmsRequest = SmsRequest::Create(this);
+  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsresult rv = smsDBService->GetThreadList(forwarder);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  return true;
+}
+
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/SmsParent.h b/dom/sms/src/ipc/SmsParent.h
index d791c55560ee..82ebae78856b 100644
--- a/dom/sms/src/ipc/SmsParent.h
+++ b/dom/sms/src/ipc/SmsParent.h
@@ -103,6 +103,9 @@ protected:
 
   bool
   DoRequest(const MarkMessageReadRequest& aRequest);
+
+  bool
+  DoRequest(const GetThreadListRequest& aRequest);
 };
 
 } // namespace sms
diff --git a/dom/sms/src/ril/SmsDatabaseService.js b/dom/sms/src/ril/SmsDatabaseService.js
index 0511fd34d869..c61fb1ac798e 100644
--- a/dom/sms/src/ril/SmsDatabaseService.js
+++ b/dom/sms/src/ril/SmsDatabaseService.js
@@ -14,8 +14,9 @@ const RIL_SMSDATABASESERVICE_CID = Components.ID("{a1fa610c-eb6c-4ac2-878f-b005d
 
 const DEBUG = false;
 const DB_NAME = "sms";
-const DB_VERSION = 3;
+const DB_VERSION = 4;
 const STORE_NAME = "sms";
+const MOST_RECENT_STORE_NAME = "most-recent";
 
 const DELIVERY_SENT = "sent";
 const DELIVERY_RECEIVED = "received";
@@ -52,6 +53,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "gIDBManager",
 
 const GLOBAL_SCOPE = this;
 
+function numberFromMessage(message) {
+  return message.delivery == DELIVERY_SENT ? message.receiver : message.sender;
+}
+
 /**
  * SmsDatabaseService
  */
@@ -176,6 +181,10 @@ SmsDatabaseService.prototype = {
             objectStore = event.target.transaction.objectStore(STORE_NAME);
             self.upgradeSchema2(objectStore);
             break;
+          case 3:
+            if (DEBUG) debug("Upgrade to version 4. Add quick threads view.")
+            self.upgradeSchema3(event.target.transaction);
+            break;
           default:
             event.target.transaction.abort();
             callback("Old database version: " + event.oldVersion, null);
@@ -183,7 +192,7 @@ SmsDatabaseService.prototype = {
         }
         currentVersion++;
       }
-    };
+    }
     request.onerror = function (event) {
       //TODO look at event.target.Code and change error constant accordingly
       callback("Error opening database!", null);
@@ -201,15 +210,22 @@ SmsDatabaseService.prototype = {
    * @param callback
    *        Function to call when the transaction is available. It will
    *        be invoked with the transaction and the 'sms' object store.
+   * @param objectStores
+   *        Function to call when the transaction is available. It will
+   *        be invoked with the transaction and the 'sms' object store.
    */
-  newTxn: function newTxn(txn_type, callback) {
+  newTxn: function newTxn(txn_type, callback, objectStores) {
+    if (!objectStores) {
+      objectStores = [STORE_NAME];
+    }
+    if (DEBUG) debug("Opening transaction for objectStores: " + objectStores);
     this.ensureDB(function (error, db) {
       if (error) {
         if (DEBUG) debug("Could not open database: " + error);
         callback(error);
         return;
       }
-      let txn = db.transaction([STORE_NAME], txn_type);
+      let txn = db.transaction(objectStores, txn_type);
       if (DEBUG) debug("Started transaction " + txn + " of type " + txn_type);
       if (DEBUG) {
         txn.oncomplete = function oncomplete(event) {
@@ -221,9 +237,18 @@ SmsDatabaseService.prototype = {
           debug("Error occurred during transaction: " + event.target.errorCode);
         };
       }
-      if (DEBUG) debug("Retrieving object store", STORE_NAME);
-      let store = txn.objectStore(STORE_NAME);
-      callback(null, txn, store);
+      let stores;
+      if (objectStores.length == 1) {
+        if (DEBUG) debug("Retrieving object store " + objectStores[0]);
+        stores = txn.objectStore(objectStores[0]);
+      } else {
+        stores = [];
+        for each (let storeName in objectStores) {
+          if (DEBUG) debug("Retrieving object store " + storeName);
+          stores.push(txn.objectStore(storeName));
+        }
+      }
+      callback(null, txn, stores);
     });
   },
 
@@ -234,8 +259,8 @@ SmsDatabaseService.prototype = {
    * TODO full text search on body???
    */
   createSchema: function createSchema(db) {
+    // This objectStore holds the main SMS data.
     let objectStore = db.createObjectStore(STORE_NAME, { keyPath: "id" });
-    objectStore.createIndex("id", "id", { unique: true });
     objectStore.createIndex("delivery", "delivery", { unique: false });
     objectStore.createIndex("sender", "sender", { unique: false });
     objectStore.createIndex("receiver", "receiver", { unique: false });
@@ -247,7 +272,6 @@ SmsDatabaseService.prototype = {
    * Upgrade to the corresponding database schema version.
    */
   upgradeSchema: function upgradeSchema(objectStore) {
-    // For now, the only possible upgrade is to version 2.
     objectStore.createIndex("read", "read", { unique: false });  
   },
 
@@ -266,6 +290,29 @@ SmsDatabaseService.prototype = {
     }
   },
 
+  upgradeSchema3: function upgradeSchema2(transaction) {
+    // Delete redundant "id" index.
+    let objectStore = transaction.objectStore(STORE_NAME);
+    if (objectStore.indexNames.contains("id")) {
+      objectStore.deleteIndex("id");
+    }
+
+    /**
+     * This objectStore can be used to quickly construct a thread view of the
+     * SMS database. Each entry looks like this:
+     *
+     * { senderOrReceiver: <String> (primary key),
+     *   id: <Number>,
+     *   timestamp: <Date>,
+     *   body: <String>,
+     *   unreadCount: <Number> }
+     *
+     */
+    objectStore = db.createObjectStore(MOST_RECENT_STORE_NAME,
+                                       { keyPath: "senderOrReceiver" });
+    objectStore.createIndex("timestamp", "timestamp");
+  },
+
   /**
    * Helper function to make the intersection of the partial result arrays
    * obtained within createMessageList.
@@ -355,12 +402,43 @@ SmsDatabaseService.prototype = {
     this.lastKey += 1;
     message.id = this.lastKey;
     if (DEBUG) debug("Going to store " + JSON.stringify(message));
-    this.newTxn(READ_WRITE, function(error, txn, store) {
+    this.newTxn(READ_WRITE, function(error, txn, stores) {
       if (error) {
         return;
       }
-      let request = store.put(message);
-    });
+      // First add to main objectStore.
+      stores[0].put(message);
+
+      let number = numberFromMessage(message);
+
+      // Next update the other objectStore.
+      stores[1].get(number).onsuccess = function(event) {
+        let mostRecentEntry = event.target.result;
+        if (mostRecentEntry) {
+          let needsUpdate = false;
+
+          if (mostRecentEntry.timestamp <= message.timestamp) {
+            mostRecentEntry.timestamp = message.timestamp;
+            mostRecentEntry.body = message.body;
+            needsUpdate = true;
+          }
+
+          if (!message.read) {
+            mostRecentEntry.unreadCount++;
+            needsUpdate = true;
+          }
+
+          if (needsUpdate) {
+            event.target.source.put(mostRecentEntry);
+          }
+        } else {
+          event.target.source.add({ senderOrReceiver: number,
+                                    timestamp: message.timestamp,
+                                    body: message.body,
+                                    unreadCount: message.read ? 0 : 1 });
+        }
+      }
+    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
     // We return the key that we expect to store in the db
     return message.id;
   },
@@ -500,33 +578,103 @@ SmsDatabaseService.prototype = {
   deleteMessage: function deleteMessage(messageId, aRequest) {
     let deleted = false;
     let self = this;
-    this.newTxn(READ_WRITE, function (error, txn, store) {
+    this.newTxn(READ_WRITE, function (error, txn, stores) {
       if (error) {
         aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
         return;
       }
-      let request = store.count(messageId);
-
-      request.onsuccess = function onsuccess(event) {        
-        let count = event.target.result;
-        if (DEBUG) debug("Count for messageId " + messageId + ": " + count);
-        deleted = (count == 1);
-        if (deleted) {
-          store.delete(messageId);
-        }
+      txn.onerror = function onerror(event) {
+        if (DEBUG) debug("Caught error on transaction", event.target.errorCode);
+        //TODO look at event.target.errorCode, pick appropriate error constant
+        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
       };
 
+      const smsStore = stores[0];
+      const mruStore = stores[1];
+
+      let deleted = false;
+
       txn.oncomplete = function oncomplete(event) {
         if (DEBUG) debug("Transaction " + txn + " completed.");
         aRequest.notifyMessageDeleted(deleted);
       };
 
-      txn.onerror = function onerror(event) {
-        if (DEBUG) debug("Caught error on transaction", event.target.errorCode);
-        //TODO look at event.target.errorCode, pick appropriate error constant
-        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      smsStore.get(messageId).onsuccess = function(event) {
+        let message = event.target.result;
+        if (message) {
+          if (DEBUG) debug("Deleting message id " + messageId);
+
+          // First actually delete the message.
+          event.target.source.delete(messageId).onsuccess = function(event) {
+            deleted = true;
+
+            // Then update unread count and most recent message.
+            let number = numberFromMessage(message);
+
+            mruStore.get(number).onsuccess = function(event) {
+              // This must exist.
+              let mostRecentEntry = event.target.result;
+
+              if (!message.read) {
+                mostRecentEntry.unreadCount--;
+              }
+
+              if (mostRecentEntry.id == messageId) {
+                // This sucks, we have to find a new most-recent message.
+                message = null;
+
+                // Check most recent sender.
+                smsStore.index("sender").openCursor(number, "prev").onsuccess = function(event) {
+                  let cursor = event.target.result;
+                  if (cursor) {
+                    message = cursor.value;
+                  }
+                };
+
+                // Check most recent receiver.
+                smsStore.index("receiver").openCursor(number, "prev").onsuccess = function(event) {
+                  let cursor = event.target.result;
+                  if (cursor) {
+                    if (!message || cursor.value.timeStamp > message.timestamp) {
+                      message = cursor.value;
+                    }
+                  }
+
+                  // If we found a new message then we need to update the data
+                  // in the most-recent store. Otherwise we can delete it.
+                  if (message) {
+                    mostRecentEntry.id = message.id;
+                    mostRecentEntry.timestamp = message.timestamp;
+                    mostRecentEntry.body = message.body;
+                    if (DEBUG) {
+                      debug("Updating mru entry: " +
+                            JSON.stringify(mostRecentEntry));
+                    }
+                    mruStore.put(mostRecentEntry);
+                  }
+                  else {
+                    if (DEBUG) {
+                      debug("Deleting mru entry for number '" + number + "'");
+                    }
+                    mruStore.delete(number);
+                  }
+                };
+              } else if (!message.read) {
+                // Shortcut, just update the unread count.
+                if (DEBUG) {
+                  debug("Updating unread count for number '" + number + "': " +
+                        (mostRecentEntry.unreadCount + 1) + " -> " +
+                        mostRecentEntry.unreadCount);
+                }
+                mruStore.put(mostRecentEntry);
+              }
+            };
+          };
+        } else if (DEBUG) {
+          debug("Message id " + messageId + " does not exist");
+        }
       };
-    });
+    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
   },
 
   createMessageList: function createMessageList(filter, reverse, aRequest) {
@@ -557,7 +705,7 @@ SmsDatabaseService.prototype = {
         if (DEBUG) {
           debug("These messages match the " + filter + " filter: " +
                 filteredKeys[filter]);
-      }
+        }
         return;
       }
       // The cursor primaryKey is stored in its corresponding partial array
@@ -727,18 +875,20 @@ SmsDatabaseService.prototype = {
 
   markMessageRead: function markMessageRead(messageId, value, aRequest) {
     if (DEBUG) debug("Setting message " + messageId + " read to " + value);
-    this.newTxn(READ_WRITE, function (error, txn, store) {
+    this.newTxn(READ_WRITE, function (error, txn, stores) {
       if (error) {
         if (DEBUG) debug(error);
         aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
         return;
       }
-      let getRequest = store.get(messageId);
-
-      getRequest.onsuccess = function onsuccess(event) {
+      txn.onerror = function onerror(event) {
+        if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
+        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      };
+      stores[0].get(messageId).onsuccess = function onsuccess(event) {
         let message = event.target.result;
-        if (DEBUG) debug("Message ID " + messageId + " not found");
         if (!message) {
+          if (DEBUG) debug("Message ID " + messageId + " not found");
           aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
           return;
         }
@@ -759,26 +909,50 @@ SmsDatabaseService.prototype = {
         }
         message.read = value ? FILTER_READ_READ : FILTER_READ_UNREAD;
         if (DEBUG) debug("Message.read set to: " + value);
-        let putRequest = store.put(message);
-        putRequest.onsuccess = function onsuccess(event) {
+        event.target.source.put(message).onsuccess = function onsuccess(event) {
           if (DEBUG) {
             debug("Update successfully completed. Message: " +
                   JSON.stringify(event.target.result));
           }
-          let checkRequest = store.get(message.id);
-          checkRequest.onsuccess = function onsuccess(event) {
-            aRequest.notifyMessageMarkedRead(event.target.result.read);
-          };
-        }
-      };
 
+          // Now update the unread count.
+          let number = numberFromMessage(message);
+
+          stores[1].get(number).onsuccess = function(event) {
+            let mostRecentEntry = event.target.result;
+            mostRecentEntry.unreadCount += value ? -1 : 1;
+            if (DEBUG) {
+              debug("Updating unreadCount for '" + number + "': " +
+                    (value ?
+                     mostRecentEntry.unreadCount + 1 :
+                     mostRecentEntry.unreadCount - 1) +
+                    " -> " + mostRecentEntry.unreadCount);
+            }
+            event.target.source.put(mostRecentEntry).onsuccess = function(event) {
+              aRequest.notifyMessageMarkedRead(message.read);
+            };
+          };
+        };
+      };
+    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
+  },
+  getThreadList: function getThreadList(aRequest) {
+    if (DEBUG) debug("Getting thread list");
+    this.newTxn(READ_ONLY, function (error, txn, store) {
+      if (error) {
+        if (DEBUG) debug(error);
+        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        return;
+      }
       txn.onerror = function onerror(event) {
         if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
-        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
       };
-    });
+      store.index("timestamp").mozGetAll().onsuccess = function(event) {
+        aRequest.notifyThreadList(event.target.result);
+      };
+    }, [MOST_RECENT_STORE_NAME]);
   }
-
 };
 
 XPCOMUtils.defineLazyGetter(SmsDatabaseService.prototype, "mRIL", function () {
diff --git a/js/xpconnect/src/dictionary_helper_gen.conf b/js/xpconnect/src/dictionary_helper_gen.conf
index ebb095ecd113..82103fd64697 100644
--- a/js/xpconnect/src/dictionary_helper_gen.conf
+++ b/js/xpconnect/src/dictionary_helper_gen.conf
@@ -21,7 +21,8 @@ dictionaries = [
      [ 'CameraSelector', 'nsIDOMCameraManager.idl' ],
      [ 'CameraPictureOptions', 'nsIDOMCameraManager.idl' ],
      [ 'CameraRecordingOptions', 'nsIDOMCameraManager.idl' ],
-     [ 'ArchiveReaderOptions', 'nsIDOMArchiveReader.idl' ]
+     [ 'ArchiveReaderOptions', 'nsIDOMArchiveReader.idl' ],
+     [ 'SmsThreadListItem', 'nsISmsRequest.idl' ]
    ]
 
 # include file names

From 44257757b56c1559a8a296e93882ba7622763bb2 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Tue, 13 Nov 2012 16:03:49 -0500
Subject: [PATCH 02/76] Bug 811120 - negative download times in stub installer
 pings. r=rstrong

---
 browser/installer/windows/nsis/defines.nsi.in |  2 +-
 browser/installer/windows/nsis/stub.nsi       | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index 0209bf45de76..01cc03baeb19 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -35,7 +35,7 @@
 !define BETA_UPDATE_CHANNEL
 !endif
 
-!define BaseURLStubPing "http://download-stats.mozilla.org/stub/v1/"
+!define BaseURLStubPing "http://download-stats.mozilla.org/stub/v2/"
 
 # NO_INSTDIR_FROM_REG is defined for pre-releases which have a PreReleaseSuffix
 # (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation
diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi
index 71cf1c812bd4..f77023427e1e 100644
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -68,6 +68,7 @@ Var TmpVal
 Var InstallCounterStep
 
 Var ExitCode
+Var DownloadStartTime
 Var SecondsToDownload
 Var ExistingProfile
 Var ExistingInstall
@@ -892,7 +893,7 @@ Function createInstall
   System::Int64Op $1 * 0x100000000
   Pop $1
   System::Int64Op $1 + $0
-  Pop $SecondsToDownload
+  Pop $DownloadStartTime
 
   ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS}
 
@@ -910,10 +911,8 @@ Function leaveInstall
 # Need a ping?
 FunctionEnd
 
-; This function is not idempotent. It calculates the amount of time between now
-; and $SecondsToDownload and stores the results back into $SecondsToDownload.
-; For that reason it should only be called once for the purpose of determining
-; the number of elapsed seconds to download.
+; GetSecondsToDownload calculates the amount of time between $DownloadStartTime
+; and now, and stores the results into $SecondsToDownload.
 Function GetSecondsToDownload
   GetTempFileName $2
   GetFileTime $2 $1 $0
@@ -922,9 +921,9 @@ Function GetSecondsToDownload
   Pop $1
   System::Int64Op $1 + $0
   Pop $0
-  System::Int64Op $0 - $SecondsToDownload
-  Pop $SecondsToDownload
-  System::Int64Op $SecondsToDownload / 10000000
+  System::Int64Op $0 - $DownloadStartTime
+  Pop $4
+  System::Int64Op $4 / 10000000
   Pop $SecondsToDownload
 FunctionEnd
 

From 478ddb2b2d83438be897fdd7c2606a04a0fff30a Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 13 Nov 2012 15:51:08 -0500
Subject: [PATCH 03/76] Bug 810959 - Reset text and selection before focus
 notification; r=cpeterson

---
 widget/android/nsWindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index af00d466df9a..9c64b17fdd28 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -2163,14 +2163,14 @@ nsWindow::OnIMEFocusChange(bool aFocus)
 {
     ALOGIME("IME: OnIMEFocusChange: f=%d", aFocus);
 
-    AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_FOCUSCHANGE, 
-                             int(aFocus));
-
     if (aFocus) {
         OnIMETextChange(0, INT32_MAX, INT32_MAX);
         OnIMESelectionChange();
     }
 
+    AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_FOCUSCHANGE,
+                             int(aFocus));
+
     return NS_OK;
 }
 

From 0eaf14c15c1743abc3bad56b3dd371923869bf95 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 13 Nov 2012 15:54:14 -0500
Subject: [PATCH 04/76] Bug 761287 - Follow-up to fix TableTicker.cpp bustage;
 r=ehsan

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

diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 2ad3448e20ba..79adfc0ffd42 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -834,7 +834,7 @@ void TableTicker::doBacktrace(ThreadProfile &aProfile, TickSample* aSample)
   // handle it correctly.
   unw_tdep_context_t *unw_ctx = reinterpret_cast<unw_tdep_context_t*> (&uc);
   mcontext_t& mcontext = reinterpret_cast<ucontext_t*> (aSample->context)->uc_mcontext;
-#define REPLACE_REG(num) unw_ctx->regs[num] = mcontext.gregs[R##num]
+#define REPLACE_REG(num) unw_ctx->regs[num] = (&mcontext.arm_r0)[num]
   REPLACE_REG(0);
   REPLACE_REG(1);
   REPLACE_REG(2);

From 60d882dbc279cd4e2b240d1ed3e9993b1665fb28 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Tue, 13 Nov 2012 13:28:22 -0800
Subject: [PATCH 05/76] No bug: Correct comment on type of argument to
 DebuggerTransport constructor. DONTBUILD r=dcamp on IRC

---
 toolkit/devtools/debugger/dbg-transport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/devtools/debugger/dbg-transport.js b/toolkit/devtools/debugger/dbg-transport.js
index 713379a8b373..9dcc20030620 100644
--- a/toolkit/devtools/debugger/dbg-transport.js
+++ b/toolkit/devtools/debugger/dbg-transport.js
@@ -14,7 +14,7 @@ Components.utils.import("resource://gre/modules/NetUtil.jsm");
  *
  * @param aInput nsIInputStream
  *        The input stream.
- * @param aOutput nsIOutputStream
+ * @param aOutput nsIAsyncOutputStream
  *        The output stream.
  *
  * Given a DebuggerTransport instance dt:

From ee58d7edd67fed10da09072243aa753767b51768 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Tue, 13 Nov 2012 16:55:02 -0500
Subject: [PATCH 06/76] Bug 801227: Patch v2 (unbitrotted) r=anant a=abillings

---
 dom/media/MediaManager.cpp | 58 ++++++++++++++++----------------------
 dom/media/MediaManager.h   |  7 +++--
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index fcd8cf47376c..0a07a084e571 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -229,7 +229,6 @@ public:
   GetUserMediaStreamRunnable(
     already_AddRefed<nsIDOMGetUserMediaSuccessCallback> aSuccess,
     already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError,
-    StreamListeners* aListeners,
     uint64_t aWindowID,
     MediaEngineSource* aAudioSource,
     MediaEngineSource* aVideoSource)
@@ -237,7 +236,6 @@ public:
     , mError(aError)
     , mAudioSource(aAudioSource)
     , mVideoSource(aVideoSource)
-    , mListeners(aListeners)
     , mWindowID(aWindowID) {}
 
   ~GetUserMediaStreamRunnable() {}
@@ -247,29 +245,29 @@ public:
   {
     NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
 
+    // We're on main-thread, and the windowlist can only
+    // be invalidated from the main-thread (see OnNavigation)
+    StreamListeners* listeners = MediaManager::Get()->GetWindowListeners(mWindowID);
+    if (!listeners) {
+      // This window is no longer live.
+      return NS_OK;
+    }
+
     // Create a media stream.
     nsRefPtr<nsDOMLocalMediaStream> stream;
     uint32_t hints = (mAudioSource ? nsDOMMediaStream::HINT_CONTENTS_AUDIO : 0);
     hints |= (mVideoSource ? nsDOMMediaStream::HINT_CONTENTS_VIDEO : 0);
 
     stream = nsDOMLocalMediaStream::CreateSourceStream(hints);
+    if (!stream) {
+      nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
+      LOG(("Returning error for getUserMedia() - no stream"));
+      error->OnError(NS_LITERAL_STRING("NO_STREAM"));
+      return NS_OK;
+    }
 
     nsPIDOMWindow *window = static_cast<nsPIDOMWindow*>
       (nsGlobalWindow::GetInnerWindowWithId(mWindowID));
-    {
-      if (!stream) {
-        if (!(MediaManager::Get()->IsWindowStillActive(mWindowID))) {
-          return NS_OK;
-        }
-        // This is safe since we're on main-thread, and the windowlist can only
-        // be invalidated from the main-thread (see OnNavigation)
-        nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
-        LOG(("Returning error for getUserMedia() - no stream"));
-        error->OnError(NS_LITERAL_STRING("NO_STREAM"));
-        return NS_OK;
-      }
-    }
-
     if (window && window->GetExtantDoc()) {
       stream->CombineWithPrincipal(window->GetExtantDoc()->NodePrincipal());
     }
@@ -287,7 +285,7 @@ public:
     stream->GetStream()->AddListener(listener);
 
     // No need for locking because we always do this in the main thread.
-    mListeners->AppendElement(listener);
+    listeners->AppendElement(listener);
 
     // Dispatch to the media thread to ask it to start the sources,
     // because that can take a while
@@ -316,7 +314,6 @@ private:
   already_AddRefed<nsIDOMGetUserMediaErrorCallback> mError;
   nsRefPtr<MediaEngineSource> mAudioSource;
   nsRefPtr<MediaEngineSource> mVideoSource;
-  StreamListeners* mListeners;
   uint64_t mWindowID;
 };
 
@@ -339,14 +336,12 @@ public:
   GetUserMediaRunnable(bool aAudio, bool aVideo, bool aPicture,
     already_AddRefed<nsIDOMGetUserMediaSuccessCallback> aSuccess,
     already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError,
-    StreamListeners* aListeners, uint64_t aWindowID,
-    MediaDevice* aAudioDevice, MediaDevice* aVideoDevice)
+    uint64_t aWindowID, MediaDevice* aAudioDevice, MediaDevice* aVideoDevice)
     : mAudio(aAudio)
     , mVideo(aVideo)
     , mPicture(aPicture)
     , mSuccess(aSuccess)
     , mError(aError)
-    , mListeners(aListeners)
     , mWindowID(aWindowID)
     , mDeviceChosen(true)
     , mBackendChosen(false)
@@ -362,13 +357,12 @@ public:
   GetUserMediaRunnable(bool aAudio, bool aVideo, bool aPicture,
     already_AddRefed<nsIDOMGetUserMediaSuccessCallback> aSuccess,
     already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError,
-    StreamListeners* aListeners, uint64_t aWindowID)
+    uint64_t aWindowID)
     : mAudio(aAudio)
     , mVideo(aVideo)
     , mPicture(aPicture)
     , mSuccess(aSuccess)
     , mError(aError)
-    , mListeners(aListeners)
     , mWindowID(aWindowID)
     , mDeviceChosen(false)
     , mBackendChosen(false) {}
@@ -380,13 +374,12 @@ public:
   GetUserMediaRunnable(bool aAudio, bool aVideo,
     already_AddRefed<nsIDOMGetUserMediaSuccessCallback> aSuccess,
     already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError,
-    StreamListeners* aListeners, uint64_t aWindowID, MediaEngine* aBackend)
+    uint64_t aWindowID, MediaEngine* aBackend)
     : mAudio(aAudio)
     , mVideo(aVideo)
     , mPicture(false)
     , mSuccess(aSuccess)
     , mError(aError)
-    , mListeners(aListeners)
     , mWindowID(aWindowID)
     , mDeviceChosen(false)
     , mBackendChosen(true)
@@ -571,7 +564,7 @@ public:
     }
 
     NS_DispatchToMainThread(new GetUserMediaStreamRunnable(
-      mSuccess, mError, mListeners, mWindowID, aAudioSource, aVideoSource
+      mSuccess, mError, mWindowID, aAudioSource, aVideoSource
     ));
     return;
   }
@@ -611,7 +604,6 @@ private:
 
   already_AddRefed<nsIDOMGetUserMediaSuccessCallback> mSuccess;
   already_AddRefed<nsIDOMGetUserMediaErrorCallback> mError;
-  StreamListeners* mListeners;
   uint64_t mWindowID;
   nsRefPtr<MediaDevice> mAudioDevice;
   nsRefPtr<MediaDevice> mVideoDevice;
@@ -824,22 +816,20 @@ MediaManager::GetUserMedia(bool aPrivileged, nsPIDOMWindow* aWindow,
   if (fake) {
     // Fake stream from default backend.
     gUMRunnable = new GetUserMediaRunnable(
-      audio, video, onSuccess.forget(), onError.forget(), listeners,
-      windowID, new MediaEngineDefault()
+      audio, video, onSuccess.forget(), onError.forget(), windowID,
+      new MediaEngineDefault()
                                            );
   } else if (audiodevice || videodevice) {
     // Stream from provided device.
     gUMRunnable = new GetUserMediaRunnable(
-      audio, video, picture, onSuccess.forget(), onError.forget(), listeners,
-      windowID,
+      audio, video, picture, onSuccess.forget(), onError.forget(), windowID,
       static_cast<MediaDevice*>(audiodevice.get()),
       static_cast<MediaDevice*>(videodevice.get())
                                            );
   } else {
     // Stream from default device from WebRTC backend.
     gUMRunnable = new GetUserMediaRunnable(
-      audio, video, picture, onSuccess.forget(), onError.forget(), listeners,
-      windowID
+      audio, video, picture, onSuccess.forget(), onError.forget(), windowID
                                            );
   }
 
@@ -948,7 +938,7 @@ MediaManager::OnNavigation(uint64_t aWindowID)
 
   // This is safe since we're on main-thread, and the windowlist can only
   // be added to from the main-thread (see OnNavigation)
-  StreamListeners* listeners = GetActiveWindows()->Get(aWindowID);
+  StreamListeners* listeners = GetWindowListeners(aWindowID);
   if (!listeners) {
     return;
   }
diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h
index 6a67588d299a..286c1cec436b 100644
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -294,10 +294,13 @@ public:
   NS_DECL_NSIOBSERVER
 
   MediaEngine* GetBackend();
-  bool IsWindowStillActive(uint64_t aWindowId) {
+  StreamListeners *GetWindowListeners(uint64_t aWindowId) {
     NS_ASSERTION(NS_IsMainThread(), "Only access windowlist on main thread");
 
-    return !!mActiveWindows.Get(aWindowId);
+    return mActiveWindows.Get(aWindowId);
+  }
+  bool IsWindowStillActive(uint64_t aWindowId) {
+    return !!GetWindowListeners(aWindowId);
   }
 
   nsresult GetUserMedia(bool aPrivileged, nsPIDOMWindow* aWindow,

From 0a85e5f5b07519a5fcef6b8577b368bff92107c9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 13 Nov 2012 14:18:23 -0800
Subject: [PATCH 07/76] Bug 650567 - Mark 267459-2.html as passing 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 317291e1ffd9..f0347219da9a 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -64,7 +64,7 @@ fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azur
 == 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
-fails-if(Android) == 267459-2.html 267459-2-ref.html # bug 650567
+== 267459-2.html 267459-2-ref.html
 == 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 2e9353fe55249f3f34689b47b8c6d2cef430ecd5 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 13 Nov 2012 14:22:21 -0800
Subject: [PATCH 08/76] Bug 810186 - Don't unnecessarily nest inactive layers.
 r=roc

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

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index eeda339c52ec..7013c2c33024 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2052,6 +2052,7 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
 
     // Assign the item to a layer
     if (layerState == LAYER_ACTIVE_FORCE ||
+        (layerState == LAYER_INACTIVE && !mManager->IsWidgetLayerManager()) ||
         (!forceInactive &&
          (layerState == LAYER_ACTIVE_EMPTY ||
           layerState == LAYER_ACTIVE))) {
@@ -2696,7 +2697,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
   gfxMatrix transform2d;
   bool canDraw2D = transform.CanDraw2D(&transform2d);
   gfxSize scale;
-  bool isRetained = aLayerBuilder->GetRetainingLayerManager() == aLayer->Manager();
+  bool isRetained = aLayer->Manager()->IsWidgetLayerManager();
   // Only fiddle with scale factors for the retaining layer manager, since
   // it only matters for retained layers
   // XXX Should we do something for 3D transforms?

From 54188f6e82ac325d9ba882ab129d7038d14d8eee Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Tue, 13 Nov 2012 14:44:18 -0800
Subject: [PATCH 09/76] Backout f2c60518351d Bug 809661

---
 dom/sms/Makefile.in                          |   2 +-
 dom/sms/interfaces/nsIDOMSmsManager.idl      |   4 +-
 dom/sms/interfaces/nsISmsDatabaseService.idl |   4 +-
 dom/sms/interfaces/nsISmsRequest.idl         |  14 +-
 dom/sms/src/SmsManager.cpp                   |  14 -
 dom/sms/src/SmsRequest.cpp                   | 151 +----------
 dom/sms/src/SmsRequest.h                     |  23 +-
 dom/sms/src/android/SmsDatabaseService.cpp   |   7 -
 dom/sms/src/fallback/SmsDatabaseService.cpp  |   7 -
 dom/sms/src/ipc/PSms.ipdl                    |   5 -
 dom/sms/src/ipc/PSmsRequest.ipdl             |  20 --
 dom/sms/src/ipc/SmsChild.cpp                 |   8 -
 dom/sms/src/ipc/SmsIPCService.cpp            |   7 -
 dom/sms/src/ipc/SmsParent.cpp                |  17 --
 dom/sms/src/ipc/SmsParent.h                  |   3 -
 dom/sms/src/ril/SmsDatabaseService.js        | 260 +++----------------
 js/xpconnect/src/dictionary_helper_gen.conf  |   3 +-
 17 files changed, 57 insertions(+), 492 deletions(-)

diff --git a/dom/sms/Makefile.in b/dom/sms/Makefile.in
index 14338d78479a..8196e39412c6 100644
--- a/dom/sms/Makefile.in
+++ b/dom/sms/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = interfaces src
+PARALLEL_DIRS = interfaces src
 
 TEST_DIRS += tests
 ifdef ENABLE_TESTS
diff --git a/dom/sms/interfaces/nsIDOMSmsManager.idl b/dom/sms/interfaces/nsIDOMSmsManager.idl
index 36eca7954a43..a6ce0e457df5 100644
--- a/dom/sms/interfaces/nsIDOMSmsManager.idl
+++ b/dom/sms/interfaces/nsIDOMSmsManager.idl
@@ -8,7 +8,7 @@ interface nsIDOMEventListener;
 interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 
-[scriptable, builtinclass, uuid(caaf5c38-a730-4dbb-a0f0-12384bfac8e3)]
+[scriptable, builtinclass, uuid(1bee1224-56a2-4935-af7b-0011746306cb)]
 interface nsIDOMMozSmsManager : nsIDOMEventTarget
 {
   unsigned short getNumberOfMessagesForText(in DOMString text);
@@ -29,8 +29,6 @@ interface nsIDOMMozSmsManager : nsIDOMEventTarget
 
   nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue);
 
-  nsIDOMMozSmsRequest getThreadList();
-
   [implicit_jscontext] attribute jsval onreceived;
   [implicit_jscontext] attribute jsval onsent;
   [implicit_jscontext] attribute jsval ondeliverysuccess;
diff --git a/dom/sms/interfaces/nsISmsDatabaseService.idl b/dom/sms/interfaces/nsISmsDatabaseService.idl
index cff1a6d8550d..157f0462c13a 100644
--- a/dom/sms/interfaces/nsISmsDatabaseService.idl
+++ b/dom/sms/interfaces/nsISmsDatabaseService.idl
@@ -14,7 +14,7 @@
 interface nsIDOMMozSmsFilter;
 interface nsISmsRequest;
 
-[scriptable, uuid(c2cb2af7-6b96-4915-bcc8-54ad705d6110)]
+[scriptable, uuid(6ad55465-6937-4491-93ca-29dad9775d46)]
 interface nsISmsDatabaseService : nsISupports
 {
   // Takes some information required to save the message and returns its id.
@@ -30,6 +30,4 @@ interface nsISmsDatabaseService : nsISupports
   void getNextMessageInList(in long listId, in nsISmsRequest request);
   void clearMessageList(in long listId);
   void markMessageRead(in long messageId, in boolean value, in nsISmsRequest request);
-
-  void getThreadList(in nsISmsRequest request);
 };
diff --git a/dom/sms/interfaces/nsISmsRequest.idl b/dom/sms/interfaces/nsISmsRequest.idl
index 993cb43ae2a1..8ce490fcf6a9 100644
--- a/dom/sms/interfaces/nsISmsRequest.idl
+++ b/dom/sms/interfaces/nsISmsRequest.idl
@@ -6,15 +6,7 @@
 
 interface nsIDOMMozSmsMessage;
 
-dictionary SmsThreadListItem
-{
-  DOMString senderOrReceiver;
-  unsigned long long timestamp;
-  DOMString body;
-  unsigned long long unreadCount;
-};
-
-[scriptable, builtinclass, uuid(82a6d16d-cf33-4745-8662-8b5d441f512f)]
+[scriptable, builtinclass, uuid(97067327-64b9-4e26-848b-59e443c55db9)]
 interface nsISmsRequest : nsISupports
 {
   /**
@@ -45,8 +37,4 @@ interface nsISmsRequest : nsISupports
 
   void notifyMessageMarkedRead(in boolean read);
   void notifyMarkMessageReadFailed(in long error);
-
-  [implicit_jscontext]
-  void notifyThreadList(in jsval threadList);
-  void notifyThreadListFailed(in long error);
 };
diff --git a/dom/sms/src/SmsManager.cpp b/dom/sms/src/SmsManager.cpp
index d022cc680fb2..40493d00aebf 100644
--- a/dom/sms/src/SmsManager.cpp
+++ b/dom/sms/src/SmsManager.cpp
@@ -303,20 +303,6 @@ SmsManager::MarkMessageRead(int32_t aId, bool aValue,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-SmsManager::GetThreadList(nsIDOMMozSmsRequest** aRequest)
-{
-  nsCOMPtr<nsIDOMMozSmsRequest> req = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsDatabaseService> smsDBService =
-    do_GetService(SMS_DATABASE_SERVICE_CONTRACTID);
-  NS_ENSURE_TRUE(smsDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder =
-    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
-  smsDBService->GetThreadList(forwarder);
-  req.forget(aRequest);
-  return NS_OK;
-}
-
 nsresult
 SmsManager::DispatchTrustedSmsEventToSelf(const nsAString& aEventName, nsIDOMMozSmsMessage* aMessage)
 {
diff --git a/dom/sms/src/SmsRequest.cpp b/dom/sms/src/SmsRequest.cpp
index 6ca0f6de3a70..2630e499c65c 100644
--- a/dom/sms/src/SmsRequest.cpp
+++ b/dom/sms/src/SmsRequest.cpp
@@ -9,16 +9,11 @@
 #include "nsDOMString.h"
 #include "nsContentUtils.h"
 #include "nsIDOMSmsMessage.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsPIDOMWindow.h"
 #include "SmsCursor.h"
 #include "SmsMessage.h"
 #include "SmsManager.h"
 #include "mozilla/dom/DOMError.h"
 #include "SmsParent.h"
-#include "jsapi.h"
-#include "DictionaryHelpers.h"
-#include "xpcpublic.h"
 
 #define SUCCESS_EVENT_NAME NS_LITERAL_STRING("success")
 #define ERROR_EVENT_NAME   NS_LITERAL_STRING("error")
@@ -150,7 +145,12 @@ SmsRequest::SetSuccess(nsIDOMMozSmsMessage* aMessage)
 void
 SmsRequest::SetSuccess(bool aResult)
 {
-  SetSuccess(aResult ? JSVAL_TRUE : JSVAL_FALSE);
+  NS_PRECONDITION(!mDone, "mDone shouldn't have been set to true already!");
+  NS_PRECONDITION(!mError, "mError shouldn't have been set!");
+  NS_PRECONDITION(mResult == JSVAL_NULL, "mResult shouldn't have been set!");
+
+  mResult.setBoolean(aResult);
+  mDone = true;
 }
 
 void
@@ -168,17 +168,6 @@ SmsRequest::SetSuccess(nsIDOMMozSmsCursor* aCursor)
   }
 }
 
-void
-SmsRequest::SetSuccess(const jsval& aResult)
-{
-  NS_PRECONDITION(!mDone, "mDone shouldn't have been set to true already!");
-  NS_PRECONDITION(!mError, "mError shouldn't have been set!");
-  NS_PRECONDITION(JSVAL_IS_VOID(mResult), "mResult shouldn't have been set!");
-
-  mResult = aResult;
-  mDone = true;
-}
-
 bool
 SmsRequest::SetSuccessInternal(nsISupports* aObject)
 {
@@ -456,134 +445,6 @@ SmsRequest::NotifyMarkMessageReadFailed(int32_t aError)
   return NotifyError(aError);
 }
 
-NS_IMETHODIMP
-SmsRequest::NotifyThreadList(const jsval& aThreadList, JSContext* aCx)
-{
-  MOZ_ASSERT(aThreadList.isObject());
-
-  if (mParent) {
-    JSObject* array = const_cast<JSObject*>(&aThreadList.toObject());
-
-    uint32_t length;
-    bool ok = JS_GetArrayLength(aCx, array, &length);
-    NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
-
-    ReplyThreadList reply;
-    InfallibleTArray<ThreadListItem>& ipcItems = reply.items();
-
-    if (length) {
-      ipcItems.SetCapacity(length);
-
-      for (uint32_t i = 0; i < length; i++) {
-        jsval arrayEntry;
-        ok = JS_GetElement(aCx, array, i, &arrayEntry);
-        NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
-
-        MOZ_ASSERT(arrayEntry.isObject());
-
-        SmsThreadListItem item;
-        nsresult rv = item.Init(aCx, &arrayEntry);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        ThreadListItem* ipcItem = ipcItems.AppendElement();
-        ipcItem->senderOrReceiver() = item.senderOrReceiver;
-        ipcItem->timestamp() = item.timestamp;
-        ipcItem->body() = item.body;
-        ipcItem->unreadCount() = item.unreadCount;
-      }
-    }
-
-    return SendMessageReply(reply);
-  }
-
-  return NotifySuccess(aThreadList);
-}
-
-NS_IMETHODIMP
-SmsRequest::NotifyThreadListFailed(int32_t aError)
-{
-  if (mParent) {
-    return SendMessageReply(MessageReply(ReplyThreadListFail(aError)));
-  }
-  return NotifyError(aError);
-}
-
-void
-SmsRequest::NotifyThreadList(const InfallibleTArray<ThreadListItem>& aItems)
-{
-  MOZ_ASSERT(!mParent);
-  MOZ_ASSERT(GetOwner());
-
-  nsresult rv;
-  nsIScriptContext* sc = GetContextForEventHandlers(&rv);
-  NS_ENSURE_SUCCESS_VOID(rv);
-  NS_ENSURE_TRUE_VOID(sc);
-
-  JSContext* cx = sc->GetNativeContext();
-  MOZ_ASSERT(cx);
-
-  nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(GetOwner());
-
-  JSObject* ownerObj = sgo->GetGlobalJSObject();
-  NS_ENSURE_TRUE_VOID(ownerObj);
-
-  nsCxPusher pusher;
-  NS_ENSURE_TRUE_VOID(pusher.Push(cx, false));
-
-  JSAutoRequest ar(cx);
-  JSAutoCompartment ac(cx, ownerObj);
-
-  JSObject* array = JS_NewArrayObject(cx, aItems.Length(), nullptr);
-  NS_ENSURE_TRUE_VOID(array);
-
-  bool ok;
-
-  for (uint32_t i = 0; i < aItems.Length(); i++) {
-    const ThreadListItem& source = aItems[i];
-
-    nsString temp = source.senderOrReceiver();
-
-    jsval senderOrReceiver;
-    ok = xpc::StringToJsval(cx, temp, &senderOrReceiver);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    JSObject* timestampObj = JS_NewDateObjectMsec(cx, source.timestamp());
-    NS_ENSURE_TRUE_VOID(timestampObj);
-
-    jsval timestamp = OBJECT_TO_JSVAL(timestampObj);
-
-    temp = source.body();
-
-    jsval body;
-    ok = xpc::StringToJsval(cx, temp, &body);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    jsval unreadCount = JS_NumberValue(double(source.unreadCount()));
-
-    JSObject* elementObj = JS_NewObject(cx, nullptr, nullptr, nullptr);
-    NS_ENSURE_TRUE_VOID(elementObj);
-
-    ok = JS_SetProperty(cx, elementObj, "senderOrReceiver", &senderOrReceiver);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    ok = JS_SetProperty(cx, elementObj, "timestamp", &timestamp);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    ok = JS_SetProperty(cx, elementObj, "body", &body);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    ok = JS_SetProperty(cx, elementObj, "unreadCount", &unreadCount);
-    NS_ENSURE_TRUE_VOID(ok);
-
-    jsval element = OBJECT_TO_JSVAL(elementObj);
-
-    ok = JS_SetElement(cx, array, i, &element);
-    NS_ENSURE_TRUE_VOID(ok);
-  }
-
-  NotifyThreadList(OBJECT_TO_JSVAL(array), cx);
-}
-
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/SmsRequest.h b/dom/sms/src/SmsRequest.h
index 7abe4b1b9809..e27cf80b005a 100644
--- a/dom/sms/src/SmsRequest.h
+++ b/dom/sms/src/SmsRequest.h
@@ -17,33 +17,24 @@ namespace mozilla {
 namespace dom {
 namespace sms {
 
-class SmsRequestChild;
 class SmsRequestParent;
 class MessageReply;
-class ThreadListItem;
 
 // We need this forwarder to avoid a QI to nsIClassInfo.
 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=775997#c51 
 class SmsRequestForwarder : public nsISmsRequest
 {
-  friend class SmsRequestChild;
-
-public:
-  NS_DECL_ISUPPORTS
   NS_FORWARD_NSISMSREQUEST(mRealRequest->)
 
+  NS_DECL_ISUPPORTS
+
   SmsRequestForwarder(nsISmsRequest* aRealRequest) {
     mRealRequest = aRealRequest;
   }
-
-private:
   virtual
   ~SmsRequestForwarder() {}
 
-  nsISmsRequest* GetRealRequest() {
-    return mRealRequest;
-  }
-
+private:
   nsCOMPtr<nsISmsRequest> mRealRequest;
 };
 
@@ -75,9 +66,6 @@ public:
     mParentAlive = false;
   }
 
-  void
-  NotifyThreadList(const InfallibleTArray<ThreadListItem>& aItems);
-
 private:
   SmsRequest() MOZ_DELETE;
 
@@ -112,11 +100,6 @@ private:
    */
   void SetSuccess(nsIDOMMozSmsCursor* aCursor);
 
-  /**
-   * Set the object in a success state with the result being the given jsval.
-   */
-  void SetSuccess(const jsval& aVal);
-
   /**
    * Set the object in an error state with the error type being aError.
    */
diff --git a/dom/sms/src/android/SmsDatabaseService.cpp b/dom/sms/src/android/SmsDatabaseService.cpp
index bcf527f1e868..b68ad3233c77 100644
--- a/dom/sms/src/android/SmsDatabaseService.cpp
+++ b/dom/sms/src/android/SmsDatabaseService.cpp
@@ -112,13 +112,6 @@ SmsDatabaseService::MarkMessageRead(int32_t aMessageId, bool aValue,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-SmsDatabaseService::GetThreadList(nsISmsRequest* aRequest)
-{
-  NS_NOTYETIMPLEMENTED("Implement me!");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/fallback/SmsDatabaseService.cpp b/dom/sms/src/fallback/SmsDatabaseService.cpp
index 35b0e69095e4..cb66dbf36432 100644
--- a/dom/sms/src/fallback/SmsDatabaseService.cpp
+++ b/dom/sms/src/fallback/SmsDatabaseService.cpp
@@ -90,13 +90,6 @@ SmsDatabaseService::MarkMessageRead(int32_t aMessageId,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-SmsDatabaseService::GetThreadList(nsISmsRequest* aRequest)
-{
-  NS_ERROR("We should not be here!");
-  return NS_OK;
-}
-
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/PSms.ipdl b/dom/sms/src/ipc/PSms.ipdl
index 139d8b75d3c3..9059832425c1 100644
--- a/dom/sms/src/ipc/PSms.ipdl
+++ b/dom/sms/src/ipc/PSms.ipdl
@@ -53,10 +53,6 @@ struct MarkMessageReadRequest
   bool value;
 };
 
-struct GetThreadListRequest
-{
-};
-
 union IPCSmsRequest
 {
   SendMessageRequest;
@@ -65,7 +61,6 @@ union IPCSmsRequest
   CreateMessageListRequest;
   GetNextMessageInListRequest;
   MarkMessageReadRequest;
-  GetThreadListRequest;
 };
 
 sync protocol PSms {
diff --git a/dom/sms/src/ipc/PSmsRequest.ipdl b/dom/sms/src/ipc/PSmsRequest.ipdl
index 6949eea9b473..ef4b9b40d83e 100644
--- a/dom/sms/src/ipc/PSmsRequest.ipdl
+++ b/dom/sms/src/ipc/PSmsRequest.ipdl
@@ -85,24 +85,6 @@ struct ReplyNoMessageInList
 {
 };
 
-struct ThreadListItem
-{
-  nsString senderOrReceiver;
-  uint64_t timestamp;
-  nsString body;
-  uint64_t unreadCount;
-};
-
-struct ReplyThreadList
-{
-  ThreadListItem[] items;
-};
-
-struct ReplyThreadListFail
-{
-  int32_t error;
-};
-
 union MessageReply
 {
   ReplyMessageSend;
@@ -117,8 +99,6 @@ union MessageReply
   ReplyGetNextMessage;
   ReplyMarkeMessageRead;
   ReplyMarkeMessageReadFail;
-  ReplyThreadList;
-  ReplyThreadListFail;
 };
 
 } // namespace sms
diff --git a/dom/sms/src/ipc/SmsChild.cpp b/dom/sms/src/ipc/SmsChild.cpp
index ada82e852e86..1314267001c0 100644
--- a/dom/sms/src/ipc/SmsChild.cpp
+++ b/dom/sms/src/ipc/SmsChild.cpp
@@ -161,14 +161,6 @@ SmsRequestChild::Recv__delete__(const MessageReply& aReply)
     case MessageReply::TReplyMarkeMessageReadFail:
       mReplyRequest->NotifyMarkMessageReadFailed(aReply.get_ReplyMarkeMessageReadFail().error());
       break;
-    case MessageReply::TReplyThreadList: {
-      SmsRequestForwarder* forwarder = static_cast<SmsRequestForwarder*>(mReplyRequest.get());
-      SmsRequest* request = static_cast<SmsRequest*>(forwarder->GetRealRequest());
-      request->NotifyThreadList(aReply.get_ReplyThreadList().items());
-    } break;
-    case MessageReply::TReplyThreadListFail:
-      mReplyRequest->NotifyThreadListFailed(aReply.get_ReplyThreadListFail().error());
-      break;
     default:
       MOZ_NOT_REACHED("Received invalid response parameters!");
       return false;
diff --git a/dom/sms/src/ipc/SmsIPCService.cpp b/dom/sms/src/ipc/SmsIPCService.cpp
index b1b2cde7691a..a700669acc42 100644
--- a/dom/sms/src/ipc/SmsIPCService.cpp
+++ b/dom/sms/src/ipc/SmsIPCService.cpp
@@ -179,13 +179,6 @@ SmsIPCService::MarkMessageRead(int32_t aMessageId,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-SmsIPCService::GetThreadList(nsISmsRequest* aRequest)
-{
-  SendRequest(GetThreadListRequest(), aRequest);
-  return NS_OK;
-}
-
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/SmsParent.cpp b/dom/sms/src/ipc/SmsParent.cpp
index caf1d17e8361..aabf3ebdd4e3 100644
--- a/dom/sms/src/ipc/SmsParent.cpp
+++ b/dom/sms/src/ipc/SmsParent.cpp
@@ -203,8 +203,6 @@ SmsParent::RecvPSmsRequestConstructor(PSmsRequestParent* aActor,
       return actor->DoRequest(aRequest.get_GetNextMessageInListRequest());
     case IPCSmsRequest::TMarkMessageReadRequest:
       return actor->DoRequest(aRequest.get_MarkMessageReadRequest());
-    case IPCSmsRequest::TGetThreadListRequest:
-      return actor->DoRequest(aRequest.get_GetThreadListRequest());
     default:
       MOZ_NOT_REACHED("Unknown type!");
       return false;
@@ -349,21 +347,6 @@ SmsRequestParent::DoRequest(const MarkMessageReadRequest& aRequest)
   return true;
 }
 
-bool
-SmsRequestParent::DoRequest(const GetThreadListRequest& aRequest)
-{
-  nsCOMPtr<nsISmsDatabaseService> smsDBService =
-    do_GetService(SMS_DATABASE_SERVICE_CONTRACTID);
-
-  NS_ENSURE_TRUE(smsDBService, true);
-  mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
-  nsresult rv = smsDBService->GetThreadList(forwarder);
-  NS_ENSURE_SUCCESS(rv, false);
-
-  return true;
-}
-
 } // namespace sms
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/sms/src/ipc/SmsParent.h b/dom/sms/src/ipc/SmsParent.h
index 82ebae78856b..d791c55560ee 100644
--- a/dom/sms/src/ipc/SmsParent.h
+++ b/dom/sms/src/ipc/SmsParent.h
@@ -103,9 +103,6 @@ protected:
 
   bool
   DoRequest(const MarkMessageReadRequest& aRequest);
-
-  bool
-  DoRequest(const GetThreadListRequest& aRequest);
 };
 
 } // namespace sms
diff --git a/dom/sms/src/ril/SmsDatabaseService.js b/dom/sms/src/ril/SmsDatabaseService.js
index c61fb1ac798e..0511fd34d869 100644
--- a/dom/sms/src/ril/SmsDatabaseService.js
+++ b/dom/sms/src/ril/SmsDatabaseService.js
@@ -14,9 +14,8 @@ const RIL_SMSDATABASESERVICE_CID = Components.ID("{a1fa610c-eb6c-4ac2-878f-b005d
 
 const DEBUG = false;
 const DB_NAME = "sms";
-const DB_VERSION = 4;
+const DB_VERSION = 3;
 const STORE_NAME = "sms";
-const MOST_RECENT_STORE_NAME = "most-recent";
 
 const DELIVERY_SENT = "sent";
 const DELIVERY_RECEIVED = "received";
@@ -53,10 +52,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gIDBManager",
 
 const GLOBAL_SCOPE = this;
 
-function numberFromMessage(message) {
-  return message.delivery == DELIVERY_SENT ? message.receiver : message.sender;
-}
-
 /**
  * SmsDatabaseService
  */
@@ -181,10 +176,6 @@ SmsDatabaseService.prototype = {
             objectStore = event.target.transaction.objectStore(STORE_NAME);
             self.upgradeSchema2(objectStore);
             break;
-          case 3:
-            if (DEBUG) debug("Upgrade to version 4. Add quick threads view.")
-            self.upgradeSchema3(event.target.transaction);
-            break;
           default:
             event.target.transaction.abort();
             callback("Old database version: " + event.oldVersion, null);
@@ -192,7 +183,7 @@ SmsDatabaseService.prototype = {
         }
         currentVersion++;
       }
-    }
+    };
     request.onerror = function (event) {
       //TODO look at event.target.Code and change error constant accordingly
       callback("Error opening database!", null);
@@ -210,22 +201,15 @@ SmsDatabaseService.prototype = {
    * @param callback
    *        Function to call when the transaction is available. It will
    *        be invoked with the transaction and the 'sms' object store.
-   * @param objectStores
-   *        Function to call when the transaction is available. It will
-   *        be invoked with the transaction and the 'sms' object store.
    */
-  newTxn: function newTxn(txn_type, callback, objectStores) {
-    if (!objectStores) {
-      objectStores = [STORE_NAME];
-    }
-    if (DEBUG) debug("Opening transaction for objectStores: " + objectStores);
+  newTxn: function newTxn(txn_type, callback) {
     this.ensureDB(function (error, db) {
       if (error) {
         if (DEBUG) debug("Could not open database: " + error);
         callback(error);
         return;
       }
-      let txn = db.transaction(objectStores, txn_type);
+      let txn = db.transaction([STORE_NAME], txn_type);
       if (DEBUG) debug("Started transaction " + txn + " of type " + txn_type);
       if (DEBUG) {
         txn.oncomplete = function oncomplete(event) {
@@ -237,18 +221,9 @@ SmsDatabaseService.prototype = {
           debug("Error occurred during transaction: " + event.target.errorCode);
         };
       }
-      let stores;
-      if (objectStores.length == 1) {
-        if (DEBUG) debug("Retrieving object store " + objectStores[0]);
-        stores = txn.objectStore(objectStores[0]);
-      } else {
-        stores = [];
-        for each (let storeName in objectStores) {
-          if (DEBUG) debug("Retrieving object store " + storeName);
-          stores.push(txn.objectStore(storeName));
-        }
-      }
-      callback(null, txn, stores);
+      if (DEBUG) debug("Retrieving object store", STORE_NAME);
+      let store = txn.objectStore(STORE_NAME);
+      callback(null, txn, store);
     });
   },
 
@@ -259,8 +234,8 @@ SmsDatabaseService.prototype = {
    * TODO full text search on body???
    */
   createSchema: function createSchema(db) {
-    // This objectStore holds the main SMS data.
     let objectStore = db.createObjectStore(STORE_NAME, { keyPath: "id" });
+    objectStore.createIndex("id", "id", { unique: true });
     objectStore.createIndex("delivery", "delivery", { unique: false });
     objectStore.createIndex("sender", "sender", { unique: false });
     objectStore.createIndex("receiver", "receiver", { unique: false });
@@ -272,6 +247,7 @@ SmsDatabaseService.prototype = {
    * Upgrade to the corresponding database schema version.
    */
   upgradeSchema: function upgradeSchema(objectStore) {
+    // For now, the only possible upgrade is to version 2.
     objectStore.createIndex("read", "read", { unique: false });  
   },
 
@@ -290,29 +266,6 @@ SmsDatabaseService.prototype = {
     }
   },
 
-  upgradeSchema3: function upgradeSchema2(transaction) {
-    // Delete redundant "id" index.
-    let objectStore = transaction.objectStore(STORE_NAME);
-    if (objectStore.indexNames.contains("id")) {
-      objectStore.deleteIndex("id");
-    }
-
-    /**
-     * This objectStore can be used to quickly construct a thread view of the
-     * SMS database. Each entry looks like this:
-     *
-     * { senderOrReceiver: <String> (primary key),
-     *   id: <Number>,
-     *   timestamp: <Date>,
-     *   body: <String>,
-     *   unreadCount: <Number> }
-     *
-     */
-    objectStore = db.createObjectStore(MOST_RECENT_STORE_NAME,
-                                       { keyPath: "senderOrReceiver" });
-    objectStore.createIndex("timestamp", "timestamp");
-  },
-
   /**
    * Helper function to make the intersection of the partial result arrays
    * obtained within createMessageList.
@@ -402,43 +355,12 @@ SmsDatabaseService.prototype = {
     this.lastKey += 1;
     message.id = this.lastKey;
     if (DEBUG) debug("Going to store " + JSON.stringify(message));
-    this.newTxn(READ_WRITE, function(error, txn, stores) {
+    this.newTxn(READ_WRITE, function(error, txn, store) {
       if (error) {
         return;
       }
-      // First add to main objectStore.
-      stores[0].put(message);
-
-      let number = numberFromMessage(message);
-
-      // Next update the other objectStore.
-      stores[1].get(number).onsuccess = function(event) {
-        let mostRecentEntry = event.target.result;
-        if (mostRecentEntry) {
-          let needsUpdate = false;
-
-          if (mostRecentEntry.timestamp <= message.timestamp) {
-            mostRecentEntry.timestamp = message.timestamp;
-            mostRecentEntry.body = message.body;
-            needsUpdate = true;
-          }
-
-          if (!message.read) {
-            mostRecentEntry.unreadCount++;
-            needsUpdate = true;
-          }
-
-          if (needsUpdate) {
-            event.target.source.put(mostRecentEntry);
-          }
-        } else {
-          event.target.source.add({ senderOrReceiver: number,
-                                    timestamp: message.timestamp,
-                                    body: message.body,
-                                    unreadCount: message.read ? 0 : 1 });
-        }
-      }
-    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
+      let request = store.put(message);
+    });
     // We return the key that we expect to store in the db
     return message.id;
   },
@@ -578,103 +500,33 @@ SmsDatabaseService.prototype = {
   deleteMessage: function deleteMessage(messageId, aRequest) {
     let deleted = false;
     let self = this;
-    this.newTxn(READ_WRITE, function (error, txn, stores) {
+    this.newTxn(READ_WRITE, function (error, txn, store) {
       if (error) {
         aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
         return;
       }
-      txn.onerror = function onerror(event) {
-        if (DEBUG) debug("Caught error on transaction", event.target.errorCode);
-        //TODO look at event.target.errorCode, pick appropriate error constant
-        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      let request = store.count(messageId);
+
+      request.onsuccess = function onsuccess(event) {        
+        let count = event.target.result;
+        if (DEBUG) debug("Count for messageId " + messageId + ": " + count);
+        deleted = (count == 1);
+        if (deleted) {
+          store.delete(messageId);
+        }
       };
 
-      const smsStore = stores[0];
-      const mruStore = stores[1];
-
-      let deleted = false;
-
       txn.oncomplete = function oncomplete(event) {
         if (DEBUG) debug("Transaction " + txn + " completed.");
         aRequest.notifyMessageDeleted(deleted);
       };
 
-      smsStore.get(messageId).onsuccess = function(event) {
-        let message = event.target.result;
-        if (message) {
-          if (DEBUG) debug("Deleting message id " + messageId);
-
-          // First actually delete the message.
-          event.target.source.delete(messageId).onsuccess = function(event) {
-            deleted = true;
-
-            // Then update unread count and most recent message.
-            let number = numberFromMessage(message);
-
-            mruStore.get(number).onsuccess = function(event) {
-              // This must exist.
-              let mostRecentEntry = event.target.result;
-
-              if (!message.read) {
-                mostRecentEntry.unreadCount--;
-              }
-
-              if (mostRecentEntry.id == messageId) {
-                // This sucks, we have to find a new most-recent message.
-                message = null;
-
-                // Check most recent sender.
-                smsStore.index("sender").openCursor(number, "prev").onsuccess = function(event) {
-                  let cursor = event.target.result;
-                  if (cursor) {
-                    message = cursor.value;
-                  }
-                };
-
-                // Check most recent receiver.
-                smsStore.index("receiver").openCursor(number, "prev").onsuccess = function(event) {
-                  let cursor = event.target.result;
-                  if (cursor) {
-                    if (!message || cursor.value.timeStamp > message.timestamp) {
-                      message = cursor.value;
-                    }
-                  }
-
-                  // If we found a new message then we need to update the data
-                  // in the most-recent store. Otherwise we can delete it.
-                  if (message) {
-                    mostRecentEntry.id = message.id;
-                    mostRecentEntry.timestamp = message.timestamp;
-                    mostRecentEntry.body = message.body;
-                    if (DEBUG) {
-                      debug("Updating mru entry: " +
-                            JSON.stringify(mostRecentEntry));
-                    }
-                    mruStore.put(mostRecentEntry);
-                  }
-                  else {
-                    if (DEBUG) {
-                      debug("Deleting mru entry for number '" + number + "'");
-                    }
-                    mruStore.delete(number);
-                  }
-                };
-              } else if (!message.read) {
-                // Shortcut, just update the unread count.
-                if (DEBUG) {
-                  debug("Updating unread count for number '" + number + "': " +
-                        (mostRecentEntry.unreadCount + 1) + " -> " +
-                        mostRecentEntry.unreadCount);
-                }
-                mruStore.put(mostRecentEntry);
-              }
-            };
-          };
-        } else if (DEBUG) {
-          debug("Message id " + messageId + " does not exist");
-        }
+      txn.onerror = function onerror(event) {
+        if (DEBUG) debug("Caught error on transaction", event.target.errorCode);
+        //TODO look at event.target.errorCode, pick appropriate error constant
+        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
       };
-    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
+    });
   },
 
   createMessageList: function createMessageList(filter, reverse, aRequest) {
@@ -705,7 +557,7 @@ SmsDatabaseService.prototype = {
         if (DEBUG) {
           debug("These messages match the " + filter + " filter: " +
                 filteredKeys[filter]);
-        }
+      }
         return;
       }
       // The cursor primaryKey is stored in its corresponding partial array
@@ -875,20 +727,18 @@ SmsDatabaseService.prototype = {
 
   markMessageRead: function markMessageRead(messageId, value, aRequest) {
     if (DEBUG) debug("Setting message " + messageId + " read to " + value);
-    this.newTxn(READ_WRITE, function (error, txn, stores) {
+    this.newTxn(READ_WRITE, function (error, txn, store) {
       if (error) {
         if (DEBUG) debug(error);
         aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
         return;
       }
-      txn.onerror = function onerror(event) {
-        if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
-        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
-      };
-      stores[0].get(messageId).onsuccess = function onsuccess(event) {
+      let getRequest = store.get(messageId);
+
+      getRequest.onsuccess = function onsuccess(event) {
         let message = event.target.result;
+        if (DEBUG) debug("Message ID " + messageId + " not found");
         if (!message) {
-          if (DEBUG) debug("Message ID " + messageId + " not found");
           aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
           return;
         }
@@ -909,50 +759,26 @@ SmsDatabaseService.prototype = {
         }
         message.read = value ? FILTER_READ_READ : FILTER_READ_UNREAD;
         if (DEBUG) debug("Message.read set to: " + value);
-        event.target.source.put(message).onsuccess = function onsuccess(event) {
+        let putRequest = store.put(message);
+        putRequest.onsuccess = function onsuccess(event) {
           if (DEBUG) {
             debug("Update successfully completed. Message: " +
                   JSON.stringify(event.target.result));
           }
-
-          // Now update the unread count.
-          let number = numberFromMessage(message);
-
-          stores[1].get(number).onsuccess = function(event) {
-            let mostRecentEntry = event.target.result;
-            mostRecentEntry.unreadCount += value ? -1 : 1;
-            if (DEBUG) {
-              debug("Updating unreadCount for '" + number + "': " +
-                    (value ?
-                     mostRecentEntry.unreadCount + 1 :
-                     mostRecentEntry.unreadCount - 1) +
-                    " -> " + mostRecentEntry.unreadCount);
-            }
-            event.target.source.put(mostRecentEntry).onsuccess = function(event) {
-              aRequest.notifyMessageMarkedRead(message.read);
-            };
+          let checkRequest = store.get(message.id);
+          checkRequest.onsuccess = function onsuccess(event) {
+            aRequest.notifyMessageMarkedRead(event.target.result.read);
           };
-        };
+        }
       };
-    }, [STORE_NAME, MOST_RECENT_STORE_NAME]);
-  },
-  getThreadList: function getThreadList(aRequest) {
-    if (DEBUG) debug("Getting thread list");
-    this.newTxn(READ_ONLY, function (error, txn, store) {
-      if (error) {
-        if (DEBUG) debug(error);
-        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
-        return;
-      }
+
       txn.onerror = function onerror(event) {
         if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
-        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
       };
-      store.index("timestamp").mozGetAll().onsuccess = function(event) {
-        aRequest.notifyThreadList(event.target.result);
-      };
-    }, [MOST_RECENT_STORE_NAME]);
+    });
   }
+
 };
 
 XPCOMUtils.defineLazyGetter(SmsDatabaseService.prototype, "mRIL", function () {
diff --git a/js/xpconnect/src/dictionary_helper_gen.conf b/js/xpconnect/src/dictionary_helper_gen.conf
index 82103fd64697..ebb095ecd113 100644
--- a/js/xpconnect/src/dictionary_helper_gen.conf
+++ b/js/xpconnect/src/dictionary_helper_gen.conf
@@ -21,8 +21,7 @@ dictionaries = [
      [ 'CameraSelector', 'nsIDOMCameraManager.idl' ],
      [ 'CameraPictureOptions', 'nsIDOMCameraManager.idl' ],
      [ 'CameraRecordingOptions', 'nsIDOMCameraManager.idl' ],
-     [ 'ArchiveReaderOptions', 'nsIDOMArchiveReader.idl' ],
-     [ 'SmsThreadListItem', 'nsISmsRequest.idl' ]
+     [ 'ArchiveReaderOptions', 'nsIDOMArchiveReader.idl' ]
    ]
 
 # include file names

From dc32f73f6d5d5c0024630738c655231bb0abef39 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Tue, 13 Nov 2012 15:03:06 -0800
Subject: [PATCH 10/76] Bug 809758 - Ensure sGeoInitPending is set to false
 prior to notifying ServiceReady. r=gwagner. a=blocking-basecamp

---
 dom/src/geolocation/nsGeolocation.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index 59d11e0b1a45..9688d184a3c2 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -746,11 +746,10 @@ nsGeolocationService::HandleMozsettingValue(const bool aValue)
     }
 
     if (sGeoInitPending) {
+      sGeoInitPending = false;
       for (uint32_t i = 0, length = mGeolocators.Length(); i < length; ++i) {
         mGeolocators[i]->ServiceReady();
       }
-
-      sGeoInitPending = false;
     }
 }
 

From cfce24e0609cac88d9de6411a5b212f700d773a7 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Tue, 13 Nov 2012 15:09:31 -0800
Subject: [PATCH 11/76] Bug 801918. OpenGL: Avoid doing extra invalidation when
 unrotating a buffer. r=mwoodrow

This approach ends up calling BlitTextureImage three extra times instead of
changing BlitTextureImage to support rotated buffers.

Supporting rotated buffers in BlitTextureImage is somewhat tricky because of
TiledTextureImage, and calling it three more times shouldn't be too bad (it
should be better than having to repaint)

Unfortunately, the rectangle manipulation code is a bit hairy.

--HG--
extra : rebase_source : a1018a22932675b154b76533f403a1328aa29cb5
---
 gfx/layers/opengl/ThebesLayerOGL.cpp | 127 ++++++++++++++++++---------
 1 file changed, 86 insertions(+), 41 deletions(-)

diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp
index 99ea98f5036d..ed0084d50fa3 100644
--- a/gfx/layers/opengl/ThebesLayerOGL.cpp
+++ b/gfx/layers/opengl/ThebesLayerOGL.cpp
@@ -587,63 +587,108 @@ BasicBufferOGL::BeginPaint(ContentType aContentType,
       // TEXTURE_2D.  This isn't the case on some older X1600-era Radeons.
       if (mOGLLayer->OGLManager()->FBOTextureTarget() == LOCAL_GL_TEXTURE_2D) {
         nsIntRect overlap;
+
+        // The buffer looks like:
+        //  ______
+        // |1  |2 |  Where the center point is offset by mBufferRotation from the top-left corner.
+        // |___|__|
+        // |3  |4 |
+        // |___|__|
+        //
+        // This is drawn to the screen as:
+        //  ______
+        // |4  |3 |  Where the center point is { width - mBufferRotation.x, height - mBufferRotation.y } from
+        // |___|__|  from the top left corner - rotationPoint.
+        // |2  |1 |
+        // |___|__|
+        //
+
+        // The basic idea below is to take all quadrant rectangles from the src and transform them into rectangles
+        // in the destination. Unfortunately, it seems it is overly complex and could perhaps be simplified.
+
+        nsIntRect srcBufferSpaceBottomRight(mBufferRotation.x, mBufferRotation.y, mBufferRect.width - mBufferRotation.x, mBufferRect.height - mBufferRotation.y);
+        nsIntRect srcBufferSpaceTopRight(mBufferRotation.x, 0, mBufferRect.width - mBufferRotation.x, mBufferRotation.y);
+        nsIntRect srcBufferSpaceTopLeft(0, 0, mBufferRotation.x, mBufferRotation.y);
+        nsIntRect srcBufferSpaceBottomLeft(0, mBufferRotation.y, mBufferRotation.x, mBufferRect.height - mBufferRotation.y);
+
         overlap.IntersectRect(mBufferRect, destBufferRect);
 
         nsIntRect srcRect(overlap), dstRect(overlap);
         srcRect.MoveBy(- mBufferRect.TopLeft() + mBufferRotation);
-        dstRect.MoveBy(- destBufferRect.TopLeft());
-        
-        if (mBufferRotation != nsIntPoint(0, 0)) {
-          // If mBuffer is rotated, then BlitTextureImage will only be copying the bottom-right section
-          // of the buffer. We need to invalidate the remaining sections so that they get redrawn too.
-          // Alternatively we could teach BlitTextureImage to rearrange the rotated segments onto
-          // the new buffer.
-          
-          // When the rotated buffer is reorganised, the bottom-right section will be drawn in the top left.
-          // Find the point where this content ends.
-          nsIntPoint rotationPoint(mBufferRect.x + mBufferRect.width - mBufferRotation.x, 
-                                   mBufferRect.y + mBufferRect.height - mBufferRotation.y);
 
-          // The buffer looks like:
-          //  ______
-          // |1  |2 |  Where the center point is offset by mBufferRotation from the top-left corner.
-          // |___|__|
-          // |3  |4 |
-          // |___|__|
-          //
-          // This is drawn to the screen as:
-          //  ______
-          // |4  |3 |  Where the center point is { width - mBufferRotation.x, height - mBufferRotation.y } from
-          // |___|__|  from the top left corner - rotationPoint. Since only quadrant 4 will actually be copied, 
-          // |2  |1 |  we need to invalidate the others.
-          // |___|__|
-          //
-          // Quadrants 2 and 1
-          nsIntRect bottom(mBufferRect.x, rotationPoint.y, mBufferRect.width, mBufferRotation.y);
-          // Quadrant 3
-          nsIntRect topright(rotationPoint.x, mBufferRect.y, mBufferRotation.x, rotationPoint.y - mBufferRect.y);
+        nsIntRect srcRectDrawTopRight(srcRect);
+        nsIntRect srcRectDrawTopLeft(srcRect);
+        nsIntRect srcRectDrawBottomLeft(srcRect);
+        // transform into the different quadrants
+        srcRectDrawTopRight  .MoveBy(-nsIntPoint(0, mBufferRect.height));
+        srcRectDrawTopLeft   .MoveBy(-nsIntPoint(mBufferRect.width, mBufferRect.height));
+        srcRectDrawBottomLeft.MoveBy(-nsIntPoint(mBufferRect.width, 0));
 
-          if (!bottom.IsEmpty()) {
-            nsIntRegion temp;
-            temp.And(destBufferRect, bottom);
-            result.mRegionToDraw.Or(result.mRegionToDraw, temp);
-          }
-          if (!topright.IsEmpty()) {
-            nsIntRegion temp;
-            temp.And(destBufferRect, topright);
-            result.mRegionToDraw.Or(result.mRegionToDraw, temp);
-          }
-        }
+        // Intersect with the quadrant
+        srcRect               = srcRect              .Intersect(srcBufferSpaceBottomRight);
+        srcRectDrawTopRight   = srcRectDrawTopRight  .Intersect(srcBufferSpaceTopRight);
+        srcRectDrawTopLeft    = srcRectDrawTopLeft   .Intersect(srcBufferSpaceTopLeft);
+        srcRectDrawBottomLeft = srcRectDrawBottomLeft.Intersect(srcBufferSpaceBottomLeft);
+
+        dstRect = srcRect;
+        nsIntRect dstRectDrawTopRight(srcRectDrawTopRight);
+        nsIntRect dstRectDrawTopLeft(srcRectDrawTopLeft);
+        nsIntRect dstRectDrawBottomLeft(srcRectDrawBottomLeft);
+
+        // transform back to src buffer space
+        dstRect              .MoveBy(-mBufferRotation);
+        dstRectDrawTopRight  .MoveBy(-mBufferRotation + nsIntPoint(0, mBufferRect.height));
+        dstRectDrawTopLeft   .MoveBy(-mBufferRotation + nsIntPoint(mBufferRect.width, mBufferRect.height));
+        dstRectDrawBottomLeft.MoveBy(-mBufferRotation + nsIntPoint(mBufferRect.width, 0));
+
+        // transform back to draw coordinates
+        dstRect              .MoveBy(mBufferRect.TopLeft());
+        dstRectDrawTopRight  .MoveBy(mBufferRect.TopLeft());
+        dstRectDrawTopLeft   .MoveBy(mBufferRect.TopLeft());
+        dstRectDrawBottomLeft.MoveBy(mBufferRect.TopLeft());
+
+        // transform to destBuffer space
+        dstRect              .MoveBy(-destBufferRect.TopLeft());
+        dstRectDrawTopRight  .MoveBy(-destBufferRect.TopLeft());
+        dstRectDrawTopLeft   .MoveBy(-destBufferRect.TopLeft());
+        dstRectDrawBottomLeft.MoveBy(-destBufferRect.TopLeft());
 
         destBuffer->Resize(destBufferRect.Size());
 
         gl()->BlitTextureImage(mTexImage, srcRect,
                                destBuffer, dstRect);
+        if (mBufferRotation != nsIntPoint(0, 0)) {
+          // Draw the remaining quadrants. We call BlitTextureImage 3 extra
+          // times instead of doing a single draw call because supporting that
+          // with a tiled source is quite tricky.
+          if (!srcRectDrawTopRight.IsEmpty())
+            gl()->BlitTextureImage(mTexImage, srcRectDrawTopRight,
+                                   destBuffer, dstRectDrawTopRight);
+          if (!srcRectDrawTopLeft.IsEmpty())
+            gl()->BlitTextureImage(mTexImage, srcRectDrawTopLeft,
+                                   destBuffer, dstRectDrawTopLeft);
+          if (!srcRectDrawBottomLeft.IsEmpty())
+            gl()->BlitTextureImage(mTexImage, srcRectDrawBottomLeft,
+                                   destBuffer, dstRectDrawBottomLeft);
+        }
         destBuffer->MarkValid();
         if (mode == Layer::SURFACE_COMPONENT_ALPHA) {
           destBufferOnWhite->Resize(destBufferRect.Size());
           gl()->BlitTextureImage(mTexImageOnWhite, srcRect,
                                  destBufferOnWhite, dstRect);
+          if (mBufferRotation != nsIntPoint(0, 0)) {
+            // draw the remaining quadrants
+            if (!srcRectDrawTopRight.IsEmpty())
+              gl()->BlitTextureImage(mTexImageOnWhite, srcRectDrawTopRight,
+                                     destBufferOnWhite, dstRectDrawTopRight);
+            if (!srcRectDrawTopLeft.IsEmpty())
+              gl()->BlitTextureImage(mTexImageOnWhite, srcRectDrawTopLeft,
+                                     destBufferOnWhite, dstRectDrawTopLeft);
+            if (!srcRectDrawBottomLeft.IsEmpty())
+              gl()->BlitTextureImage(mTexImageOnWhite, srcRectDrawBottomLeft,
+                                     destBufferOnWhite, dstRectDrawBottomLeft);
+          }
+
           destBufferOnWhite->MarkValid();
         }
       } else {

From c1723ffee1b4620e92b4ad1bc077d76717228057 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 13 Nov 2012 17:26:18 -0500
Subject: [PATCH 12/76] Bug 810170 - Properly handle extracted text
 notification and selection notification; r=cpeterson

---
 mobile/android/base/GeckoEditable.java        | 18 ++++-----
 mobile/android/base/GeckoInputConnection.java | 38 ++++++++++++++++---
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java
index 9e113fef4be9..746d0441ed82 100644
--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -553,14 +553,14 @@ final class GeckoEditable
             }
         } else {
             mText.replace(start, oldEnd, text, 0, text.length());
-            geckoPostToUI(new Runnable() {
-                public void run() {
-                    if (mListener != null) {
-                        mListener.onTextChange(text, start, oldEnd, newEnd);
-                    }
-                }
-            });
         }
+        geckoPostToUI(new Runnable() {
+            public void run() {
+                if (mListener != null) {
+                    mListener.onTextChange(text, start, oldEnd, newEnd);
+                }
+            }
+        });
     }
 
     // InvocationHandler interface
@@ -640,9 +640,7 @@ final class GeckoEditable
         }
         // Okay to remove immediately
         mText.removeSpan(what);
-        if (mUpdateGecko) {
-            mActionQueue.offer(new Action(Action.TYPE_REMOVE_SPAN));
-        }
+        mActionQueue.offer(new Action(Action.TYPE_REMOVE_SPAN));
     }
 
     @Override
diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index 64aab7b59151..0155eeb79738 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -64,6 +64,8 @@ class GeckoInputConnection
     protected int mBatchEditCount;
     private ExtractedTextRequest mUpdateRequest;
     private final ExtractedText mUpdateExtract = new ExtractedText();
+    private boolean mBatchSelectionChanged;
+    private boolean mBatchTextChanged;
 
     public static InputConnectionHandler create(View targetView,
                                                 GeckoEditableClient editable) {
@@ -94,6 +96,16 @@ class GeckoInputConnection
         if (mBatchEditCount > 0) {
             mBatchEditCount--;
             if (mBatchEditCount == 0) {
+                if (mBatchTextChanged) {
+                    notifyTextChange();
+                    mBatchTextChanged = false;
+                }
+                if (mBatchSelectionChanged) {
+                    Editable editable = getEditable();
+                    notifySelectionChange(Selection.getSelectionStart(editable),
+                                           Selection.getSelectionEnd(editable));
+                    mBatchSelectionChanged = false;
+                }
                 mEditableClient.setUpdateGecko(true);
             }
         } else {
@@ -191,10 +203,20 @@ class GeckoInputConnection
 
     public void onTextChange(String text, int start, int oldEnd, int newEnd) {
 
-        if (mBatchEditCount > 0 || mUpdateRequest == null) {
+        if (mUpdateRequest == null) {
             return;
         }
 
+        if (mBatchEditCount > 0) {
+            // Delay notification until after the batch edit
+            mBatchTextChanged = true;
+            return;
+        }
+        notifyTextChange();
+    }
+
+    private void notifyTextChange() {
+
         final InputMethodManager imm = getInputMethodManager();
         if (imm == null) {
             return;
@@ -203,10 +225,9 @@ class GeckoInputConnection
         final Editable editable = getEditable();
 
         mUpdateExtract.flags = 0;
-        // Update from (0, oldEnd) to (0, newEnd) because some IMEs
-        // assume that updates start at zero, according to jchen.
-        mUpdateExtract.partialStartOffset = 0;
-        mUpdateExtract.partialEndOffset = editable.length();
+        // Update the entire Editable range
+        mUpdateExtract.partialStartOffset = -1;
+        mUpdateExtract.partialEndOffset = -1;
         mUpdateExtract.selectionStart =
                 Selection.getSelectionStart(editable);
         mUpdateExtract.selectionEnd =
@@ -221,8 +242,15 @@ class GeckoInputConnection
     public void onSelectionChange(int start, int end) {
 
         if (mBatchEditCount > 0) {
+            // Delay notification until after the batch edit
+            mBatchSelectionChanged = true;
             return;
         }
+        notifySelectionChange(start, end);
+    }
+
+    private void notifySelectionChange(int start, int end) {
+
         final InputMethodManager imm = getInputMethodManager();
         if (imm == null) {
             return;

From 0b59e691521612d3848c9aeffae3949cc22a5469 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 13 Nov 2012 17:27:19 -0500
Subject: [PATCH 13/76] Bug 808287 - Fix out-of-order IME events during focus
 change; r=cpeterson

---
 mobile/android/base/GeckoEditable.java |  6 ++++++
 mobile/android/base/GeckoEvent.java    |  1 +
 widget/android/AndroidJavaWrappers.h   |  3 ++-
 widget/android/nsWindow.cpp            | 21 ++++++++++++++++++++-
 widget/android/nsWindow.h              |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java
index 746d0441ed82..e9abea9f3952 100644
--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -53,6 +53,7 @@ final class GeckoEditable
     private static final boolean DEBUG = false;
     private static final String LOGTAG = "GeckoEditable";
     private static final int NOTIFY_IME_REPLY_EVENT = 1;
+    private static final int NOTIFY_IME_FOCUSCHANGE = 3;
 
     // Filters to implement Editable's filtering functionality
     private InputFilter[] mFilters;
@@ -464,6 +465,11 @@ final class GeckoEditable
             public void run() {
                 // Make sure there are no other things going on
                 mActionQueue.syncWithGecko();
+                if (type == NOTIFY_IME_FOCUSCHANGE && state != 0) {
+                    // Unmask events on the Gecko side
+                    GeckoAppShell.sendEventToGecko(GeckoEvent.createIMEEvent(
+                            GeckoEvent.IME_ACKNOWLEDGE_FOCUS));
+                }
                 if (mListener != null) {
                     mListener.notifyIME(type, state);
                 }
diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java
index 578c7c39442f..2200f6966243 100644
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -86,6 +86,7 @@ public class GeckoEvent {
     public static final int IME_ADD_COMPOSITION_RANGE = 3;
     public static final int IME_UPDATE_COMPOSITION = 4;
     public static final int IME_REMOVE_COMPOSITION = 5;
+    public static final int IME_ACKNOWLEDGE_FOCUS = 6;
 
     public static final int IME_RANGE_CARETPOSITION = 1;
     public static final int IME_RANGE_RAWINPUT = 2;
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index 8742278c72a7..20a8a5c6008f 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -815,7 +815,8 @@ public:
         IME_SET_SELECTION = 2,
         IME_ADD_COMPOSITION_RANGE = 3,
         IME_UPDATE_COMPOSITION = 4,
-        IME_REMOVE_COMPOSITION = 5
+        IME_REMOVE_COMPOSITION = 5,
+        IME_ACKNOWLEDGE_FOCUS = 6
     };
 };
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 9c64b17fdd28..31421048dfdd 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -163,7 +163,9 @@ nsWindow::nsWindow() :
     mFocus(nullptr),
     mIMEComposing(false),
     mIMEMaskSelectionUpdate(false),
-    mIMEMaskTextUpdate(false)
+    mIMEMaskTextUpdate(false),
+    // Mask IME events initially because there is no focused editors yet
+    mIMEMaskEvents(true)
 {
 }
 
@@ -1880,6 +1882,18 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
            composition through update composition events
     */
     nsRefPtr<nsWindow> kungFuDeathGrip(this);
+
+    if (ae->Action() == AndroidGeckoEvent::IME_ACKNOWLEDGE_FOCUS) {
+        mIMEMaskEvents = false;
+        return;
+    } else if (mIMEMaskEvents) {
+        // Still reply to events, but don't do anything else
+        if (ae->Action() == AndroidGeckoEvent::IME_SYNCHRONIZE ||
+                ae->Action() == AndroidGeckoEvent::IME_REPLACE_TEXT) {
+            AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_REPLY_EVENT, 0);
+        }
+        return;
+    }
     switch (ae->Action()) {
     case AndroidGeckoEvent::IME_SYNCHRONIZE:
         {
@@ -2166,6 +2180,11 @@ nsWindow::OnIMEFocusChange(bool aFocus)
     if (aFocus) {
         OnIMETextChange(0, INT32_MAX, INT32_MAX);
         OnIMESelectionChange();
+    } else {
+        // Mask events because we lost focus. On the next focus event, Gecko will notify
+        // Java, and Java will send an acknowledge focus event back to Gecko. That is
+        // where we unmask event handling
+        mIMEMaskEvents = true;
     }
 
     AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_FOCUSCHANGE,
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index 5e4ae6d8527c..760d8a277814 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -184,6 +184,7 @@ protected:
 
     bool mIMEComposing;
     bool mIMEMaskSelectionUpdate, mIMEMaskTextUpdate;
+    bool mIMEMaskEvents;
     nsString mIMEComposingText;
     nsAutoTArray<nsTextRange, 4> mIMERanges;
 

From 6a1f18041e952e02218ce1306e6bb8702c645b14 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 13 Nov 2012 17:27:26 -0500
Subject: [PATCH 14/76] Bug 808287 - Follow-up to combine IME enums, etc;
 r=cpeterson

---
 mobile/android/base/GeckoEditable.java        | 18 +++++++++++++++---
 mobile/android/base/GeckoInputConnection.java | 10 ----------
 widget/android/nsWindow.cpp                   |  8 ++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java
index e9abea9f3952..c1ed9a4ff0ce 100644
--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -34,6 +34,20 @@ interface GeckoEditableClient {
 /* interface for the Editable to listen to the Gecko thread
    and also for the UI thread to listen to the Editable */
 interface GeckoEditableListener {
+    // IME notification type for notifyIME()
+    final int NOTIFY_IME_RESETINPUTSTATE = 0;
+    final int NOTIFY_IME_REPLY_EVENT = 1;
+    final int NOTIFY_IME_CANCELCOMPOSITION = 2;
+    final int NOTIFY_IME_FOCUSCHANGE = 3;
+    // IME focus state for notifyIME(NOTIFY_IME_FOCUSCHANGE, ..)
+    final int IME_FOCUS_STATE_FOCUS = 1;
+    final int IME_FOCUS_STATE_BLUR = 0;
+    // IME enabled state for notifyIMEEnabled()
+    final int IME_STATE_DISABLED = 0;
+    final int IME_STATE_ENABLED = 1;
+    final int IME_STATE_PASSWORD = 2;
+    final int IME_STATE_PLUGIN = 3;
+
     void notifyIME(int type, int state);
     void notifyIMEEnabled(int state, String typeHint,
                           String modeHint, String actionHint);
@@ -52,8 +66,6 @@ final class GeckoEditable
 
     private static final boolean DEBUG = false;
     private static final String LOGTAG = "GeckoEditable";
-    private static final int NOTIFY_IME_REPLY_EVENT = 1;
-    private static final int NOTIFY_IME_FOCUSCHANGE = 3;
 
     // Filters to implement Editable's filtering functionality
     private InputFilter[] mFilters;
@@ -465,7 +477,7 @@ final class GeckoEditable
             public void run() {
                 // Make sure there are no other things going on
                 mActionQueue.syncWithGecko();
-                if (type == NOTIFY_IME_FOCUSCHANGE && state != 0) {
+                if (type == NOTIFY_IME_FOCUSCHANGE && state != IME_FOCUS_STATE_BLUR) {
                     // Unmask events on the Gecko side
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createIMEEvent(
                             GeckoEvent.IME_ACKNOWLEDGE_FOCUS));
diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index 0155eeb79738..36a4265825b8 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -39,16 +39,6 @@ class GeckoInputConnection
     private static final boolean DEBUG = false;
     protected static final String LOGTAG = "GeckoInputConnection";
 
-    // IME stuff
-    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;
-
-    private static final int NOTIFY_IME_RESETINPUTSTATE = 0;
-    private static final int NOTIFY_IME_CANCELCOMPOSITION = 2;
-    private static final int NOTIFY_IME_FOCUSCHANGE = 3;
-
     private static final int INLINE_IME_MIN_DISPLAY_SIZE = 480;
 
     private static final Timer mIMETimer = new Timer("GeckoInputConnection Timer");
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 31421048dfdd..19b856918aab 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -164,8 +164,7 @@ nsWindow::nsWindow() :
     mIMEComposing(false),
     mIMEMaskSelectionUpdate(false),
     mIMEMaskTextUpdate(false),
-    // Mask IME events initially because there is no focused editors yet
-    mIMEMaskEvents(true)
+    mIMEMaskEvents(true) // Mask IME events since there's no focus yet
 {
 }
 
@@ -1886,10 +1885,11 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
     if (ae->Action() == AndroidGeckoEvent::IME_ACKNOWLEDGE_FOCUS) {
         mIMEMaskEvents = false;
         return;
-    } else if (mIMEMaskEvents) {
+    }
+    if (mIMEMaskEvents) {
         // Still reply to events, but don't do anything else
         if (ae->Action() == AndroidGeckoEvent::IME_SYNCHRONIZE ||
-                ae->Action() == AndroidGeckoEvent::IME_REPLACE_TEXT) {
+            ae->Action() == AndroidGeckoEvent::IME_REPLACE_TEXT) {
             AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_REPLY_EVENT, 0);
         }
         return;

From 95dbcb905d5866ea17212afec74fe88164f29d58 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Tue, 13 Nov 2012 10:20:40 +0900
Subject: [PATCH 15/76] Bug 808287 nsTextStateManager shouldn't notify widget
 of selection changes and text changes after IME loses focus r=smaug

---
 content/events/src/nsIMEStateManager.cpp | 35 ++++++++++++------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
index 44ffe8a2a389..4e0f7afc4796 100644
--- a/content/events/src/nsIMEStateManager.cpp
+++ b/content/events/src/nsIMEStateManager.cpp
@@ -775,6 +775,8 @@ nsTextStateManager::Destroy(void)
                          false, false))->RunDOMEventWhenSafe();
   }
   mWidget->OnIMEFocusChange(false);
+  // Even if there are some pending notification, it'll never notify the widget.
+  mWidget = nullptr;
   if (mObserving && mSel) {
     nsCOMPtr<nsISelectionPrivate> selPrivate(do_QueryInterface(mSel));
     if (selPrivate)
@@ -786,7 +788,6 @@ nsTextStateManager::Destroy(void)
   }
   mRootContent = nullptr;
   mEditableNode = nullptr;
-  mWidget = nullptr;
   mObserving = false;
 }
 
@@ -811,21 +812,21 @@ NS_IMPL_ISUPPORTS2(nsTextStateManager,
 // Helper class, used for selection change notification
 class SelectionChangeEvent : public nsRunnable {
 public:
-  SelectionChangeEvent(nsIWidget *widget)
-    : mWidget(widget)
+  SelectionChangeEvent(nsTextStateManager *aDispatcher)
+    : mDispatcher(aDispatcher)
   {
-    MOZ_ASSERT(mWidget);
+    MOZ_ASSERT(mDispatcher);
   }
 
   NS_IMETHOD Run() {
-    if(mWidget) {
-        mWidget->OnIMESelectionChange();
+    if (mDispatcher->mWidget) {
+      mDispatcher->mWidget->OnIMESelectionChange();
     }
     return NS_OK;
   }
 
 private:
-  nsCOMPtr<nsIWidget> mWidget;
+  nsRefPtr<nsTextStateManager> mDispatcher;
 };
 
 nsresult
@@ -837,7 +838,7 @@ nsTextStateManager::NotifySelectionChanged(nsIDOMDocument* aDoc,
   nsresult rv = aSel->GetRangeCount(&count);
   NS_ENSURE_SUCCESS(rv, rv);
   if (count > 0 && mWidget) {
-    nsContentUtils::AddScriptRunner(new SelectionChangeEvent(mWidget));
+    nsContentUtils::AddScriptRunner(new SelectionChangeEvent(this));
   }
   return NS_OK;
 }
@@ -845,25 +846,25 @@ nsTextStateManager::NotifySelectionChanged(nsIDOMDocument* aDoc,
 // Helper class, used for text change notification
 class TextChangeEvent : public nsRunnable {
 public:
-  TextChangeEvent(nsIWidget *widget,
+  TextChangeEvent(nsTextStateManager* aDispatcher,
                   uint32_t start, uint32_t oldEnd, uint32_t newEnd)
-    : mWidget(widget)
+    : mDispatcher(aDispatcher)
     , mStart(start)
     , mOldEnd(oldEnd)
     , mNewEnd(newEnd)
   {
-    MOZ_ASSERT(mWidget);
+    MOZ_ASSERT(mDispatcher);
   }
 
   NS_IMETHOD Run() {
-    if(mWidget) {
-        mWidget->OnIMETextChange(mStart, mOldEnd, mNewEnd);
+    if (mDispatcher->mWidget) {
+      mDispatcher->mWidget->OnIMETextChange(mStart, mOldEnd, mNewEnd);
     }
     return NS_OK;
   }
 
 private:
-  nsCOMPtr<nsIWidget> mWidget;
+  nsRefPtr<nsTextStateManager> mDispatcher;
   uint32_t mStart, mOldEnd, mNewEnd;
 };
 
@@ -885,7 +886,7 @@ nsTextStateManager::CharacterDataChanged(nsIDocument* aDocument,
   uint32_t newEnd = offset + aInfo->mReplaceLength;
 
   nsContentUtils::AddScriptRunner(
-      new TextChangeEvent(mWidget, offset, oldEnd, newEnd));
+      new TextChangeEvent(this, offset, oldEnd, newEnd));
 }
 
 void
@@ -907,7 +908,7 @@ nsTextStateManager::NotifyContentAdded(nsINode* aContainer,
   // fire notification
   if (newOffset)
     nsContentUtils::AddScriptRunner(
-        new TextChangeEvent(mWidget, offset, offset, offset + newOffset));
+        new TextChangeEvent(this, offset, offset, offset + newOffset));
 }
 
 void
@@ -956,7 +957,7 @@ nsTextStateManager::ContentRemoved(nsIDocument* aDocument,
   // fire notification
   if (childOffset)
     nsContentUtils::AddScriptRunner(
-        new TextChangeEvent(mWidget, offset, offset + childOffset, offset));
+        new TextChangeEvent(this, offset, offset + childOffset, offset));
 }
 
 bool

From 32a8eee843413d6a6430ef0267d2f4eed4e0746f Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Tue, 13 Nov 2012 10:18:57 +0900
Subject: [PATCH 16/76] Bug 805766 nsFocusManager should change IME state
 before dispatching focus event at activating different document r=enndeakin

---
 dom/base/nsFocusManager.cpp     |  2 ++
 widget/tests/test_imestate.html | 41 ++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 148cd8c8293e..f6ebe3719713 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1755,6 +1755,8 @@ nsFocusManager::Focus(nsPIDOMWindow* aWindow,
   // if switching to a new document, first fire the focus event on the
   // document and then the window.
   if (aIsNewDocument) {
+    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nullptr,
+                                     GetFocusMoveActionCause(aFlags));
     nsIDocument* doc = aWindow->GetExtantDoc();
     if (doc)
       SendFocusOrBlurEvent(NS_FOCUS_CONTENT, presShell, doc,
diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html
index 2d8623a1eecf..7ca3833a12c2 100644
--- a/widget/tests/test_imestate.html
+++ b/widget/tests/test_imestate.html
@@ -160,12 +160,15 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
       }
       var previousFocusedElement = gFM.focusedElement;
       var element = document.getElementById(aTest.id);
+      var focusEventTarget = element;
       var subDocument = null;
       if (element.contentDocument) {
+        focusEventTarget = element.contentDocument;
         subDocument = element.contentDocument;
         element = element.contentDocument.documentElement;
       }
 
+      focusEventTarget.addEventListener("focus", aFocusEventHandler, true);
       document.addEventListener("MozIMEFocusIn", aFocusEventHandler, true);
       document.addEventListener("MozIMEFocusOut", aFocusEventHandler, true);
       if (subDocument) {
@@ -175,6 +178,7 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
 
       element.focus();
 
+      focusEventTarget.removeEventListener("focus", aFocusEventHandler, true);
       document.removeEventListener("MozIMEFocusIn", aFocusEventHandler, true);
       document.removeEventListener("MozIMEFocusOut", aFocusEventHandler, true);
       if (element.contentDocument) {
@@ -215,6 +219,7 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
     // IME Enabled state testing
     var enabled = gUtils.IME_STATUS_ENABLED;
     if (kIMEEnabledSupported) {
+      var focusEventCount = 0;
       var mozIMEFocusInCount = 0;
       var mozIMEFocusOutCount = 0;
       var IMEHasFocus = false;
@@ -222,6 +227,11 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
       function onFocus(aEvent)
       {
         switch (aEvent.type) {
+          case "focus":
+            focusEventCount++;
+            is(gUtils.IMEStatus, aTest.expectedEnabled,
+               aDescription + ": " + aTest.description + ", wrong enabled state at focus event");
+            break;
           case "MozIMEFocusIn":
             mozIMEFocusInCount++;
             IMEHasFocus = true;
@@ -245,36 +255,25 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
 
       if (aTest.focusable) {
         if (!aTest.focusEventNotFired) {
+          ok(focusEventCount > 0,
+             aDescription + ": " + aTest.description + ", focus event is never fired");
           if (aTest.expectedEnabled == gUtils.IME_STATUS_ENABLED || aTest.expectedEnabled == gUtils.IME_STATUS_PASSWORD) {
+            ok(mozIMEFocusInCount > 0,
+               aDescription + ": " + aTest.description + ", MozIMEFocusIn event should be fired");
             var toDesignModeEditor = (document.activeElement.contentDocument &&
                                       (document.activeElement.contentDocument.designMode == "on"));
-            if (aInDesignMode && toDesignModeEditor) {
+            if (aInDesignMode && !toDesignModeEditor) {
               is(mozIMEFocusOutCount, 0,
                  aDescription + ": " + aTest.description +
                    ", MozIMEFocusOut event shouldn't be fired in designMode since focus isn't moved from another editor");
-              todo(mozIMEFocusInCount > 0,
-                   aDescription + ": " + aTest.description + ", MozIMEFocusIn event should be fired"); // bug 805766
             } else {
               ok(mozIMEFocusOutCount > 0,
                  aDescription + ": " + aTest.description +
                    ", MozIMEFocusOut event should be fired for the previous focused editor");
-              if (toDesignModeEditor) {
-                todo(mozIMEFocusInCount > 0,
-                     aDescription + ": " + aTest.description + ", MozIMEFocusIn event should be fired"); // bug 805766
-              } else {
-                ok(mozIMEFocusInCount > 0,
-                   aDescription + ": " + aTest.description + ", MozIMEFocusIn event should be fired");
-              }
-            }
-            if (aInDesignMode || toDesignModeEditor) { // bug 805766
-              todo(IMEHasFocus,
-                   aDescription + ": " + aTest.description +
-                     ", The latest MozIMEFocus* event must be MozIMEFocusIn");
-            } else {
-              ok(IMEHasFocus,
-                 aDescription + ": " + aTest.description +
-                   ", The latest MozIMEFocus* event must be MozIMEFocusIn");
             }
+            ok(IMEHasFocus,
+               aDescription + ": " + aTest.description +
+                 ", The latest MozIMEFocus* event must be MozIMEFocusIn");
           } else {
             is(mozIMEFocusInCount, 0,
                aDescription + ": " + aTest.description +
@@ -287,8 +286,8 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
                  ", The latest MozIMEFocus* event must be MozIMEFocusOut");
           }
         } else {
-          todo(false, aDescription + ": " + aTest.description +
-               ", In this case, focus event isn't fired, it's a bug, so, couldn't test it");
+          todo(focusEventCount > 0,
+               aDescription + ": " + aTest.description + ", focus event should be fired");
         }
       } else {
         is(mozIMEFocusInCount, 0,

From b016c92883dc701c9d219e37c83c34b43f068d56 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 13 Nov 2012 18:25:09 -0500
Subject: [PATCH 17/76] Backed out changeset 43e4b01c0150 (bug 810186) for
 reftest failures.

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

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 7013c2c33024..eeda339c52ec 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2052,7 +2052,6 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
 
     // Assign the item to a layer
     if (layerState == LAYER_ACTIVE_FORCE ||
-        (layerState == LAYER_INACTIVE && !mManager->IsWidgetLayerManager()) ||
         (!forceInactive &&
          (layerState == LAYER_ACTIVE_EMPTY ||
           layerState == LAYER_ACTIVE))) {
@@ -2697,7 +2696,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
   gfxMatrix transform2d;
   bool canDraw2D = transform.CanDraw2D(&transform2d);
   gfxSize scale;
-  bool isRetained = aLayer->Manager()->IsWidgetLayerManager();
+  bool isRetained = aLayerBuilder->GetRetainingLayerManager() == aLayer->Manager();
   // Only fiddle with scale factors for the retaining layer manager, since
   // it only matters for retained layers
   // XXX Should we do something for 3D transforms?

From 8c41c8d21a3e2f6a51fb4dd3b9ddabb17f16f667 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 13 Nov 2012 11:44:36 -0800
Subject: [PATCH 18/76] bug 684176 - Intermittent failure in test_bug454235.xul
 | offscreen browser is not visible r=smaug

---
 docshell/test/chrome/test_bug454235.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docshell/test/chrome/test_bug454235.xul b/docshell/test/chrome/test_bug454235.xul
index 6d8e9ddebc37..f9107a1865d1 100644
--- a/docshell/test/chrome/test_bug454235.xul
+++ b/docshell/test/chrome/test_bug454235.xul
@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=454235
     /** Test for Bug 454235 **/
 SimpleTest.waitForExplicitFinish();
 
-addLoadEvent(doTest);
+SimpleTest.waitForFocus(doTest);
 
 function doTest() {
   var shownBrowser = document.getElementById("shownBrowser");

From 7815f1867f16631944eb8aa2741c91090a73de65 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 1 Nov 2012 08:47:51 -0400
Subject: [PATCH 19/76] bug 739542 - Disable screen timeout when playing HTML5
 <video> (webm, H.264) r=doublec

---
 .../html/content/public/nsHTMLMediaElement.h  | 16 ++++++++++++++-
 .../html/content/src/nsHTMLMediaElement.cpp   | 20 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index e863f6a9d9b6..ef10e03e8fca 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -22,6 +22,7 @@
 #include "nsDOMMediaStream.h"
 #include "mozilla/Mutex.h"
 #include "nsTimeRanges.h"
+#include "nsIDOMWakeLock.h"
 
 // Define to output information on decoding and painting framerate
 /* #define DEBUG_FRAME_RATE 1 */
@@ -388,6 +389,19 @@ protected:
   class MediaLoadListener;
   class StreamListener;
 
+  class WakeLockBoolWrapper {
+  public:
+    WakeLockBoolWrapper(bool val = false) : mValue(val), mOuter(NULL), mWakeLock(NULL) {}
+    void SetOuter(nsHTMLMediaElement* outer) { mOuter = outer; }
+    operator bool() { return mValue; }
+    WakeLockBoolWrapper& operator=(bool val);
+    bool operator !() const { return !mValue; }
+  private:
+    bool mValue;
+    nsHTMLMediaElement* mOuter;
+    nsCOMPtr<nsIDOMMozWakeLock> mWakeLock;
+  };
+
   /**
    * Logs a warning message to the web console to report various failures.
    * aMsg is the localized message identifier, aParams is the parameters to
@@ -814,7 +828,7 @@ protected:
 
   // Playback of the video is paused either due to calling the
   // 'Pause' method, or playback not yet having started.
-  bool mPaused;
+  WakeLockBoolWrapper mPaused;
 
   // True if the sound is muted.
   bool mMuted;
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 28f364c345ed..03f8858e67d2 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -70,6 +70,7 @@
 #include "nsIMediaList.h"
 
 #include "ImageContainer.h"
+#include "nsIPowerManagerService.h"
 
 #ifdef MOZ_OGG
 #include "nsOggDecoder.h"
@@ -1747,6 +1748,8 @@ nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
   }
 #endif
 
+  mPaused.SetOuter(this);
+
   RegisterFreezableElement();
   NotifyOwnerDocumentActivityChanged();
 }
@@ -1869,6 +1872,23 @@ NS_IMETHODIMP nsHTMLMediaElement::Play()
   return NS_OK;
 }
 
+nsHTMLMediaElement::WakeLockBoolWrapper& nsHTMLMediaElement::WakeLockBoolWrapper::operator=(bool val) {
+  if (mValue == val)
+    return *this;
+  if (!mWakeLock && !val && mOuter) {
+    nsCOMPtr<nsIPowerManagerService> pmService =
+      do_GetService(POWERMANAGERSERVICE_CONTRACTID);
+    NS_ENSURE_TRUE(pmService, *this);
+
+    pmService->NewWakeLock(NS_LITERAL_STRING("Playing_media"), mOuter->OwnerDoc()->GetWindow(), getter_AddRefs(mWakeLock));
+  } else if (mWakeLock && val) {
+    mWakeLock->Unlock();
+    mWakeLock = NULL;
+  }
+  mValue = val;
+  return *this;
+}
+
 bool nsHTMLMediaElement::ParseAttribute(int32_t aNamespaceID,
                                           nsIAtom* aAttribute,
                                           const nsAString& aValue,

From d4abf011ce5aa5ce1c13134bfa44c59982d8b9ce Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 13 Nov 2012 11:25:18 -0800
Subject: [PATCH 20/76] bug 749352 - Firefox fails to connect when a proxy is
 used r=mfinkle,mossop

--HG--
rename : toolkit/system/windowsproxy/Makefile.in => toolkit/system/androidproxy/Makefile.in
rename : toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp => toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
---
 mobile/android/base/GeckoAppShell.java        | 43 +++++++++
 toolkit/Makefile.in                           |  4 +
 toolkit/library/Makefile.in                   |  6 ++
 toolkit/library/nsStaticXULComponents.cpp     |  7 ++
 toolkit/system/androidproxy/Makefile.in       | 26 ++++++
 .../nsAndroidSystemProxySettings.cpp          | 91 +++++++++++++++++++
 toolkit/toolkit-makefiles.sh                  |  1 +
 widget/android/AndroidBridge.cpp              | 31 +++++++
 widget/android/AndroidBridge.h                |  7 +-
 9 files changed, 215 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/system/androidproxy/Makefile.in
 create mode 100644 toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp

diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index 8e078e16360d..ae6d3204cf89 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -97,6 +97,9 @@ import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.SynchronousQueue;
+import java.net.ProxySelector;
+import java.net.Proxy;
+import java.net.URI;
 
 public class GeckoAppShell
 {
@@ -2233,4 +2236,44 @@ public class GeckoAppShell
         }
         return false;
     }
+
+    public static String getProxyForURI(String spec, String scheme, String host, int port) {
+        URI uri = null;
+        try {
+            uri = new URI(spec);
+        } catch(java.net.URISyntaxException uriEx) {
+            try {
+                uri = new URI(scheme, null, host, port, null, null, null);
+            } catch(java.net.URISyntaxException uriEx2) {
+                Log.d("GeckoProxy", "Failed to create uri from spec", uriEx);
+                Log.d("GeckoProxy", "Failed to create uri from parts", uriEx2);
+            }
+        }
+        if (uri != null) {
+            ProxySelector ps = ProxySelector.getDefault();
+            if (ps != null) {
+                List<Proxy> proxies = ps.select(uri);
+                if (proxies != null && !proxies.isEmpty()) {
+                    Proxy proxy = proxies.get(0);
+                    if (!Proxy.NO_PROXY.equals(proxy)) {
+                        final String proxyStr;
+                        switch (proxy.type()) {
+                        case HTTP:
+                            proxyStr = "PROXY " + proxy.address().toString();
+                            break;
+                        case SOCKS:
+                            proxyStr = "SOCKS " + proxy.address().toString();
+                            break;
+                        case DIRECT:
+                        default:
+                            proxyStr = "DIRECT";
+                            break;
+                        }
+                        return proxyStr;
+                    }
+                }
+            }
+        }
+        return "DIRECT";
+    }
 }
diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in
index 3e95f4ba6468..f7f5ce2de6b8 100644
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -51,6 +51,10 @@ ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 PARALLEL_DIRS += system/windowsproxy
 endif
 
+ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
+PARALLEL_DIRS += system/androidproxy
+endif
+
 ifdef MOZ_CRASHREPORTER
 PARALLEL_DIRS += crashreporter
 endif
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 677f45408064..e4e8ca4acbc2 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -215,6 +215,12 @@ COMPONENT_LIBS += \
   $(NULL)
 endif
 
+ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
+COMPONENT_LIBS += \
+  androidproxy \
+  $(NULL)
+endif
+
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 COMPONENT_LIBS += \
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index 85b21a2875b1..af05e57b194f 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -143,6 +143,12 @@
 #define WINDOWSPROXY_MODULE
 #endif
 
+#if defined(MOZ_WIDGET_ANDROID)
+#define ANDROIDPROXY_MODULE MODULE(nsAndroidProxyModule)
+#else
+#define ANDROIDPROXY_MODULE
+#endif
+
 #if defined(BUILD_CTYPES)
 #define JSCTYPES_MODULE MODULE(jsctypes)
 #else
@@ -224,6 +230,7 @@
     UNIXPROXY_MODULE                         \
     OSXPROXY_MODULE                          \
     WINDOWSPROXY_MODULE                      \
+    ANDROIDPROXY_MODULE                      \
     JSCTYPES_MODULE                          \
     MODULE(jsreflect)                        \
     MODULE(jsperf)                           \
diff --git a/toolkit/system/androidproxy/Makefile.in b/toolkit/system/androidproxy/Makefile.in
new file mode 100644
index 000000000000..5bda806347f5
--- /dev/null
+++ b/toolkit/system/androidproxy/Makefile.in
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH     = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE          = androidproxy
+LIBRARY_NAME    = androidproxy
+
+EXPORT_LIBRARY  = 1
+IS_COMPONENT    = 1
+MODULE_NAME     = nsAndroidProxyModule
+GRE_MODULE      = 1
+LIBXUL_LIBRARY  = 1
+
+
+CPPSRCS = \
+        nsAndroidSystemProxySettings.cpp \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
new file mode 100644
index 000000000000..d97bac4c4b89
--- /dev/null
+++ b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsNetUtil.h"
+#include "nsIURI.h"
+
+#include "mozilla/Util.h"
+#include "nsISystemProxySettings.h"
+#include "nsIServiceManager.h"
+#include "mozilla/ModuleUtils.h"
+#include "nsPrintfCString.h"
+#include "nsNetUtil.h"
+#include "nsISupportsPrimitives.h"
+#include "nsIURI.h"
+
+#include "AndroidBridge.h"
+
+class nsAndroidSystemProxySettings : public nsISystemProxySettings
+{
+public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSISYSTEMPROXYSETTINGS
+
+    nsAndroidSystemProxySettings() {};
+    nsresult Init();
+
+private:
+    ~nsAndroidSystemProxySettings() {};
+};
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAndroidSystemProxySettings, nsISystemProxySettings)
+
+NS_IMETHODIMP
+nsAndroidSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
+{
+  *aMainThreadOnly = true;
+  return NS_OK;
+}
+
+
+nsresult
+nsAndroidSystemProxySettings::Init()
+{
+    return NS_OK;
+}
+
+nsresult
+nsAndroidSystemProxySettings::GetPACURI(nsACString& aResult)
+{
+    return NS_OK;
+}
+
+nsresult
+nsAndroidSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
+                                             const nsACString & aScheme,
+                                             const nsACString & aHost,
+                                             const int32_t      aPort,
+                                             nsACString & aResult)
+{
+    return mozilla::AndroidBridge::Bridge()->GetProxyForURI(aSpec, aScheme, aHost, aPort, aResult);
+}
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAndroidSystemProxySettings, Init)
+
+#define NS_ANDROIDSYSTEMPROXYSERVICE_CID                    \
+    {0xf01f0060, 0x3708, 0x478e,                            \
+    {0xb9, 0x35, 0x3e, 0xce, 0x8b, 0xe2, 0x94, 0xb8}}
+
+NS_DEFINE_NAMED_CID(NS_ANDROIDSYSTEMPROXYSERVICE_CID);
+
+void test() {};
+
+static const mozilla::Module::CIDEntry kSysProxyCIDs[] = {
+    { &kNS_ANDROIDSYSTEMPROXYSERVICE_CID, false, NULL, nsAndroidSystemProxySettingsConstructor },
+    { NULL }
+};
+
+static const mozilla::Module::ContractIDEntry kSysProxyContracts[] = {
+    { NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_ANDROIDSYSTEMPROXYSERVICE_CID },
+    { NULL }
+};
+
+static const mozilla::Module kSysProxyModule = {
+    mozilla::Module::kVersion,
+    kSysProxyCIDs,
+    kSysProxyContracts
+};
+
+NSMODULE_DEFN(nsAndroidProxyModule) = &kSysProxyModule;
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 5ae3a99c9d97..b8d6e1325112 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -632,6 +632,7 @@ elif [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
     image/decoders/icon/android/Makefile
     netwerk/system/android/Makefile
     widget/android/Makefile
+    toolkit/system/androidproxy/Makefile
   "
   if [ "$MOZ_BUILD_APP" = "mobile/xul" -o "$MOZ_BUILD_APP" = "b2g" ]; then
     add_makefiles "
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index 695ffdb7d988..22749d11f371 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -202,6 +202,7 @@ AndroidBridge::Init(JNIEnv *jEnv,
     jNotifyWakeLockChanged = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyWakeLockChanged", "(Ljava/lang/String;Ljava/lang/String;)V");
 
     jGetGfxInfoData = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getGfxInfoData", "()Ljava/lang/String;");
+    jGetProxyForURI = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getProxyForURI", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
     jRegisterSurfaceTextureFrameListener = jEnv->GetStaticMethodID(jGeckoAppShellClass, "registerSurfaceTextureFrameListener", "(Ljava/lang/Object;I)V");
     jUnregisterSurfaceTextureFrameListener = jEnv->GetStaticMethodID(jGeckoAppShellClass, "unregisterSurfaceTextureFrameListener", "(Ljava/lang/Object;)V");
 
@@ -2399,6 +2400,36 @@ AndroidBridge::GetGfxInfoData(nsACString& aRet)
     CopyUTF16toUTF8(jniStr, aRet);
 }
 
+#define CREATE_JAVA_STRING(name) jstring j##name = NewJavaStringUTF(&jniFrame, nsPromiseFlatCString(a##name).get())
+
+nsresult
+AndroidBridge::GetProxyForURI(const nsACString & aSpec,
+                              const nsACString & aScheme,
+                              const nsACString & aHost,
+                              const int32_t      aPort,
+                              nsACString & aResult)
+{
+    JNIEnv* env = GetJNIEnv();
+    if (!env)
+        return NS_ERROR_FAILURE;
+
+    AutoLocalJNIFrame jniFrame(env);
+
+    CREATE_JAVA_STRING(Spec);
+    CREATE_JAVA_STRING(Scheme);
+    CREATE_JAVA_STRING(Host);
+    jstring jstrRet = static_cast<jstring>
+        (env->CallStaticObjectMethod(mGeckoAppShellClass, jGetProxyForURI, jSpec, jScheme, jHost, aPort));
+
+    if (jniFrame.CheckForException())
+        return NS_ERROR_FAILURE;
+
+    nsJNIString jniStr(jstrRet, env);
+    CopyUTF16toUTF8(jniStr, aResult);
+    return NS_OK;
+}
+
+
 /* attribute nsIAndroidBrowserApp browserApp; */
 NS_IMETHODIMP nsAndroidBridge::GetBrowserApp(nsIAndroidBrowserApp * *aBrowserApp)
 {
diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
index 7cecd541f84d..b09955f8b9e0 100644
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -366,7 +366,11 @@ public:
     void UnregisterSurfaceTextureFrameListener(jobject surfaceTexture);
 
     void GetGfxInfoData(nsACString& aRet);
-
+    nsresult GetProxyForURI(const nsACString & aSpec,
+                            const nsACString & aScheme,
+                            const nsACString & aHost,
+                            const int32_t      aPort,
+                            nsACString & aResult);
 protected:
     static AndroidBridge *sBridge;
     static StaticAutoPtr<nsTArray<nsCOMPtr<nsISmsRequest> > > sSmsRequests;
@@ -466,6 +470,7 @@ protected:
     jmethodID jShowSurface;
     jmethodID jHideSurface;
     jmethodID jDestroySurface;
+    jmethodID jGetProxyForURI;
 
     jmethodID jNumberOfMessages;
     jmethodID jSendMessage;

From 0b4904f43a4ad6d5f8f0c31ff6717395be06482b Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Tue, 13 Nov 2012 15:38:54 -0800
Subject: [PATCH 21/76] Bug 811461. Switch IMAGE_DECODE_LATENCY to
 microseconds. r=taras

Currently this is recording in ms when we expect all of the values to be <5ms
I believe this was just a typo.

--HG--
extra : rebase_source : ed71dc9bd7dc9ef0903e2e84152b44ba13d97adf
---
 image/src/RasterImage.cpp                    | 4 ++--
 toolkit/components/telemetry/Histograms.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 62cf16b4ae6a..6802cfcd8c64 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -3393,8 +3393,8 @@ RasterImage::DecodeWorker::Run()
     EnsurePendingInEventLoop();
   }
 
-  Telemetry::Accumulate(Telemetry::IMAGE_DECODE_LATENCY,
-                        uint32_t((TimeStamp::Now() - eventStart).ToMilliseconds()));
+  Telemetry::Accumulate(Telemetry::IMAGE_DECODE_LATENCY_US,
+                        uint32_t((TimeStamp::Now() - eventStart).ToMicroseconds()));
 
   return NS_OK;
 }
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 9a3a12df0d96..d7995be8d04f 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -457,7 +457,7 @@
     "kind": "boolean",
     "description": "Did the browser start after a successful shutdown"
   },
-  "IMAGE_DECODE_LATENCY": {
+  "IMAGE_DECODE_LATENCY_US": {
     "kind": "exponential",
     "low": 50,
     "high": "5000000",

From 2d7632c351144fbcae76bb08bf04603ee028e297 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Tue, 13 Nov 2012 15:39:04 -0800
Subject: [PATCH 22/76] Bug 811467. Increase image decode chunk size. r=joe

Telemetry shows us doing image decoding at around 10000 KB/s.  This means we
can do about 10240 bytes per ms. Since we have 5ms to do the decoding that
means we should be able to 51200 bytes in 5ms. I'd suggest we change to 16384
as that gives a healthy margin.

It turns out tenfourfox has also increased the size for performance reasons.

--HG--
extra : rebase_source : 9fce27dd9cb2e81c0da43c1ef63668affd9582cb
---
 modules/libpref/src/init/all.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 2532d9ab04be..5a14e6f884c2 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3614,7 +3614,7 @@ pref("image.mem.decodeondraw", true);
 pref("image.mem.min_discard_timeout_ms", 10000);
 
 // Chunk size for calls to the image decoders
-pref("image.mem.decode_bytes_at_a_time", 4096);
+pref("image.mem.decode_bytes_at_a_time", 16384);
 
 // The longest time we can spend in an iteration of an async decode
 pref("image.mem.max_ms_before_yield", 5);
@@ -3840,4 +3840,4 @@ pref("jsloader.reuseGlobal", false);
 pref("dom.browserElement.maxScreenshotDelayMS", 2000);
 
 // Whether we should show the placeholder when the element is focused but empty.
-pref("dom.placeholder.show_on_focus", true);
\ No newline at end of file
+pref("dom.placeholder.show_on_focus", true);

From c2ee41c57f06c90b38417879dc1f0e96799fec54 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 13 Nov 2012 16:37:51 -0700
Subject: [PATCH 23/76] Bug 752126 - Shorten remote (android) xpcshell command
 line with script; r=jmaher

--HG--
extra : rebase_source : 8d809c68a31dae6a11a72fe6584202b2f4e5d925
---
 testing/xpcshell/remotexpcshelltests.py | 31 +++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index fb1f02110353..040af5154248 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -7,6 +7,7 @@
 import re, sys, os
 import subprocess
 import runxpcshelltests as xpcshell
+import tempfile
 from automationutils import *
 from mozdevice import devicemanager, devicemanagerADB, devicemanagerSUT
 
@@ -109,8 +110,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
 
         self.pushLibs()
 
-        self.device.chmodDir(self.remoteBinDir)
-
     def pushLibs(self):
         if self.options.localAPK:
           localLib = os.path.join(self.options.objdir, "dist/fennec")
@@ -231,6 +230,28 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
     def setLD_LIBRARY_PATH(self, env):
         env["LD_LIBRARY_PATH"]=self.remoteBinDir
 
+    def pushWrapper(self):
+        # Rather than executing xpcshell directly, this wrapper script is
+        # used. By setting environment variables and the cwd in the script,
+        # the length of the per-test command line is shortened. This is
+        # often important when using ADB, as there is a limit to the length
+        # of the ADB command line.
+        localWrapper = tempfile.mktemp()
+        f = open(localWrapper, "w")
+        f.write("#!/system/bin/sh\n")
+        for envkey, envval in self.env.iteritems():
+            f.write("export %s=%s\n" % (envkey, envval))
+        f.write("cd $1\n")
+        f.write("echo xpcw: cd $1\n")
+        f.write("shift\n")
+        f.write("echo xpcw: xpcshell \"$@\"\n")
+        f.write("%s/xpcshell \"$@\"\n" % self.remoteBinDir)
+        f.close()
+        remoteWrapper = self.remoteJoin(self.remoteBinDir, "xpcw")
+        self.device.pushFile(localWrapper, remoteWrapper)
+        os.remove(localWrapper)
+        self.device.chmodDir(self.remoteBinDir)
+
     def buildEnvironment(self):
         self.env = {}
         self.setLD_LIBRARY_PATH(self.env)
@@ -240,12 +261,14 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.env["XPCSHELL_TEST_PROFILE_DIR"]=self.profileDir
         self.env["TMPDIR"]=self.remoteTmpDir
         self.env["HOME"]=self.profileDir
+        self.pushWrapper()
 
     def launchProcess(self, cmd, stdout, stderr, env, cwd):
-        cmd[0] = self.remoteJoin(self.remoteBinDir, "xpcshell")
+        cmd[0] = self.remoteJoin(self.remoteBinDir, "xpcw")
+        cmd.insert(1, self.remoteHere)
         outputFile = "xpcshelloutput"
         f = open(outputFile, "w+")
-        self.shellReturnCode = self.device.shell(cmd, f, cwd=self.remoteHere, env=env)
+        self.shellReturnCode = self.device.shell(cmd, f)
         f.close()
         # The device manager may have timed out waiting for xpcshell.
         # Guard against an accumulation of hung processes by killing

From de63c71f77919bf688516bee1df8e5d8a324f175 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 13 Nov 2012 16:37:53 -0700
Subject: [PATCH 24/76] Bug 808729 - Set _TESTING_MODULES_DIR for Android
 xpcshell tests; r=jmaher

--HG--
extra : rebase_source : 80896416e1262802421282573af6c2babc4cfcac
---
 config/makefiles/xpcshell.mk            |  2 ++
 js/src/config/makefiles/xpcshell.mk     |  2 ++
 testing/testsuite-targets.mk            |  2 ++
 testing/xpcshell/remotexpcshelltests.py | 31 ++++++++++++++-----------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/config/makefiles/xpcshell.mk b/config/makefiles/xpcshell.mk
index 3b04e6ef4d8c..7890f9305780 100644
--- a/config/makefiles/xpcshell.mk
+++ b/config/makefiles/xpcshell.mk
@@ -62,6 +62,7 @@ xpcshell-tests-remote:
 	  $(topsrcdir)/testing/xpcshell/remotexpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
+	  --testing-modules-dir=$(DEPTH)/_tests/modules \
 	  $(EXTRA_TEST_ARGS) \
 	  --dm_trans=$(DM_TRANS) \
 	  --deviceIP=${TEST_DEVICE} \
@@ -112,6 +113,7 @@ check-one-remote:
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
 	  --test-path=$(SOLO_FILE) \
+	  --testing-modules-dir=$(DEPTH)/_tests/modules \
 	  --profile-name=$(MOZ_APP_NAME) \
 	  --verbose \
 	  $(EXTRA_TEST_ARGS) \
diff --git a/js/src/config/makefiles/xpcshell.mk b/js/src/config/makefiles/xpcshell.mk
index 3b04e6ef4d8c..7890f9305780 100644
--- a/js/src/config/makefiles/xpcshell.mk
+++ b/js/src/config/makefiles/xpcshell.mk
@@ -62,6 +62,7 @@ xpcshell-tests-remote:
 	  $(topsrcdir)/testing/xpcshell/remotexpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
+	  --testing-modules-dir=$(DEPTH)/_tests/modules \
 	  $(EXTRA_TEST_ARGS) \
 	  --dm_trans=$(DM_TRANS) \
 	  --deviceIP=${TEST_DEVICE} \
@@ -112,6 +113,7 @@ check-one-remote:
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
 	  --test-path=$(SOLO_FILE) \
+	  --testing-modules-dir=$(DEPTH)/_tests/modules \
 	  --profile-name=$(MOZ_APP_NAME) \
 	  --verbose \
 	  $(EXTRA_TEST_ARGS) \
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 953f39b1019f..83a2e688756f 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -48,6 +48,7 @@ RUN_MOCHITEST_REMOTE = \
   $(PYTHON) _tests/testing/mochitest/runtestsremote.py --autorun --close-when-done \
     --console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
     --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
+    --testing-modules-dir=$(call core_abspath,_tests/modules) \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 RUN_MOCHITEST_ROBOTIUM = \
@@ -269,6 +270,7 @@ REMOTE_XPCSHELL = \
 	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
 	  --no-logfiles \
+	  --testing-modules-dir=$(call core_abspath,_tests/modules) \
 	  --dm_trans=$(DM_TRANS) \
 	  --deviceIP=${TEST_DEVICE} \
 	  --objdir=$(DEPTH) \
diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index 040af5154248..bd864b359707 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -30,11 +30,14 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.remoteTmpDir = self.remoteJoin(self.remoteTestRoot, "tmp")
         self.remoteScriptsDir = self.remoteTestRoot
         self.remoteComponentsDir = self.remoteJoin(self.remoteTestRoot, "c")
+        self.remoteModulesDir = self.remoteJoin(self.remoteTestRoot, "m")
         self.profileDir = self.remoteJoin(self.remoteTestRoot, "p")
         self.remoteDebugger = options.debugger
         self.remoteDebuggerArgs = options.debuggerArgs
+        self.testingModulesDir = options.testingModulesDir
         if options.setup:
           self.setupUtilities()
+          self.setupModules()
           self.setupTestDir()
         if options.localAPK:
           self.remoteAPK = self.remoteJoin(self.remoteBinDir, os.path.basename(options.localAPK))
@@ -138,6 +141,9 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
                 remoteFile = self.remoteJoin(self.remoteBinDir, file)
                 self.device.pushFile(os.path.join(root, file), remoteFile)
 
+    def setupModules(self):
+        if self.testingModulesDir:
+            self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
 
     def setupTestDir(self):
         xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
@@ -155,19 +161,19 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
           self.pathMapping.append(PathMapping(testdir, remoteScriptDir))
 
     def buildXpcsCmd(self, testdir):
-        self.xpcsCmd = [
-           self.remoteJoin(self.remoteBinDir, "xpcshell"),
-           '-r', self.remoteJoin(self.remoteComponentsDir, 'httpd.manifest')]
-        # If using an APK, --greomni must be specified before any -e arguments.
+        # change base class' paths to remote paths and use base class to build command
+        self.xpcshell = self.remoteJoin(self.remoteBinDir, "xpcw")
+        self.headJSPath = self.remoteJoin(self.remoteScriptsDir, 'head.js')
+        self.httpdJSPath = self.remoteJoin(self.remoteComponentsDir, 'httpd.js')
+        self.httpdManifest = self.remoteJoin(self.remoteComponentsDir, 'httpd.manifest')
+        self.testingModulesDir = self.remoteModulesDir
+        self.testharnessdir = self.remoteScriptsDir
+        xpcshell.XPCShellTests.buildXpcsCmd(self, testdir)
+        # remove "-g <dir> -a <dir>" and add "--greomni <apk>"
+        del(self.xpcsCmd[1:5])
         if self.options.localAPK:
-          self.xpcsCmd.extend(['--greomni', self.remoteAPK])
-        self.xpcsCmd.extend([
-           '-m',
-           '-n',
-           '-s',
-           '-e', 'const _HTTPD_JS_PATH = "%s";' % self.remoteJoin(self.remoteComponentsDir, 'httpd.js'),
-           '-e', 'const _HEAD_JS_PATH = "%s";' % self.remoteJoin(self.remoteScriptsDir, 'head.js'),
-           '-f', self.remoteScriptsDir+'/head.js'])
+          self.xpcsCmd.insert(3, '--greomni')
+          self.xpcsCmd.insert(4, self.remoteAPK)
 
         if self.remoteDebugger:
           # for example, "/data/local/gdbserver" "localhost:12345"
@@ -264,7 +270,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.pushWrapper()
 
     def launchProcess(self, cmd, stdout, stderr, env, cwd):
-        cmd[0] = self.remoteJoin(self.remoteBinDir, "xpcw")
         cmd.insert(1, self.remoteHere)
         outputFile = "xpcshelloutput"
         f = open(outputFile, "w+")

From 42ab34e9214a92e3e62b22f9219eda4ceeb9dba2 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 13 Nov 2012 16:37:56 -0700
Subject: [PATCH 25/76] Bug 808764 - Set XPCOM_DEBUG_BREAK and other env vars
 in Android xpcshell tests; r=jmaher

--HG--
extra : rebase_source : 548629ff005a6ee41e7c1d6e44f9eaab2d200a70
---
 testing/xpcshell/remotexpcshelltests.py | 11 +++--------
 testing/xpcshell/runxpcshelltests.py    | 13 +++++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index bd864b359707..adb620931982 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -224,14 +224,8 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.log.info("TEST-INFO | %s | environment: %s" % (name, self.env))
 
     def setupLeakLogging(self):
-        # Leak logging disabled on Android because it makes the command
-        # line too long: bug 752126
-
-        # filename = "leaks"
-        # leakLogFile = self.remoteJoin(self.profileDir, filename)
-        # self.env["XPCOM_MEM_LEAK_LOG"] = leakLogFile
-        leakLogFile = ""
-        return leakLogFile
+        self.env["XPCOM_MEM_LEAK_LOG"] = self.remoteJoin(self.profileDir, "leaks.log")
+        return self.env["XPCOM_MEM_LEAK_LOG"]
 
     def setLD_LIBRARY_PATH(self, env):
         env["LD_LIBRARY_PATH"]=self.remoteBinDir
@@ -260,6 +254,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
 
     def buildEnvironment(self):
         self.env = {}
+        self.buildCoreEnvironment()
         self.setLD_LIBRARY_PATH(self.env)
         self.env["MOZ_LINKER_CACHE"]=self.remoteBinDir
         if self.options.localAPK and self.appRoot:
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index 897cedcec5d3..d638f69c018b 100644
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -121,12 +121,10 @@ class XPCShellTests(object):
     if self.mozInfo is None:
       self.mozInfo = os.path.join(self.testharnessdir, "mozinfo.json")
 
-  def buildEnvironment(self):
+  def buildCoreEnvironment(self):
     """
-      Create and returns a dictionary of self.env to include all the appropriate env variables and values.
-      On a remote system, we overload this to set different values and are missing things like os.environ and PATH.
+      Add environment variables likely to be used across all platforms, including remote systems.
     """
-    self.env = dict(os.environ)
     # Make assertions fatal
     self.env["XPCOM_DEBUG_BREAK"] = "stack-and-abort"
     # Don't launch the crash reporter client
@@ -135,6 +133,13 @@ class XPCShellTests(object):
     # disabled by automation.py too
     self.env["NS_TRACE_MALLOC_DISABLE_STACKS"] = "1"
 
+  def buildEnvironment(self):
+    """
+      Create and returns a dictionary of self.env to include all the appropriate env variables and values.
+      On a remote system, we overload this to set different values and are missing things like os.environ and PATH.
+    """
+    self.env = dict(os.environ)
+    self.buildCoreEnvironment()
     if sys.platform == 'win32':
       self.env["PATH"] = self.env["PATH"] + ";" + self.xrePath
     elif sys.platform in ('os2emx', 'os2knix'):

From 416d875170c510a592927e4dc828c47f8b843df6 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <bdahl@mozilla.com>
Date: Fri, 31 Aug 2012 14:20:56 -0700
Subject: [PATCH 26/76] Bug 115199 - CSS2 @page rule rendering support. r=roc

---
 layout/generic/nsPageContentFrame.cpp      | 28 +++--------
 layout/generic/nsPageContentFrame.h        |  9 ----
 layout/generic/nsPageFrame.cpp             | 57 +++++++++++++++++-----
 layout/generic/nsSimplePageSequence.cpp    | 22 +--------
 layout/generic/nsSimplePageSequence.h      |  3 --
 layout/reftests/printing/115199-1-ref.html | 20 ++++++++
 layout/reftests/printing/115199-1.html     | 25 ++++++++++
 layout/reftests/printing/115199-2-ref.html | 18 +++++++
 layout/reftests/printing/115199-2a.html    | 24 +++++++++
 layout/reftests/printing/115199-2b.html    | 24 +++++++++
 layout/reftests/printing/reftest.list      |  3 ++
 11 files changed, 169 insertions(+), 64 deletions(-)
 create mode 100644 layout/reftests/printing/115199-1-ref.html
 create mode 100644 layout/reftests/printing/115199-1.html
 create mode 100644 layout/reftests/printing/115199-2-ref.html
 create mode 100644 layout/reftests/printing/115199-2a.html
 create mode 100644 layout/reftests/printing/115199-2b.html

diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index f2a6511b6509..ff55ae5d1785 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -24,19 +24,6 @@ NS_NewPageContentFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 
 NS_IMPL_FRAMEARENA_HELPERS(nsPageContentFrame)
 
-/* virtual */ nsSize
-nsPageContentFrame::ComputeSize(nsRenderingContext *aRenderingContext,
-                                nsSize aCBSize, nscoord aAvailableWidth,
-                                nsSize aMargin, nsSize aBorder, nsSize aPadding,
-                                uint32_t aFlags)
-{
-  NS_ASSERTION(mPD, "Pages are supposed to have page data");
-  nscoord height = (!mPD || mPD->mReflowSize.height == NS_UNCONSTRAINEDSIZE)
-                   ? NS_UNCONSTRAINEDSIZE
-                   : (mPD->mReflowSize.height - mPD->mReflowMargin.TopBottom());
-  return nsSize(aAvailableWidth, height);
-}
-
 NS_IMETHODIMP
 nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
                            nsHTMLReflowMetrics&     aDesiredSize,
@@ -57,18 +44,19 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
   // Set our size up front, since some parts of reflow depend on it
   // being already set.  Note that the computed height may be
   // unconstrained; that's ok.  Consumers should watch out for that.
-  SetSize(nsSize(aReflowState.availableWidth, aReflowState.availableHeight));
+  nsSize  maxSize(aReflowState.ComputedWidth(),
+                  aReflowState.ComputedHeight());
+  SetSize(maxSize);
  
   // A PageContentFrame must always have one child: the canvas frame.
   // Resize our frame allowing it only to be as big as we are
   // XXX Pay attention to the page's border and padding...
   if (mFrames.NotEmpty()) {
     nsIFrame* frame = mFrames.FirstChild();
-    nsSize  maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
     nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize);
-    kidReflowState.SetComputedHeight(aReflowState.availableHeight);
+    kidReflowState.SetComputedHeight(maxSize.height);
 
-    mPD->mPageContentSize  = aReflowState.availableWidth;
+    mPD->mPageContentSize = maxSize.width;
 
     // Reflow the page content area
     rv = ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, 0, 0, 0, aStatus);
@@ -112,9 +100,9 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
   NS_ASSERTION(NS_FRAME_IS_COMPLETE(fixedStatus), "fixed frames can be truncated, but not incomplete");
 
   // Return our desired size
-  aDesiredSize.width = aReflowState.availableWidth;
-  if (aReflowState.availableHeight != NS_UNCONSTRAINEDSIZE) {
-    aDesiredSize.height = aReflowState.availableHeight;
+  aDesiredSize.width = aReflowState.ComputedWidth();
+  if (aReflowState.ComputedHeight() != NS_UNCONSTRAINEDSIZE) {
+    aDesiredSize.height = aReflowState.ComputedHeight();
   }
 
   FinishAndStoreOverflow(&aDesiredSize);
diff --git a/layout/generic/nsPageContentFrame.h b/layout/generic/nsPageContentFrame.h
index 88834a9d25d2..462491fa8bd7 100644
--- a/layout/generic/nsPageContentFrame.h
+++ b/layout/generic/nsPageContentFrame.h
@@ -33,15 +33,6 @@ public:
 
   virtual void SetSharedPageData(nsSharedPageData* aPD) { mPD = aPD; }
 
-  /**
-   *  Computes page size based on shared page data; SetSharedPageData must be
-   *  given valid data first.
-   */
-  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
-                             nsSize aCBSize, nscoord aAvailableWidth,
-                             nsSize aMargin, nsSize aBorder, nsSize aPadding,
-                             uint32_t aFlags) MOZ_OVERRIDE;
-
   virtual bool HasTransformGetter() const MOZ_OVERRIDE { return true; }
 
   /**
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 8c1c6bc3a085..5a5ed5a28c96 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -72,10 +72,9 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*           aPresContext,
     if (mPD->mReflowSize.height == NS_UNCONSTRAINEDSIZE) {
       avHeight = NS_UNCONSTRAINEDSIZE;
     } else {
-      avHeight = mPD->mReflowSize.height - mPD->mReflowMargin.TopBottom();
+      avHeight = mPD->mReflowSize.height;
     }
-    nsSize  maxSize(mPD->mReflowSize.width - mPD->mReflowMargin.LeftRight(),
-                    avHeight);
+    nsSize  maxSize(mPD->mReflowSize.width, avHeight);
     float scale = aPresContext->GetPageScale();
     maxSize.width = NSToCoordCeil(maxSize.width / scale);
     if (maxSize.height != NS_UNCONSTRAINEDSIZE) {
@@ -97,9 +96,46 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*           aPresContext,
     kidReflowState.mFlags.mIsTopOfPage = true;
     kidReflowState.mFlags.mTableIsSplittable = true;
 
+    // Use the margins given in the @page rule.
+    // If a margin is 'auto', use the margin from the print settings for that side.
+    nsMargin pageContentMargin;
+    const nsStyleSides& marginStyle = kidReflowState.mStyleMargin->mMargin;
+    NS_FOR_CSS_SIDES(side) {
+      if (marginStyle.GetUnit(side) == eStyleUnit_Auto) {
+        pageContentMargin.Side(side) = mPD->mReflowMargin.Side(side);
+      } else {
+        pageContentMargin.Side(side) = kidReflowState.mComputedMargin.Side(side);
+      }
+    }
+
+
+    nscoord maxWidth = maxSize.width - pageContentMargin.LeftRight() / scale;
+    nscoord maxHeight;
+    if (maxSize.height == NS_UNCONSTRAINEDSIZE) {
+      maxHeight = NS_UNCONSTRAINEDSIZE;
+    } else {
+      maxHeight = maxSize.height - pageContentMargin.TopBottom() / scale;
+    }
+
+    // Check the width and height, if they're too small we reset the margins
+    // back to the default.
+    if (maxWidth < onePixelInTwips ||
+       (maxHeight != NS_UNCONSTRAINEDSIZE && maxHeight < onePixelInTwips)) {
+      NS_FOR_CSS_SIDES(side) {
+        pageContentMargin.Side(side) = mPD->mReflowMargin.Side(side);
+      }
+      maxWidth = maxSize.width - pageContentMargin.LeftRight() / scale;
+      if (maxHeight != NS_UNCONSTRAINEDSIZE) {
+        maxHeight = maxSize.height - pageContentMargin.TopBottom() / scale;
+      }
+    }
+
+    kidReflowState.SetComputedWidth(maxWidth);
+    kidReflowState.SetComputedHeight(maxHeight);
+
     // calc location of frame
-    nscoord xc = mPD->mReflowMargin.left + mPD->mExtraMargin.left;
-    nscoord yc = mPD->mReflowMargin.top + mPD->mExtraMargin.top;
+    nscoord xc = pageContentMargin.left;
+    nscoord yc = pageContentMargin.top;
 
     // Get the child's desired size
     ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, xc, yc, 0, aStatus);
@@ -220,7 +256,7 @@ nscoord nsPageFrame::GetXPosition(nsRenderingContext& aRenderingContext,
   nscoord x = aRect.x;
   switch (aJust) {
     case nsIPrintSettings::kJustLeft:
-      x += mPD->mExtraMargin.left + mPD->mEdgePaperMargin.left;
+      x += mPD->mEdgePaperMargin.left;
       break;
 
     case nsIPrintSettings::kJustCenter:
@@ -228,7 +264,7 @@ nscoord nsPageFrame::GetXPosition(nsRenderingContext& aRenderingContext,
       break;
 
     case nsIPrintSettings::kJustRight:
-      x += aRect.width - width - mPD->mExtraMargin.right - mPD->mEdgePaperMargin.right;
+      x += aRect.width - width - mPD->mEdgePaperMargin.right;
       break;
   } // switch
 
@@ -345,9 +381,9 @@ nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
     nscoord x = GetXPosition(aRenderingContext, aRect, aJust, str);
     nscoord y;
     if (aHeaderFooter == eHeader) {
-      y = aRect.y + mPD->mExtraMargin.top + mPD->mEdgePaperMargin.top;
+      y = aRect.y + mPD->mEdgePaperMargin.top;
     } else {
-      y = aRect.YMost() - aHeight - mPD->mExtraMargin.bottom - mPD->mEdgePaperMargin.bottom;
+      y = aRect.YMost() - aHeight - mPD->mEdgePaperMargin.bottom;
     }
 
     // set up new clip and draw the text
@@ -511,8 +547,7 @@ nsPageFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   nsRect clipRect(nsPoint(0, 0), child->GetSize());
   // Note: this computation matches how we compute maxSize.height
   // in nsPageFrame::Reflow
-  nscoord expectedPageContentHeight = 
-    NSToCoordCeil((GetSize().height - mPD->mReflowMargin.TopBottom()) / scale);
+  nscoord expectedPageContentHeight = NSToCoordCeil(GetSize().height / scale);
   if (clipRect.height > expectedPageContentHeight) {
     // We're doing print-selection, with one long page-content frame.
     // Clip to the appropriate page-content slice for the current page.
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index e5dd41d1c66b..09baa2437af6 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -65,7 +65,6 @@ nsSharedPageData::nsSharedPageData() :
   mDocURL(nullptr),
   mReflowSize(0,0),
   mReflowMargin(0,0,0,0),
-  mExtraMargin(0,0,0,0),
   mEdgePaperMargin(0,0,0,0),
   mPageContentXMost(0),
   mPageContentSize(0)
@@ -220,31 +219,12 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
   }
   mPageData->mReflowMargin = mMargin;
 
-  // Compute the size of each page and the x coordinate that each page will
-  // be placed at
-  nscoord extraThreshold = NS_MAX(pageSize.width, pageSize.height)/10;
-  int32_t gapInTwips = Preferences::GetInt("print.print_extra_margin");
-  gapInTwips = NS_MAX(0, gapInTwips);
-
-  nscoord extraGap = aPresContext->CSSTwipsToAppUnits(gapInTwips);
-  extraGap = NS_MIN(extraGap, extraThreshold); // clamp to 1/10 of the largest dim of the page
-
-  nsMargin extraMargin(0,0,0,0);
-  if (aPresContext->IsScreen()) {
-    extraMargin.SizeTo(extraGap, extraGap, extraGap, extraGap);
-  }
-
-  mPageData->mExtraMargin = extraMargin;
-
   // We use the CSS "margin" property on the -moz-page pseudoelement
   // to determine the space between each page in print preview.
   // Keep a running y-offset for each page.
   nscoord y = 0;
   nscoord maxXMost = 0;
 
-  nsSize availSize(pageSize.width + extraMargin.LeftRight(),
-                   pageSize.height + extraMargin.TopBottom());
-
   // Tile the pages vertically
   nsHTMLReflowMetrics kidSize;
   for (nsIFrame* kidFrame = mFrames.FirstChild(); nullptr != kidFrame; ) {
@@ -254,7 +234,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
 
     // Reflow the page
     nsHTMLReflowState kidReflowState(aPresContext, aReflowState, kidFrame,
-                                     availSize);
+                                     pageSize);
     nsReflowStatus  status;
 
     kidReflowState.SetComputedWidth(kidReflowState.availableWidth);
diff --git a/layout/generic/nsSimplePageSequence.h b/layout/generic/nsSimplePageSequence.h
index 4d2e1f8c7193..5955af075285 100644
--- a/layout/generic/nsSimplePageSequence.h
+++ b/layout/generic/nsSimplePageSequence.h
@@ -31,9 +31,6 @@ public:
 
   nsSize      mReflowSize;
   nsMargin    mReflowMargin;
-  // Extra Margin between the device area and the edge of the page;
-  // approximates unprintable area
-  nsMargin    mExtraMargin;
   // Margin for headers and footers; it defaults to 4/100 of an inch on UNIX 
   // and 0 elsewhere; I think it has to do with some inconsistency in page size
   // computations
diff --git a/layout/reftests/printing/115199-1-ref.html b/layout/reftests/printing/115199-1-ref.html
new file mode 100644
index 000000000000..7899e1c092fe
--- /dev/null
+++ b/layout/reftests/printing/115199-1-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+<head>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+    }
+    body {
+      margin: 0.1in 0.1in;
+    }
+    div {
+      border: 0.25in solid green;
+    }
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/printing/115199-1.html b/layout/reftests/printing/115199-1.html
new file mode 100644
index 000000000000..1aaef1e7b027
--- /dev/null
+++ b/layout/reftests/printing/115199-1.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+<head>
+  <style>
+    @page {
+      /*
+       * Default page margins are .5in and the reference file adds .1inch margin
+       * to the body hence we do .6in to match this.
+       */
+      margin: 0.6in;
+    }
+    * {
+      margin: 0;
+      padding: 0;
+    }
+    div {
+      width: 100%;
+      border: 0.25in solid green;
+    }
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/printing/115199-2-ref.html b/layout/reftests/printing/115199-2-ref.html
new file mode 100644
index 000000000000..b6c15e62d293
--- /dev/null
+++ b/layout/reftests/printing/115199-2-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+<head>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+    }
+    div {
+      width: 100%;
+      border: 0.25in solid green;
+    }
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/printing/115199-2a.html b/layout/reftests/printing/115199-2a.html
new file mode 100644
index 000000000000..1e70f47e3541
--- /dev/null
+++ b/layout/reftests/printing/115199-2a.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+<head>
+  <style>
+    @page {
+      /*
+       * Test a margin that causes the page to have zero width.
+       */
+      margin: 0 2.5in;
+    }
+    * {
+      margin: 0;
+      padding: 0;
+    }
+    div {
+      width: 100%;
+      border: 0.25in solid green;
+    }
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/printing/115199-2b.html b/layout/reftests/printing/115199-2b.html
new file mode 100644
index 000000000000..620542fe2c7d
--- /dev/null
+++ b/layout/reftests/printing/115199-2b.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+<head>
+  <style>
+    @page {
+      /*
+       * Test huge margins, they should be reset back the default margin size.
+       */
+      margin: 10in;
+    }
+    * {
+      margin: 0;
+      padding: 0;
+    }
+    div {
+      width: 100%;
+      border: 0.25in solid green;
+    }
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/printing/reftest.list b/layout/reftests/printing/reftest.list
index 55d6378d132e..13e9543c94d1 100644
--- a/layout/reftests/printing/reftest.list
+++ b/layout/reftests/printing/reftest.list
@@ -20,5 +20,8 @@
 == 626395-2c.html 626395-2-ref.html
 == 626395-2d.html 626395-2-ref.html
 == 652178-1.html 652178-1-ref.html
+== 115199-1.html 115199-1-ref.html
+== 115199-2a.html 115199-2-ref.html
+== 115199-2b.html 115199-2-ref.html
 == 652178-1.html 652178-1-ref2.html
 == 745025-1.html 745025-1-ref.html

From ec5ca0d27944909ef9937f36273e8a8d48c2dc4b Mon Sep 17 00:00:00 2001
From: Brendan Dahl <bdahl@mozilla.com>
Date: Fri, 31 Aug 2012 14:21:28 -0700
Subject: [PATCH 27/76] Bug 115199 - CSS2 @page rule style support. r=dbaron

---
 dom/base/nsDOMClassInfo.cpp              |   8 +
 dom/base/nsDOMClassInfoClasses.h         |   2 +
 dom/interfaces/css/nsIDOMCSSPageRule.idl |   4 +-
 layout/style/nsCSSParser.cpp             |  52 ++++--
 layout/style/nsCSSPropList.h             |  45 +++--
 layout/style/nsCSSProps.h                |   3 +
 layout/style/nsCSSRuleProcessor.cpp      |  32 +++-
 layout/style/nsCSSRuleProcessor.h        |   3 +
 layout/style/nsCSSRules.cpp              | 207 +++++++++++++++++++++++
 layout/style/nsCSSRules.h                |  81 ++++++++-
 layout/style/nsStyleSet.cpp              |  33 ++++
 layout/style/nsStyleSet.h                |   6 +
 layout/style/test/Makefile.in            |   1 +
 layout/style/test/test_page_parser.html  | 109 ++++++++++++
 layout/style/ua.css                      |   1 +
 15 files changed, 549 insertions(+), 38 deletions(-)
 create mode 100644 layout/style/test/test_page_parser.html

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 06ef343ec68c..19e9ed65709c 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -285,6 +285,7 @@
 #include "nsIDOMCSSSupportsRule.h"
 #include "nsIDOMMozCSSKeyframeRule.h"
 #include "nsIDOMMozCSSKeyframesRule.h"
+#include "nsIDOMCSSPageRule.h"
 #include "nsIDOMCSSPrimitiveValue.h"
 #include "nsIDOMCSSStyleRule.h"
 #include "nsIDOMCSSStyleSheet.h"
@@ -1616,6 +1617,9 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
+  NS_DEFINE_CLASSINFO_DATA(CSSPageRule, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
+
   NS_DEFINE_CLASSINFO_DATA(MediaQueryList, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(MutationObserver, nsDOMMutationObserverSH,
@@ -4325,6 +4329,10 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframesRule)
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(CSSPageRule, nsIDOMCSSPageRule)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSPageRule)
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(MediaQueryList, nsIDOMMediaQueryList)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaQueryList)
   DOM_CLASSINFO_MAP_END
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 992fb4d025a4..c778387607c2 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -478,6 +478,8 @@ DOMCI_CLASS(TouchEvent)
 DOMCI_CLASS(MozCSSKeyframeRule)
 DOMCI_CLASS(MozCSSKeyframesRule)
 
+DOMCI_CLASS(CSSPageRule)
+
 DOMCI_CLASS(MediaQueryList)
 
 DOMCI_CLASS(MutationObserver)
diff --git a/dom/interfaces/css/nsIDOMCSSPageRule.idl b/dom/interfaces/css/nsIDOMCSSPageRule.idl
index 7d010070ec38..f940415f3785 100644
--- a/dom/interfaces/css/nsIDOMCSSPageRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSPageRule.idl
@@ -5,10 +5,10 @@
 
 #include "nsIDOMCSSRule.idl"
 
-[scriptable, uuid(a6cf90bd-15b3-11d2-932e-00805f8add32)]
+[scriptable, uuid(6126024d-d716-4ad8-bc53-24dd6d5846b1)]
 interface nsIDOMCSSPageRule : nsIDOMCSSRule
 {
-           attribute DOMString        selectorText;
+           //attribute DOMString        selectorText;
                                         // raises(DOMException) on setting
 
   readonly attribute nsIDOMCSSStyleDeclaration  style;
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 06aab520ba16..bf0d61b5ea1b 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -400,12 +400,18 @@ protected:
     eParseDeclaration_InBraces       = 1 << 0,
     eParseDeclaration_AllowImportant = 1 << 1
   };
+  enum nsCSSContextType {
+    eCSSContext_General,
+    eCSSContext_Page
+  };
 
-  css::Declaration* ParseDeclarationBlock(uint32_t aFlags);
+  css::Declaration* ParseDeclarationBlock(uint32_t aFlags,
+                                          nsCSSContextType aContext = eCSSContext_General);
   bool ParseDeclaration(css::Declaration* aDeclaration,
                         uint32_t aFlags,
                         bool aMustCallValueAppended,
-                        bool* aChanged);
+                        bool* aChanged,
+                        nsCSSContextType aContext = eCSSContext_General);
 
   bool ParseProperty(nsCSSProperty aPropID);
   bool ParsePropertyByFunction(nsCSSProperty aPropID);
@@ -2260,13 +2266,6 @@ CSSParserImpl::ParseFontDescriptor(nsCSSFontFaceRule* aRule)
 }
 
 
-bool
-CSSParserImpl::ParsePageRule(RuleAppendFunc aAppendFunc, void* aData)
-{
-  // XXX not yet implemented
-  return false;
-}
-
 bool
 CSSParserImpl::ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aData)
 {
@@ -2303,6 +2302,26 @@ CSSParserImpl::ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aData)
   return true;
 }
 
+bool
+CSSParserImpl::ParsePageRule(RuleAppendFunc aAppendFunc, void* aData)
+{
+  // TODO: There can be page selectors after @page such as ":first", ":left".
+  uint32_t parseFlags = eParseDeclaration_InBraces |
+                        eParseDeclaration_AllowImportant;
+  nsAutoPtr<css::Declaration> declaration(
+                                ParseDeclarationBlock(parseFlags,
+                                                      eCSSContext_Page));
+  if (!declaration) {
+    return false;
+  }
+
+  // Takes ownership of declaration.
+  nsRefPtr<nsCSSPageRule> rule = new nsCSSPageRule(declaration);
+
+  (*aAppendFunc)(rule, aData);
+  return true;
+}
+
 already_AddRefed<nsCSSKeyframeRule>
 CSSParserImpl::ParseKeyframeRule()
 {
@@ -2316,7 +2335,6 @@ CSSParserImpl::ParseKeyframeRule()
   uint32_t parseFlags = eParseDeclaration_InBraces;
   nsAutoPtr<css::Declaration> declaration(ParseDeclarationBlock(parseFlags));
   if (!declaration) {
-    REPORT_UNEXPECTED(PEBadSelectorKeyframeRuleIgnored);
     return nullptr;
   }
 
@@ -3892,7 +3910,7 @@ CSSParserImpl::ParseSelector(nsCSSSelectorList* aList,
 }
 
 css::Declaration*
-CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags)
+CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags, nsCSSContextType aContext)
 {
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
@@ -3908,7 +3926,7 @@ CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags)
   if (declaration) {
     for (;;) {
       bool changed;
-      if (!ParseDeclaration(declaration, aFlags, true, &changed)) {
+      if (!ParseDeclaration(declaration, aFlags, true, &changed, aContext)) {
         if (!SkipDeclaration(checkForBraces)) {
           break;
         }
@@ -4299,8 +4317,12 @@ bool
 CSSParserImpl::ParseDeclaration(css::Declaration* aDeclaration,
                                 uint32_t aFlags,
                                 bool aMustCallValueAppended,
-                                bool* aChanged)
+                                bool* aChanged,
+                                nsCSSContextType aContext)
 {
+  NS_PRECONDITION(aContext == eCSSContext_General ||
+                  aContext == eCSSContext_Page,
+                  "Must be page or general context");
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
   mTempData.AssertInitialState();
@@ -4344,7 +4366,9 @@ CSSParserImpl::ParseDeclaration(css::Declaration* aDeclaration,
   // Map property name to its ID and then parse the property
   nsCSSProperty propID = nsCSSProps::LookupProperty(propertyName,
                                                     nsCSSProps::eEnabled);
-  if (eCSSProperty_UNKNOWN == propID) { // unknown property
+  if (eCSSProperty_UNKNOWN == propID ||
+     (aContext == nsCSSContextType::eCSSContext_Page &&
+      !nsCSSProps::PropHasFlags(propID, CSS_PROPERTY_APPLIES_TO_PAGE_RULE))) { // unknown property
     if (!NonMozillaVendorIdentifier(propertyName)) {
       const PRUnichar *params[] = {
         propertyName.get()
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index 0a711120787a..631f52f94824 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -1919,7 +1919,8 @@ CSS_PROP_SHORTHAND(
     margin,
     Margin,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "")
 CSS_PROP_MARGIN(
     margin-bottom,
@@ -1928,7 +1929,8 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC,
     nullptr,
@@ -1938,7 +1940,8 @@ CSS_PROP_SHORTHAND(
     -moz-margin-end,
     margin_end,
     CSS_PROP_DOMPROP_PREFIXED(MarginEnd),
-    CSS_PROPERTY_PARSE_FUNCTION,
+    CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -1947,7 +1950,8 @@ CSS_PROP_MARGIN(
     MarginEndValue,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_STORES_CALC,
+        CSS_PROPERTY_STORES_CALC |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -1959,7 +1963,8 @@ CSS_PROP_SHORTHAND(
     margin_left,
     MarginLeft,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -1969,7 +1974,8 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_REPORT_OTHER_NAME |
-        CSS_PROPERTY_STORES_CALC,
+        CSS_PROPERTY_STORES_CALC |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -1981,7 +1987,8 @@ CSS_PROP_MARGIN(
     MarginLeftLTRSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -1993,7 +2000,8 @@ CSS_PROP_MARGIN(
     MarginLeftRTLSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2005,7 +2013,8 @@ CSS_PROP_SHORTHAND(
     margin_right,
     MarginRight,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -2015,7 +2024,8 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_REPORT_OTHER_NAME |
-        CSS_PROPERTY_STORES_CALC,
+        CSS_PROPERTY_STORES_CALC |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -2027,7 +2037,8 @@ CSS_PROP_MARGIN(
     MarginRightLTRSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2039,7 +2050,8 @@ CSS_PROP_MARGIN(
     MarginRightRTLSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2050,7 +2062,8 @@ CSS_PROP_SHORTHAND(
     -moz-margin-start,
     margin_start,
     CSS_PROP_DOMPROP_PREFIXED(MarginStart),
-    CSS_PROPERTY_PARSE_FUNCTION,
+    CSS_PROPERTY_PARSE_FUNCTION |
+    CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -2059,7 +2072,8 @@ CSS_PROP_MARGIN(
     MarginStartValue,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_STORES_CALC,
+        CSS_PROPERTY_STORES_CALC |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -2073,7 +2087,8 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
+        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
     "",
     VARIANT_AHLP | VARIANT_CALC,
     nullptr,
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index c1c53ace0306..13550a24e6d9 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -104,6 +104,9 @@ MOZ_STATIC_ASSERT((CSS_PROPERTY_PARSE_PROPERTY_MASK &
 // Does the property apply to ::-moz-placeholder?
 #define CSS_PROPERTY_APPLIES_TO_PLACEHOLDER       (1<<18)
 
+// This property is allowed in an @page rule.
+#define CSS_PROPERTY_APPLIES_TO_PAGE_RULE         (1<<19)
+
 /**
  * Types of animatable values.
  */
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index d04ff3b7eeb6..264b59858394 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -979,6 +979,7 @@ struct RuleCascadeData {
 
   nsTArray<nsFontFaceRuleContainer> mFontFaceRules;
   nsTArray<nsCSSKeyframesRule*> mKeyframesRules;
+  nsTArray<nsCSSPageRule*> mPageRules;
 
   // Looks up or creates the appropriate list in |mAttributeSelectors|.
   // Returns null only on allocation failure.
@@ -1029,6 +1030,7 @@ RuleCascadeData::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
 
   n += mFontFaceRules.SizeOfExcludingThis(aMallocSizeOf);
   n += mKeyframesRules.SizeOfExcludingThis(aMallocSizeOf);
+  n += mPageRules.SizeOfExcludingThis(aMallocSizeOf);
 
   return n;
 }
@@ -2681,6 +2683,24 @@ nsCSSRuleProcessor::AppendKeyframesRules(
   return true;
 }
 
+// Append all the currently-active page rules to aArray.  Return
+// true for success and false for failure.
+bool
+nsCSSRuleProcessor::AppendPageRules(
+                              nsPresContext* aPresContext,
+                              nsTArray<nsCSSPageRule*>& aArray)
+{
+  RuleCascadeData* cascade = GetRuleCascade(aPresContext);
+
+  if (cascade) {
+    if (!aArray.AppendElements(cascade->mPageRules)) {
+      return false;
+    }
+  }
+  
+  return true;
+}
+
 nsresult
 nsCSSRuleProcessor::ClearRuleCascades()
 {
@@ -2979,11 +2999,13 @@ struct CascadeEnumData {
   CascadeEnumData(nsPresContext* aPresContext,
                   nsTArray<nsFontFaceRuleContainer>& aFontFaceRules,
                   nsTArray<nsCSSKeyframesRule*>& aKeyframesRules,
+                  nsTArray<nsCSSPageRule*>& aPageRules,
                   nsMediaQueryResultCacheKey& aKey,
                   uint8_t aSheetType)
     : mPresContext(aPresContext),
       mFontFaceRules(aFontFaceRules),
       mKeyframesRules(aKeyframesRules),
+      mPageRules(aPageRules),
       mCacheKey(aKey),
       mSheetType(aSheetType)
   {
@@ -3006,6 +3028,7 @@ struct CascadeEnumData {
   nsPresContext* mPresContext;
   nsTArray<nsFontFaceRuleContainer>& mFontFaceRules;
   nsTArray<nsCSSKeyframesRule*>& mKeyframesRules;
+  nsTArray<nsCSSPageRule*>& mPageRules;
   nsMediaQueryResultCacheKey& mCacheKey;
   PLArenaPool mArena;
   // Hooray, a manual PLDHashTable since nsClassHashtable doesn't
@@ -3022,6 +3045,7 @@ struct CascadeEnumData {
  *      but kept in order per-weight, and
  *  (2) add any @font-face rules, in order, into data->mFontFaceRules.
  *  (3) add any @keyframes rules, in order, into data->mKeyframesRules.
+ *  (4) add any @page rules, in order, into data->mPageRules.
  */
 static bool
 CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
@@ -3074,7 +3098,12 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
       return false;
     }
   }
-
+  else if (css::Rule::PAGE_RULE == type) {
+    nsCSSPageRule* pageRule = static_cast<nsCSSPageRule*>(aRule);
+    if (!data->mPageRules.AppendElement(pageRule)) {
+      return false;
+    }
+  }
   return true;
 }
 
@@ -3175,6 +3204,7 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
     if (newCascade) {
       CascadeEnumData data(aPresContext, newCascade->mFontFaceRules,
                            newCascade->mKeyframesRules,
+                           newCascade->mPageRules,
                            newCascade->mCacheKey,
                            mSheetType);
       if (!data.mRulesByWeight.ops)
diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h
index 07bf5f2b8c34..905eb47deefb 100644
--- a/layout/style/nsCSSRuleProcessor.h
+++ b/layout/style/nsCSSRuleProcessor.h
@@ -121,6 +121,9 @@ public:
   bool AppendKeyframesRules(nsPresContext* aPresContext,
                             nsTArray<nsCSSKeyframesRule*>& aArray);
 
+  bool AppendPageRules(nsPresContext* aPresContext,
+                       nsTArray<nsCSSPageRule*>& aArray);
+
 #ifdef DEBUG
   void AssertQuirksChangeOK() {
     NS_ASSERTION(!mRuleCascades, "can't toggle quirks style sheet without "
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 26cf81b4ca8c..3335c16563fb 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -36,6 +36,7 @@
 #include "nsPrintfCString.h"
 #include "nsDOMClassInfoID.h"
 #include "mozilla/dom/CSSStyleDeclarationBinding.h"
+#include "StyleRule.h"
 
 namespace css = mozilla::css;
 
@@ -2326,6 +2327,212 @@ nsCSSKeyframesRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
   return n;
 }
 
+// -------------------------------------------
+// nsCSSPageStyleDeclaration
+//
+
+nsCSSPageStyleDeclaration::nsCSSPageStyleDeclaration(nsCSSPageRule* aRule)
+  : mRule(aRule)
+{
+}
+
+nsCSSPageStyleDeclaration::~nsCSSPageStyleDeclaration()
+{
+  NS_ASSERTION(!mRule, "DropReference not called.");
+}
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCSSPageStyleDeclaration)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCSSPageStyleDeclaration)
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(nsCSSPageStyleDeclaration)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSPageStyleDeclaration)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
+
+css::Declaration*
+nsCSSPageStyleDeclaration::GetCSSDeclaration(bool aAllocate)
+{
+  if (mRule) {
+    return mRule->Declaration();
+  } else {
+    return nullptr;
+  }
+}
+
+void
+nsCSSPageStyleDeclaration::GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv)
+{
+  GetCSSParsingEnvironmentForRule(mRule, aCSSParseEnv);
+}
+
+NS_IMETHODIMP
+nsCSSPageStyleDeclaration::GetParentRule(nsIDOMCSSRule** aParent)
+{
+  NS_ENSURE_ARG_POINTER(aParent);
+
+  NS_IF_ADDREF(*aParent = mRule);
+  return NS_OK;
+}
+
+nsresult
+nsCSSPageStyleDeclaration::SetCSSDeclaration(css::Declaration* aDecl)
+{
+  NS_ABORT_IF_FALSE(aDecl, "must be non-null");
+  mRule->ChangeDeclaration(aDecl);
+  return NS_OK;
+}
+
+nsIDocument*
+nsCSSPageStyleDeclaration::DocToUpdate()
+{
+  return nullptr;
+}
+
+nsINode*
+nsCSSPageStyleDeclaration::GetParentObject()
+{
+  return mRule ? mRule->GetDocument() : nullptr;
+}
+
+// -------------------------------------------
+// nsCSSPageRule
+//
+
+nsCSSPageRule::nsCSSPageRule(const nsCSSPageRule& aCopy)
+  // copy everything except our reference count and mDOMDeclaration
+  : Rule(aCopy)
+  , mDeclaration(new css::Declaration(*aCopy.mDeclaration))
+{
+}
+
+nsCSSPageRule::~nsCSSPageRule()
+{
+  if (mDOMDeclaration) {
+    mDOMDeclaration->DropReference();
+  }
+}
+
+/* virtual */ already_AddRefed<css::Rule>
+nsCSSPageRule::Clone() const
+{
+  nsRefPtr<css::Rule> clone = new nsCSSPageRule(*this);
+  return clone.forget();
+}
+
+NS_IMPL_ADDREF(nsCSSPageRule)
+NS_IMPL_RELEASE(nsCSSPageRule)
+
+DOMCI_DATA(CSSPageRule, nsCSSPageRule)
+
+// QueryInterface implementation for nsCSSPageRule
+NS_INTERFACE_MAP_BEGIN(nsCSSPageRule)
+  NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSPageRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSPageRule)
+NS_INTERFACE_MAP_END
+
+IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(nsCSSPageRule, Rule)
+
+#ifdef DEBUG
+void
+nsCSSPageRule::List(FILE* out, int32_t aIndent) const
+{
+  // FIXME: WRITE ME
+}
+#endif
+
+/* virtual */ int32_t
+nsCSSPageRule::GetType() const
+{
+  return Rule::PAGE_RULE;
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::GetType(uint16_t* aType)
+{
+  *aType = nsIDOMCSSRule::PAGE_RULE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::GetCssText(nsAString& aCssText)
+{
+  aCssText.AppendLiteral("@page { ");
+  nsAutoString tmp;
+  mDeclaration->ToString(tmp);
+  aCssText.Append(tmp);
+  aCssText.AppendLiteral(" }");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::SetCssText(const nsAString& aCssText)
+{
+  // FIXME: implement???
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
+{
+  return Rule::GetParentStyleSheet(aSheet);
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::GetParentRule(nsIDOMCSSRule** aParentRule)
+{
+  return Rule::GetParentRule(aParentRule);
+}
+
+css::ImportantRule*
+nsCSSPageRule::GetImportantRule()
+{
+  if (!mDeclaration->HasImportantData()) {
+    return nullptr;
+  }
+  if (!mImportantRule) {
+    mImportantRule = new css::ImportantRule(mDeclaration);
+  }
+  return mImportantRule;
+}
+
+/* virtual */ void
+nsCSSPageRule::MapRuleInfoInto(nsRuleData* aRuleData)
+{
+  mDeclaration->MapNormalRuleInfoInto(aRuleData);
+}
+
+NS_IMETHODIMP
+nsCSSPageRule::GetStyle(nsIDOMCSSStyleDeclaration** aStyle)
+{
+  if (!mDOMDeclaration) {
+    mDOMDeclaration = new nsCSSPageStyleDeclaration(this);
+  }
+  NS_ADDREF(*aStyle = mDOMDeclaration);
+  return NS_OK;
+}
+
+void
+nsCSSPageRule::ChangeDeclaration(css::Declaration* aDeclaration)
+{
+  mImportantRule = nullptr;
+  mDeclaration = aDeclaration;
+
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  if (sheet) {
+    sheet->SetModifiedByChildRule();
+  }
+}
+
+/* virtual */ size_t
+nsCSSPageRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
+{
+  return aMallocSizeOf(this);
+}
+
 namespace mozilla {
 
 CSSSupportsRule::CSSSupportsRule(bool aConditionMet,
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 0a4e7b22448a..eb79435e276c 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -28,12 +28,8 @@
 #include "nsTArray.h"
 #include "nsDOMCSSDeclaration.h"
 #include "Declaration.h"
-
-namespace mozilla {
-namespace css {
-class StyleRule;
-}
-}
+#include "nsIDOMCSSPageRule.h"
+#include "StyleRule.h"
 
 class nsMediaList;
 
@@ -433,6 +429,79 @@ private:
   nsString                                   mName;
 };
 
+class nsCSSPageRule;
+
+class nsCSSPageStyleDeclaration MOZ_FINAL : public nsDOMCSSDeclaration
+{
+public:
+  nsCSSPageStyleDeclaration(nsCSSPageRule *aRule);
+  virtual ~nsCSSPageStyleDeclaration();
+
+  NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;
+  void DropReference() { mRule = nullptr; }
+  virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate) MOZ_OVERRIDE;
+  virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl) MOZ_OVERRIDE;
+  virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
+  virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSPageStyleDeclaration,
+                                                         nsICSSDeclaration)
+
+  virtual nsINode *GetParentObject();
+
+protected:
+  // This reference is not reference-counted. The rule object tells us
+  // when it's about to go away.
+  nsCSSPageRule *mRule;
+};
+
+class nsCSSPageRule MOZ_FINAL : public mozilla::css::Rule,
+                                public nsIDOMCSSPageRule
+{
+public:
+  // WARNING: Steals the contents of aDeclaration
+  nsCSSPageRule(nsAutoPtr<mozilla::css::Declaration> aDeclaration)
+    : mDeclaration(aDeclaration),
+      mImportantRule(nullptr)
+  {
+  }
+private:
+  nsCSSPageRule(const nsCSSPageRule& aCopy);
+  ~nsCSSPageRule();
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIStyleRule methods
+#ifdef DEBUG
+  virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
+#endif
+
+  // Rule methods
+  DECL_STYLE_RULE_INHERIT
+  virtual int32_t GetType() const;
+  virtual already_AddRefed<mozilla::css::Rule> Clone() const;
+
+  // nsIDOMCSSRule interface
+  NS_DECL_NSIDOMCSSRULE
+
+  // nsIDOMCSSPageRule interface
+  NS_DECL_NSIDOMCSSPAGERULE
+
+  mozilla::css::Declaration* Declaration()   { return mDeclaration; }
+
+  void ChangeDeclaration(mozilla::css::Declaration* aDeclaration);
+
+  mozilla::css::ImportantRule* GetImportantRule();
+
+  virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
+private:
+  nsAutoPtr<mozilla::css::Declaration>    mDeclaration;
+  // lazily created when needed:
+  nsRefPtr<nsCSSPageStyleDeclaration>     mDOMDeclaration;
+  nsRefPtr<mozilla::css::ImportantRule>   mImportantRule;
+};
+
 namespace mozilla {
 
 class CSSSupportsRule : public css::GroupRule,
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index e6decbc4c075..2334b95554ec 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -1165,6 +1165,24 @@ nsStyleSet::ResolveAnonymousBoxStyle(nsIAtom* aPseudoTag,
   FileRules(EnumRulesMatching<AnonBoxRuleProcessorData>, &data, nullptr,
             &ruleWalker);
 
+  if (aPseudoTag == nsCSSAnonBoxes::pageContent) {
+    // Add any @page rules that are specified.
+    nsTArray<nsCSSPageRule*> rules;
+    nsTArray<css::ImportantRule*> importantRules;
+    nsPresContext* presContext = PresContext();
+    presContext->StyleSet()->AppendPageRules(presContext, rules);
+    for (uint32_t i = 0, i_end = rules.Length(); i != i_end; ++i) {
+      ruleWalker.Forward(rules[i]);
+      css::ImportantRule* importantRule = rules[i]->GetImportantRule();
+      if (importantRule) {
+        importantRules.AppendElement(importantRule);
+      }
+    }
+    for (uint32_t i = 0, i_end = importantRules.Length(); i != i_end; ++i) {
+      ruleWalker.Forward(importantRules[i]);
+    }
+  }
+
   return GetContext(aParentContext, ruleWalker.CurrentNode(), nullptr,
                     false, false,
                     aPseudoTag, nsCSSPseudoElements::ePseudo_AnonBox,
@@ -1242,6 +1260,21 @@ nsStyleSet::AppendKeyframesRules(nsPresContext* aPresContext,
   return true;
 }
 
+bool
+nsStyleSet::AppendPageRules(nsPresContext* aPresContext,
+                            nsTArray<nsCSSPageRule*>& aArray)
+{
+  NS_ENSURE_FALSE(mInShutdown, false);
+
+  for (uint32_t i = 0; i < NS_ARRAY_LENGTH(gCSSSheetTypes); ++i) {
+    nsCSSRuleProcessor* ruleProc = static_cast<nsCSSRuleProcessor*>
+                                    (mRuleProcessors[gCSSSheetTypes[i]].get());
+    if (ruleProc && !ruleProc->AppendPageRules(aPresContext, aArray))
+      return false;
+  }
+  return true;
+}
+
 void
 nsStyleSet::BeginShutdown(nsPresContext* aPresContext)
 {
diff --git a/layout/style/nsStyleSet.h b/layout/style/nsStyleSet.h
index fec5cf70654f..ddf70da2b619 100644
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@@ -29,6 +29,7 @@
 class nsIURI;
 class nsCSSFontFaceRule;
 class nsCSSKeyframesRule;
+class nsCSSPageRule;
 class nsRuleWalker;
 struct RuleProcessorData;
 struct TreeMatchContext;
@@ -152,6 +153,11 @@ class nsStyleSet
   bool AppendKeyframesRules(nsPresContext* aPresContext,
                               nsTArray<nsCSSKeyframesRule*>& aArray);
 
+  // Append all the currently-active page rules to aArray.  Return
+  // true for success and false for failure.
+  bool AppendPageRules(nsPresContext* aPresContext,
+                       nsTArray<nsCSSPageRule*>& aArray);
+
   // Begin ignoring style context destruction, to avoid lots of unnecessary
   // work on document teardown.
   void BeginShutdown(nsPresContext* aPresContext);
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index aff0d6725dc4..74a6b3b06e12 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -187,6 +187,7 @@ MOCHITEST_FILES =	test_acid3_test46.html \
 		visited_image_loading_frame_empty.html \
 		test_load_events_on_stylesheets.html \
 		test_bug721136.html \
+		test_page_parser.html \
 		test_bug732153.html \
 		test_bug732209.html \
 		bug732209-css.sjs \
diff --git a/layout/style/test/test_page_parser.html b/layout/style/test/test_page_parser.html
new file mode 100644
index 000000000000..e8e0dc85f7cd
--- /dev/null
+++ b/layout/style/test/test_page_parser.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML>
+<html>
+<!-- https://bugzilla.mozilla.org/show_bug.cgi?id=115199 -->
+<head>
+  <meta charset="UTF-8">
+  <title>Test of @page parser</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+</head>
+<body>
+<p>@page parsing (<a
+  target="_blank"
+  href="https://bugzilla.mozilla.org/show_bug.cgi?id=115199"
+>bug 115199</a>)</p>
+<pre id="display"></pre>
+<style type="text/css" id="testbox"></style>
+<script class="testbody" type="text/javascript">
+  function _(b) { return "@page { " + b + " }"; };
+
+  var testset = [
+    // CSS 2.1 only allows margin properties in the page rule.
+
+    // Check a bad property.
+    { rule: "position: absolute;" },
+
+    // Check good properties.
+    // NOTE: The margin-*-value and margin-*-source properties are not really
+    // expected and will need to be removed once bug 241234 is addressed.
+    { rule: _("margin: 2in;"), expected: {
+      "margin-top": "2in",
+      "margin-right-value": "2in",
+      "margin-bottom": "2in",
+      "margin-left-value": "2in",
+      "margin-left-ltr-source": "physical",
+      "margin-left-rtl-source": "physical",
+      "margin-right-ltr-source": "physical",
+      "margin-right-rtl-source": "physical"
+    }},
+    { rule: _("margin-top: 2in;"), expected: {"margin-top": "2in"}},
+    { rule: _("margin-left: 2in;"), expected: {
+      "margin-left-value": "2in",
+      "margin-left-ltr-source": "physical",
+      "margin-left-rtl-source": "physical",
+    }},
+    { rule: _("margin-bottom: 2in;"), expected: {"margin-bottom": "2in"}},
+    { rule: _("margin-right: 2in;"), expected: {
+      "margin-right-value": "2in",
+      "margin-right-ltr-source": "physical",
+      "margin-right-rtl-source": "physical",
+    }}
+  ];
+
+  var display = document.getElementById("display");
+  var sheet = document.styleSheets[1];
+
+  for (var curTest = 0; curTest < testset.length; curTest++) {
+    try {
+      while(sheet.cssRules.length > 0)
+        sheet.deleteRule(0);
+      sheet.insertRule(testset[curTest].rule, 0);
+    } catch (e) {
+      ok(e.name == "SyntaxError"
+         && e instanceof DOMException
+         && e.code == DOMException.SYNTAX_ERR
+         && !('expected' in testset[curTest]),
+         testset[curTest].rule + " syntax error thrown", e);
+    }
+
+    try {
+      if (testset[curTest].expected) {
+        is(sheet.cssRules.length, 1,
+           testset[curTest].rule + " rule count");
+           is(sheet.cssRules[0].type, CSSRule.PAGE_RULE,
+           testset[curTest].rule + " rule type");
+
+        var expected = testset[curTest].expected;
+        var s = sheet.cssRules[0].style;
+        var n = 0;
+
+        // everything is set that should be
+        for (var name in expected) {
+          is(s.getPropertyValue(name), expected[name],
+             testset[curTest].rule + " (prop " + name + ")");
+          n++;
+        }
+        // nothing else is set
+        is(s.length, n, testset[curTest].rule + "prop count");
+        for (var i = 0; i < s.length; i++) {
+          ok(s[i] in expected, testset[curTest].rule,
+             "Unexpected item #" + i + ": " + s[i]);
+        }
+      } else {
+        if (sheet.cssRules.length == 0) {
+          is(sheet.cssRules.length, 0,
+             testset[curTest].rule + " rule count (0)");
+        } else {
+          is(sheet.cssRules.length, 1,
+             testset[curTest].rule + " rule count (1 non-page)");
+          isnot(sheet.cssRules[0].type, CSSRule.PAGE_RULE,
+                testset[curTest].rule + " rule type (1 non-page)");
+        }
+      }
+    } catch (e) {
+      ok(false, testset[curTest].rule, "During test: " + e);
+    }
+  }
+</script>
+</body>
+</html>
diff --git a/layout/style/ua.css b/layout/style/ua.css
index a10b8cc836c4..a97bc3f18987 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -193,6 +193,7 @@
 
 *|*::-moz-pagecontent {
   display: block !important;
+  margin: auto;
 }
 
 *|*::-moz-pagebreak {

From a87ade4d88fe3af8a6f3a162e86331a390819cad Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 13 Nov 2012 18:58:48 -0500
Subject: [PATCH 28/76] Bug 562091 - Remove the EUC-KR conveter and rename
 x-windows-949 to EUC-KR. r=smontagu

---
 .../migration/src/SafariProfileMigrator.js    |  4 +-
 dom/encoding/TextDecoder.cpp                  |  7 ----
 dom/encoding/labelsencodings.properties       | 20 +++++-----
 .../en-US/chrome/charsetTitles.properties     |  1 -
 dom/plugins/base/nsPluginInstanceOwner.cpp    |  3 +-
 intl/locale/src/charsetalias.properties       | 10 +----
 intl/locale/src/windows/wincharset.properties |  2 +-
 intl/uconv/directory.txt                      |  2 +-
 intl/uconv/src/charsetData.properties         |  3 --
 intl/uconv/src/nsUConvModule.cpp              | 13 +------
 intl/uconv/tests/unit/test_bug718500.js       |  2 -
 .../tests/unit/test_decode_EUCKR_Hangul.js    |  2 +-
 intl/uconv/ucvko/Makefile.in                  |  2 -
 intl/uconv/ucvko/nsEUCKRToUnicode.cpp         | 15 --------
 intl/uconv/ucvko/nsEUCKRToUnicode.h           | 22 -----------
 intl/uconv/ucvko/nsUCvKOCID.h                 |  8 ----
 intl/uconv/ucvko/nsUnicodeToEUCKR.cpp         | 37 -------------------
 intl/uconv/ucvko/nsUnicodeToEUCKR.h           | 21 -----------
 modules/libpref/src/init/all.js               |  2 +-
 widget/os2/nsOS2Uni.cpp                       |  2 +-
 20 files changed, 22 insertions(+), 156 deletions(-)
 delete mode 100644 intl/uconv/ucvko/nsEUCKRToUnicode.cpp
 delete mode 100644 intl/uconv/ucvko/nsEUCKRToUnicode.h
 delete mode 100644 intl/uconv/ucvko/nsUnicodeToEUCKR.cpp
 delete mode 100644 intl/uconv/ucvko/nsUnicodeToEUCKR.h

diff --git a/browser/components/migration/src/SafariProfileMigrator.js b/browser/components/migration/src/SafariProfileMigrator.js
index 8f6382d08ebd..ce2e4ba9c604 100644
--- a/browser/components/migration/src/SafariProfileMigrator.js
+++ b/browser/components/migration/src/SafariProfileMigrator.js
@@ -337,9 +337,9 @@ Preferences.prototype = {
         this._set("WebKitDefaultTextEncodingName", "intl.charset.default",
           function(webkitCharset) {
             // We don't support x-mac-korean (see bug 713516), but it mostly matches
-            // x-windows-949.
+            // EUC-KR.
             if (webkitCharset == "x-mac-korean")
-              return "x-windows-949";
+              return "EUC-KR";
 
             // getCharsetAlias throws if an invalid value is passed in.
             try {
diff --git a/dom/encoding/TextDecoder.cpp b/dom/encoding/TextDecoder.cpp
index 120dd7d4ab7e..b214799e5aec 100644
--- a/dom/encoding/TextDecoder.cpp
+++ b/dom/encoding/TextDecoder.cpp
@@ -206,13 +206,6 @@ TextDecoder::GetEncoding(nsAString& aEncoding)
     return;
   }
 
-  // Similarly, "x-windows-949" is used for the "euc-kr" family. Therefore, if
-  // the internal encoding name is "x-windows-949", "euc-kr" is returned.
-  if (mEncoding.EqualsLiteral("x-windows-949")) {
-    aEncoding.AssignLiteral("euc-kr");
-    return;
-  }
-
   CopyASCIItoUTF16(mEncoding, aEncoding);
   nsContentUtils::ASCIIToLower(aEncoding);
 }
diff --git a/dom/encoding/labelsencodings.properties b/dom/encoding/labelsencodings.properties
index 3ceecdca1ce0..8a67615c7e9e 100644
--- a/dom/encoding/labelsencodings.properties
+++ b/dom/encoding/labelsencodings.properties
@@ -205,16 +205,16 @@ shift_jis=Shift_JIS
 sjis=Shift_JIS
 windows-31j=Shift_JIS
 x-sjis=Shift_JIS
-cseuckr=x-windows-949
-csksc56011987=x-windows-949
-euc-kr=x-windows-949
-iso-ir-149=x-windows-949
-korean=x-windows-949
-ks_c_5601-1987=x-windows-949
-ks_c_5601-1989=x-windows-949
-ksc5601=x-windows-949
-ksc_5601=x-windows-949
-windows-949=x-windows-949
+cseuckr=EUC-KR
+csksc56011987=EUC-KR
+euc-kr=EUC-KR
+iso-ir-149=EUC-KR
+korean=EUC-KR
+ks_c_5601-1987=EUC-KR
+ks_c_5601-1989=EUC-KR
+ksc5601=EUC-KR
+ksc_5601=EUC-KR
+windows-949=EUC-KR
 csiso2022kr=ISO-2022-KR
 iso-2022-kr=ISO-2022-KR
 utf-16=UTF-16LE
diff --git a/dom/locales/en-US/chrome/charsetTitles.properties b/dom/locales/en-US/chrome/charsetTitles.properties
index 5e527e740189..47497bedc3bb 100644
--- a/dom/locales/en-US/chrome/charsetTitles.properties
+++ b/dom/locales/en-US/chrome/charsetTitles.properties
@@ -43,7 +43,6 @@ gbk.title = Chinese Simplified (GBK)
 iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
-x-windows-949.title = Korean (UHC)
 iso-2022-kr.title = Korean (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 70c0a9435784..c8592c885627 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -964,7 +964,7 @@ static const moz2javaCharset charsets[] =
     {"windows-1257",    "Cp1257"},
     {"windows-1258",    "Cp1258"},
     {"EUC-JP",          "EUC_JP"},
-    {"EUC-KR",          "EUC_KR"},
+    {"EUC-KR",          "MS949"},
     {"x-euc-tw",        "EUC_TW"},
     {"gb18030",         "GB18030"},
     {"gbk",             "GBK"},
@@ -982,7 +982,6 @@ static const moz2javaCharset charsets[] =
     {"x-johab",         "Johab"},
     {"KOI8-R",          "KOI8_R"},
     {"TIS-620",         "MS874"},
-    {"x-windows-949",   "MS949"},
     {"x-mac-arabic",    "MacArabic"},
     {"x-mac-croatian",  "MacCroatia"},
     {"x-mac-cyrillic",  "MacCyrillic"},
diff --git a/intl/locale/src/charsetalias.properties b/intl/locale/src/charsetalias.properties
index 02832524deaa..3939fdaa417e 100644
--- a/intl/locale/src/charsetalias.properties
+++ b/intl/locale/src/charsetalias.properties
@@ -117,7 +117,6 @@ x-iso-10646-ucs-2-be=UTF-16BE
 x-iso-10646-ucs-2-le=UTF-16LE
 x-user-defined=x-user-defined
 x-johab=x-johab
-x-windows-949=x-windows-949
 #
 # Aliases for ISO-8859-1
 #
@@ -277,8 +276,7 @@ zh_tw-big5=Big5
 # Aliases for EUC-KR
 #
 cseuckr=EUC-KR
-# The following are really not aliases EUC-KR, add them only for MS FrontPage
-#ks_c_5601-1987=EUC-KR
+ks_c_5601-1987=EUC-KR
 iso-ir-149=EUC-KR
 ks_c_5601-1989=EUC-KR
 ksc_5601=EUC-KR
@@ -286,11 +284,7 @@ ksc5601=EUC-KR
 korean=EUC-KR
 csksc56011987=EUC-KR
 5601=EUC-KR
-#
-# Aliases for X-Windows-949, CP949, Unified Hangul Code (UHC)
-#
-# Microsoft uses ks_c_5601-1987 to mean Windows-949 or its subset EUC-KR.
-ks_c_5601-1987=x-windows-949
+windows-949=EUC-KR
 #
 # Aliases for GB2312
 #
diff --git a/intl/locale/src/windows/wincharset.properties b/intl/locale/src/windows/wincharset.properties
index 648e7fcb22f4..18e41ba2abae 100644
--- a/intl/locale/src/windows/wincharset.properties
+++ b/intl/locale/src/windows/wincharset.properties
@@ -9,7 +9,7 @@
 acp.874=TIS-620
 acp.932=Shift_JIS
 acp.936=gb18030
-acp.949=x-windows-949
+acp.949=EUC-KR
 acp.950=Big5
 acp.951=Big5-HKSCS
 acp.1250=windows-1250
diff --git a/intl/uconv/directory.txt b/intl/uconv/directory.txt
index a16ed2520425..5c7ec1431455 100644
--- a/intl/uconv/directory.txt
+++ b/intl/uconv/directory.txt
@@ -15,7 +15,7 @@ The following directories contain different charset converters:
 ucvcn    - Simplified Chinese charsets - GB2312, HZ, ISO-2022-CN, GBK, GB18030
 ucvibm   - IBM charsets - CP850, 852, 855, 857, 862, 864, 869, 1125, 1131
 ucvja    - Japanese charsets - Shift-JIS, ISO-2022-JP, EUC-JP
-ucvko    - Korean charsets - ISO-2022-KR, EUC-KR, CP949
+ucvko    - Korean charsets - ISO-2022-KR, EUC-KR, Johab
 ucvlatin - Latin charsets and others - ISO-8859-x, CP1250-1258
                             CP866, 874, ARMSCII, ISO-IR-111, KOI8,
                             Mac charsets, T61, TIS620, TCVN, VISCII, VPS
diff --git a/intl/uconv/src/charsetData.properties b/intl/uconv/src/charsetData.properties
index a19ecb81595f..b1f5da404395 100644
--- a/intl/uconv/src/charsetData.properties
+++ b/intl/uconv/src/charsetData.properties
@@ -69,7 +69,6 @@ ibm1131.notForOutgoing                  = true
 iso-8859-8-e.notForOutgoing             = true
 iso-8859-8.notForOutgoing               = true
 iso-2022-kr.notForOutgoing              = true
-x-windows-949.notForOutgoing            = true
 x-johab.notForOutgoing                  = true
 
 
@@ -186,7 +185,6 @@ x-mac-romanian.LangGroup           = x-central-euro
 x-user-defined.LangGroup           = x-user-def
 ks_c_5601-1987.LangGroup           = ko
 x-johab.LangGroup                  = ko
-x-windows-949.LangGroup            = ko
 x-mac-hebrew.LangGroup             = he
 x-mac-arabic.LangGroup             = ar
 x-sun-unicode-india-0.LangGroup    = x-devanagari
@@ -204,6 +202,5 @@ hz-gb-2312.isMultibyte      = true
 iso-2022-kr.isMultibyte     = true
 euc-kr.isMultibyte          = true
 x-johab.isMultibyte         = true
-x-windows-949.isMultibyte   = true
 utf-7.isMultibyte           = true
 utf-8.isMultibyte           = true
diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp
index aa03c3629a7e..f15879ce8fa5 100644
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@@ -210,8 +210,6 @@
 // ucvko
 #include "nsUCvKOCID.h"
 #include "nsUCvKODll.h"
-#include "nsEUCKRToUnicode.h"
-#include "nsUnicodeToEUCKR.h"
 #include "nsJohabToUnicode.h"
 #include "nsUnicodeToJohab.h"
 #include "nsCP949ToUnicode.h"
@@ -333,7 +331,6 @@ NS_UCONV_REG_UNREG_ENCODER("hkscs-1" , NS_UNICODETOHKSCS_CID)
     // ucvko
 NS_UCONV_REG_UNREG("EUC-KR", NS_EUCKRTOUNICODE_CID, NS_UNICODETOEUCKR_CID)
 NS_UCONV_REG_UNREG("x-johab", NS_JOHABTOUNICODE_CID, NS_UNICODETOJOHAB_CID)
-NS_UCONV_REG_UNREG("x-windows-949", NS_CP949TOUNICODE_CID, NS_UNICODETOCP949_CID)
 NS_UCONV_REG_UNREG_DECODER("ISO-2022-KR", NS_ISO2022KRTOUNICODE_CID)
 
 // ucvcn
@@ -687,8 +684,6 @@ NS_DEFINE_NAMED_CID(NS_EUCKRTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOEUCKR_CID);
 NS_DEFINE_NAMED_CID(NS_JOHABTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOJOHAB_CID);
-NS_DEFINE_NAMED_CID(NS_CP949TOUNICODE_CID);
-NS_DEFINE_NAMED_CID(NS_UNICODETOCP949_CID);
 NS_DEFINE_NAMED_CID(NS_ISO2022KRTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_GB2312TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOGB2312_CID);
@@ -870,12 +865,10 @@ static const mozilla::Module::CIDEntry kUConvCIDs[] = {
   { &kNS_UNICODETOBIG5HKSCS_CID, false, nullptr, nsUnicodeToBIG5HKSCSConstructor },
   { &kNS_UNICODETOHKSCS_CID, false, nullptr, nsUnicodeToHKSCSConstructor },
   { &kNS_BIG5HKSCSTOUNICODE_CID, false, nullptr, nsBIG5HKSCSToUnicodeConstructor },
-  { &kNS_EUCKRTOUNICODE_CID, false, nullptr, nsEUCKRToUnicodeConstructor },
-  { &kNS_UNICODETOEUCKR_CID, false, nullptr, nsUnicodeToEUCKRConstructor },
+  { &kNS_EUCKRTOUNICODE_CID, false, nullptr, nsCP949ToUnicodeConstructor },
+  { &kNS_UNICODETOEUCKR_CID, false, nullptr, nsUnicodeToCP949Constructor },
   { &kNS_JOHABTOUNICODE_CID, false, nullptr, nsJohabToUnicodeConstructor },
   { &kNS_UNICODETOJOHAB_CID, false, nullptr, nsUnicodeToJohabConstructor },
-  { &kNS_CP949TOUNICODE_CID, false, nullptr, nsCP949ToUnicodeConstructor },
-  { &kNS_UNICODETOCP949_CID, false, nullptr, nsUnicodeToCP949Constructor },
   { &kNS_ISO2022KRTOUNICODE_CID, false, nullptr, nsISO2022KRToUnicodeConstructor },
   { &kNS_GB2312TOUNICODE_CID, false, nullptr, nsGB2312ToUnicodeV2Constructor },
   { &kNS_UNICODETOGB2312_CID, false, nullptr, nsUnicodeToGB2312V2Constructor },
@@ -1063,8 +1056,6 @@ static const mozilla::Module::ContractIDEntry kUConvContracts[] = {
   { NS_UNICODEENCODER_CONTRACTID_BASE "EUC-KR", &kNS_UNICODETOEUCKR_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-johab", &kNS_JOHABTOUNICODE_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-johab", &kNS_UNICODETOJOHAB_CID },
-  { NS_UNICODEDECODER_CONTRACTID_BASE "x-windows-949", &kNS_CP949TOUNICODE_CID },
-  { NS_UNICODEENCODER_CONTRACTID_BASE "x-windows-949", &kNS_UNICODETOCP949_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-2022-KR", &kNS_ISO2022KRTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "GB2312", &kNS_GB2312TOUNICODE_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "GB2312", &kNS_UNICODETOGB2312_CID },
diff --git a/intl/uconv/tests/unit/test_bug718500.js b/intl/uconv/tests/unit/test_bug718500.js
index 0a8f6eed1361..d5998a2cd04e 100644
--- a/intl/uconv/tests/unit/test_bug718500.js
+++ b/intl/uconv/tests/unit/test_bug718500.js
@@ -95,7 +95,6 @@ var encoderList = [
   "hkscs-1",
   "EUC-KR",
   "x-johab",
-  "x-windows-949",
   "GB2312",
   "gbk",
   "HZ-GB-2312",
@@ -178,7 +177,6 @@ var decoderList = [
   "Big5-HKSCS",
   "EUC-KR",
   "x-johab",
-  "x-windows-949",
   "GB2312",
   "gbk",
   "HZ-GB-2312",
diff --git a/intl/uconv/tests/unit/test_decode_EUCKR_Hangul.js b/intl/uconv/tests/unit/test_decode_EUCKR_Hangul.js
index 8c6d2ee9df78..4dd76c5775bd 100644
--- a/intl/uconv/tests/unit/test_decode_EUCKR_Hangul.js
+++ b/intl/uconv/tests/unit/test_decode_EUCKR_Hangul.js
@@ -4,7 +4,7 @@
 load('CharsetConversionTests.js');
 load('hangulTestStrings.js');
 
-const aliases = [ "euc-kr", "EUC-KR", "iso-ir-149", "ks_c_5601-1989", "ksc_5601", "ksc5601", "korean", "csksc56011987", "5601", "x-windows-949", "ks_c_5601-1987", "cseuckr"];
+const aliases = [ "euc-kr", "EUC-KR", "iso-ir-149", "ks_c_5601-1989", "ksc_5601", "ksc5601", "korean", "csksc56011987", "5601", "windows-949", "ks_c_5601-1987", "cseuckr"];
 
 function to8byteHangul(byte3, byte5, byte7)
 {
diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in
index 831562941436..bcf5a98a1eff 100644
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -17,8 +17,6 @@ LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
-		nsEUCKRToUnicode.cpp \
-		nsUnicodeToEUCKR.cpp \
 		nsISO2022KRToUnicode.cpp \
 		nsCP949ToUnicode.cpp \
 		nsUnicodeToCP949.cpp \
diff --git a/intl/uconv/ucvko/nsEUCKRToUnicode.cpp b/intl/uconv/ucvko/nsEUCKRToUnicode.cpp
deleted file mode 100644
index ed81c6135eb9..000000000000
--- a/intl/uconv/ucvko/nsEUCKRToUnicode.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsEUCKRToUnicode.h"
-#include "nsUCvKODll.h"
-#include "nsUCConstructors.h"
-
-nsresult
-nsEUCKRToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                            void **aResult)
-{
-  return nsCP949ToUnicodeConstructor(aOuter, aIID, aResult);
-}
diff --git a/intl/uconv/ucvko/nsEUCKRToUnicode.h b/intl/uconv/ucvko/nsEUCKRToUnicode.h
deleted file mode 100644
index 7b02e8855110..000000000000
--- a/intl/uconv/ucvko/nsEUCKRToUnicode.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsEUCKRToUnicode_h___
-#define nsEUCKRToUnicode_h___
-
-#include "nsCP949ToUnicode.h"
-
-/**
- * A character set converter from EUCKR to Unicode.
- *
- * @created         06/Apr/1999
- * @author  Catalin Rotaru [CATA]
- */
-// Just make it an alias to CP949 decoder. bug 131388
-nsresult
-nsEUCKRToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                            void **aResult);
-
-#endif /* nsEUCKRToUnicode_h___ */
diff --git a/intl/uconv/ucvko/nsUCvKOCID.h b/intl/uconv/ucvko/nsUCvKOCID.h
index fb51fe87b158..f3104520370c 100644
--- a/intl/uconv/ucvko/nsUCvKOCID.h
+++ b/intl/uconv/ucvko/nsUCvKOCID.h
@@ -28,14 +28,6 @@
 #define NS_UNICODETOISO2022KR_CID \
   { 0xba6151a0, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
-// Class ID for our UnicodeToCP949 charset converter
-#define NS_UNICODETOCP949_CID \
-  { 0x9416bfbe, 0x1f93, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
-// Class ID for our CP949ToUnicode charset converter
-#define NS_CP949TOUNICODE_CID \
-  { 0x9416bfbf, 0x1f93, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
 // Class ID for our UnicodeToJohab charset converter
 // {D9B1F97E-CFA0-80b6-FB92-9972E48E3DCC}
 #define NS_UNICODETOJOHAB_CID \
diff --git a/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp b/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp
deleted file mode 100644
index 3f977d829e5d..000000000000
--- a/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsUnicodeToEUCKR.h"
-#include "nsUCvKODll.h"
-#include "nsUCConstructors.h"
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-
-static const uint16_t *g_EUCKRMappingTable[3] = {
-  g_ASCIIMappingTable,
-  g_ufKSC5601Mapping,
-  g_HangulNullMapping
-};
-
-static const uScanClassID g_EUCKRScanCellIDTable[3] =  {
-  u1ByteCharset,
-  u2BytesGRCharset,
-  uDecomposedHangulCharset
-};
-
-nsresult
-nsUnicodeToEUCKRConstructor(nsISupports *aOuter, REFNSIID aIID,
-                            void **aResult)
-{
-  return CreateMultiTableEncoder(3,
-                                 (uScanClassID*) g_EUCKRScanCellIDTable, 
-                                 (uMappingTable**) g_EUCKRMappingTable,
-                                 // change from 2 to 8 because of composed jamo
-                                 8 /* max length = src * 8 */,
-                                 aOuter, aIID, aResult);
-}
-
diff --git a/intl/uconv/ucvko/nsUnicodeToEUCKR.h b/intl/uconv/ucvko/nsUnicodeToEUCKR.h
deleted file mode 100644
index 5fb2d3303770..000000000000
--- a/intl/uconv/ucvko/nsUnicodeToEUCKR.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsUnicodeToEUCKR_h___
-#define nsUnicodeToEUCKR_h___
-
-#include "nsISupports.h"
-
-/**
- * A character set converter from Unicode to EUCKR.
- *
- * @created         06/Apr/1999
- * @author  Catalin Rotaru [CATA]
- */
-nsresult
-nsUnicodeToEUCKRConstructor(nsISupports *aOuter, REFNSIID aIID,
-                            void **aResult);
-
-#endif /* nsUnicodeToEUCKR_h___ */
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 5a14e6f884c2..c4af8e992caa 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1265,7 +1265,7 @@ pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/in
 pref("intl.charsetmenu.browser.static",     "chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.more1",      "ISO-8859-1, ISO-8859-15, IBM850, macintosh, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3");
 pref("intl.charsetmenu.browser.more2",      "ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian");
-pref("intl.charsetmenu.browser.more3",      "GB2312, gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR");
+pref("intl.charsetmenu.browser.more3",      "GB2312, gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-johab, ISO-2022-KR");
 pref("intl.charsetmenu.browser.more4",      "armscii-8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi");
 pref("intl.charsetmenu.browser.more5",      "ISO-8859-6, windows-1256, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862");
 pref("intl.charsetmenu.browser.unicode",    "UTF-8, UTF-16LE, UTF-16BE");
diff --git a/widget/os2/nsOS2Uni.cpp b/widget/os2/nsOS2Uni.cpp
index 4088f54070f1..8b1884797106 100644
--- a/widget/os2/nsOS2Uni.cpp
+++ b/widget/os2/nsOS2Uni.cpp
@@ -38,7 +38,7 @@ ConverterInfo gConverterInfo[eCONVERTER_COUNT] =
   { 943,  "Shift_JIS",     nullptr,  nullptr },
   { 1381, "GB2312",        nullptr,  nullptr },
   { 1386, "GB2312",        nullptr,  nullptr },
-  { 949,  "x-windows-949", nullptr,  nullptr },
+  { 949,  "EUC-KR",        nullptr,  nullptr },
   { 950,  "Big5",          nullptr,  nullptr },
   { 1361, "x-johab",       nullptr,  nullptr }
 };

From a9094a7158ff0effc21a0a23148a3c5d98974eb2 Mon Sep 17 00:00:00 2001
From: Abhishek Potnis <abhishekp.bugzilla@gmail.com>
Date: Sun, 4 Nov 2012 19:18:37 +0530
Subject: [PATCH 29/76] Bug 607280 - Remove the call to getShortcutOrURI in the
 contentAreaClick function. r=gavin

---
 browser/base/content/browser.js                       | 6 +-----
 browser/base/content/test/browser_contentAreaClick.js | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 5c1ffea91bcb..a2eb0e865641 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5329,11 +5329,7 @@ function contentAreaClick(event, isPanelClick)
         return;
       }
 
-      let postData = {};
-      let url = getShortcutOrURI(href, postData);
-      if (!url)
-        return;
-      loadURI(url, null, postData.value, false);
+      loadURI(href, null, null, false);
       event.preventDefault();
       return;
     }
diff --git a/browser/base/content/test/browser_contentAreaClick.js b/browser/base/content/test/browser_contentAreaClick.js
index a0797cca6442..ba89240ea69a 100644
--- a/browser/base/content/test/browser_contentAreaClick.js
+++ b/browser/base/content/test/browser_contentAreaClick.js
@@ -113,7 +113,7 @@ let gTests = [
     clean: function() {},
     event: {},
     targets: [ "panellink" ],
-    expectedInvokedMethods: [ "urlSecurityCheck", "getShortcutOrURI", "loadURI" ],
+    expectedInvokedMethods: [ "urlSecurityCheck", "loadURI" ],
     preventDefault: true,
   },
 

From cdee8bbc50cda8b071c9f88b009764661986cdf0 Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Tue, 13 Nov 2012 18:58:48 -0500
Subject: [PATCH 30/76] Bug 781602 - Permit multiple ion compilation modes.
 r=dvander

This implies the possibility of multiple ion scripts per JSScript.
* * *
Add abstractions for cases that handle all comp. modes at once.
* * *
split out separate fields for seq, par
* * *
Convert Invalidate() to assert that it is being run in sequential mode.
---
 js/src/ion/CodeGenerator.cpp      |  97 ++++++++++++--------
 js/src/ion/CompileInfo.h          |  24 ++++-
 js/src/ion/ExecutionModeInlines.h | 103 ++++++++++++++++++++++
 js/src/ion/Ion.cpp                | 141 ++++++++++++++++++++++++------
 js/src/ion/Ion.h                  |   5 ++
 js/src/ion/IonBuilder.cpp         |   8 +-
 js/src/jsdbgapi.cpp               |   3 +-
 js/src/jsfun.cpp                  |   2 +-
 js/src/jsgc.cpp                   |   3 +-
 js/src/jsinfer.cpp                |  24 +++--
 js/src/jsinfer.h                  |  18 +++-
 js/src/jsinferinlines.h           |  49 +++++++----
 js/src/jsinterpinlines.h          |   8 +-
 js/src/jsmemorymetrics.cpp        |   4 +-
 js/src/jsscript.cpp               |   6 +-
 js/src/jsscript.h                 |  32 ++++++-
 js/src/jsworkers.cpp              |   4 +-
 js/src/methodjit/Compiler.cpp     |   2 +-
 18 files changed, 414 insertions(+), 119 deletions(-)
 create mode 100644 js/src/ion/ExecutionModeInlines.h

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 3f843bcf6104..b7addc635beb 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -13,6 +13,7 @@
 #include "jsnum.h"
 #include "jsmath.h"
 #include "jsinterpinlines.h"
+#include "ExecutionModeInlines.h"
 
 #include "vm/StringObject-inl.h"
 
@@ -798,6 +799,17 @@ CodeGenerator::emitCallInvokeFunction(LInstruction *call, Register calleereg,
     return true;
 }
 
+static inline int32_t ionOffset(ExecutionMode executionMode)
+{
+    switch (executionMode) {
+      case SequentialExecution: return offsetof(JSScript, ion);
+      case ParallelExecution: return offsetof(JSScript, parallelIon);
+    }
+
+    JS_ASSERT(false);
+    return offsetof(JSScript, ion);
+}
+
 bool
 CodeGenerator::visitCallGeneric(LCallGeneric *call)
 {
@@ -831,7 +843,8 @@ CodeGenerator::visitCallGeneric(LCallGeneric *call)
 
     // Knowing that calleereg is a non-native function, load the JSScript.
     masm.movePtr(Address(calleereg, offsetof(JSFunction, u.i.script_)), objreg);
-    masm.movePtr(Address(objreg, offsetof(JSScript, ion)), objreg);
+    ExecutionMode executionMode = gen->info().executionMode();
+    masm.movePtr(Address(objreg, ionOffset(executionMode)), objreg);
 
     // Guard that the IonScript has been compiled.
     masm.branchPtr(Assembler::BelowOrEqual, objreg, ImmWord(ION_COMPILING_SCRIPT), &invoke);
@@ -889,6 +902,7 @@ CodeGenerator::visitCallGeneric(LCallGeneric *call)
 bool
 CodeGenerator::visitCallKnown(LCallKnown *call)
 {
+    JSContext *cx = GetIonContext()->cx;
     Register calleereg = ToRegister(call->getFunction());
     Register objreg    = ToRegister(call->getTempObject());
     uint32 unusedStack = StackOffsetOfPassedArg(call->argslot());
@@ -903,7 +917,9 @@ CodeGenerator::visitCallKnown(LCallKnown *call)
     masm.checkStackAlignment();
 
     // If the function is known to be uncompilable, only emit the call to InvokeFunction.
-    if (target->script()->ion == ION_DISABLED_SCRIPT) {
+    ExecutionMode executionMode = gen->info().executionMode();
+    RootedScript targetScript(cx, target->script());
+    if (GetIonScript(targetScript, executionMode) == ION_DISABLED_SCRIPT) {
         if (!emitCallInvokeFunction(call, calleereg, call->numActualArgs(), unusedStack))
             return false;
 
@@ -920,7 +936,7 @@ CodeGenerator::visitCallKnown(LCallKnown *call)
 
     // Knowing that calleereg is a non-native function, load the JSScript.
     masm.movePtr(Address(calleereg, offsetof(JSFunction, u.i.script_)), objreg);
-    masm.movePtr(Address(objreg, offsetof(JSScript, ion)), objreg);
+    masm.movePtr(Address(objreg, ionOffset(executionMode)), objreg);
 
     // Guard that the IonScript has been compiled.
     masm.branchPtr(Assembler::BelowOrEqual, objreg, ImmWord(ION_COMPILING_SCRIPT), &invoke);
@@ -1088,6 +1104,8 @@ CodeGenerator::emitPopArguments(LApplyArgsGeneric *apply, Register extraStackSpa
 bool
 CodeGenerator::visitApplyArgsGeneric(LApplyArgsGeneric *apply)
 {
+    JSContext *cx = GetIonContext()->cx;
+
     // Holds the function object.
     Register calleereg = ToRegister(apply->getFunction());
 
@@ -1112,14 +1130,15 @@ CodeGenerator::visitApplyArgsGeneric(LApplyArgsGeneric *apply)
     masm.checkStackAlignment();
 
     // If the function is known to be uncompilable, only emit the call to InvokeFunction.
-    if (apply->hasSingleTarget() &&
-        (!apply->getSingleTarget()->isInterpreted() ||
-         apply->getSingleTarget()->script()->ion == ION_DISABLED_SCRIPT))
-    {
-        if (!emitCallInvokeFunction(apply, copyreg))
-            return false;
-        emitPopArguments(apply, copyreg);
-        return true;
+    ExecutionMode executionMode = gen->info().executionMode();
+    if (apply->hasSingleTarget()) {
+        RootedFunction target(cx, apply->getSingleTarget());
+        if (!CanIonCompile(cx, target, executionMode)) {
+            if (!emitCallInvokeFunction(apply, copyreg))
+                return false;
+            emitPopArguments(apply, copyreg);
+            return true;
+        }
     }
 
     Label end, invoke;
@@ -1134,7 +1153,7 @@ CodeGenerator::visitApplyArgsGeneric(LApplyArgsGeneric *apply)
 
     // Knowing that calleereg is a non-native function, load the JSScript.
     masm.movePtr(Address(calleereg, offsetof(JSFunction, u.i.script_)), objreg);
-    masm.movePtr(Address(objreg, offsetof(JSScript, ion)), objreg);
+    masm.movePtr(Address(objreg, ionOffset(executionMode)), objreg);
 
     // Guard that the IonScript has been compiled.
     masm.branchPtr(Assembler::BelowOrEqual, objreg, ImmWord(ION_COMPILING_SCRIPT), &invoke);
@@ -2985,7 +3004,8 @@ CodeGenerator::generate()
     encodeSafepoints();
 
     RootedScript script(cx, gen->info().script());
-    JS_ASSERT(!script->hasIonScript());
+    ExecutionMode executionMode = gen->info().executionMode();
+    JS_ASSERT(!HasIonScript(script, executionMode));
 
     uint32 scriptFrameSize = frameClass_ == FrameSizeClass::None()
                            ? frameDepth_
@@ -2996,48 +3016,51 @@ CodeGenerator::generate()
     if (cx->compartment->types.compiledInfo.compilerOutput(cx)->isInvalidated())
         return true;
 
-    script->ion = IonScript::New(cx, slots, scriptFrameSize, snapshots_.size(),
-                                 bailouts_.length(), graph.numConstants(),
-                                 safepointIndices_.length(), osiIndices_.length(),
-                                 cacheList_.length(), barrierOffsets_.length(),
-                                 safepoints_.size(), graph.mir().numScripts());
-    if (!script->ion)
+    IonScript *ionScript =
+      IonScript::New(cx, slots, scriptFrameSize, snapshots_.size(),
+                     bailouts_.length(), graph.numConstants(),
+                     safepointIndices_.length(), osiIndices_.length(),
+                     cacheList_.length(), barrierOffsets_.length(),
+                     safepoints_.size(), graph.mir().numScripts());
+    SetIonScript(script, executionMode, ionScript);
+
+    if (!ionScript)
         return false;
     invalidateEpilogueData_.fixup(&masm);
     Assembler::patchDataWithValueCheck(CodeLocationLabel(code, invalidateEpilogueData_),
-                                       ImmWord(uintptr_t(script->ion)),
+                                       ImmWord(uintptr_t(ionScript)),
                                        ImmWord(uintptr_t(-1)));
 
     IonSpew(IonSpew_Codegen, "Created IonScript %p (raw %p)",
-            (void *) script->ion, (void *) code->raw());
+            (void *) ionScript, (void *) code->raw());
 
-    script->ion->setInvalidationEpilogueDataOffset(invalidateEpilogueData_.offset());
-    script->ion->setOsrPc(gen->info().osrPc());
-    script->ion->setOsrEntryOffset(getOsrEntryOffset());
+    ionScript->setInvalidationEpilogueDataOffset(invalidateEpilogueData_.offset());
+    ionScript->setOsrPc(gen->info().osrPc());
+    ionScript->setOsrEntryOffset(getOsrEntryOffset());
     ptrdiff_t real_invalidate = masm.actualOffset(invalidate_.offset());
-    script->ion->setInvalidationEpilogueOffset(real_invalidate);
+    ionScript->setInvalidationEpilogueOffset(real_invalidate);
 
-    script->ion->setMethod(code);
-    script->ion->setDeoptTable(deoptTable_);
+    ionScript->setMethod(code);
+    ionScript->setDeoptTable(deoptTable_);
     if (snapshots_.size())
-        script->ion->copySnapshots(&snapshots_);
+        ionScript->copySnapshots(&snapshots_);
     if (bailouts_.length())
-        script->ion->copyBailoutTable(&bailouts_[0]);
+        ionScript->copyBailoutTable(&bailouts_[0]);
     if (graph.numConstants())
-        script->ion->copyConstants(graph.constantPool());
+        ionScript->copyConstants(graph.constantPool());
     if (safepointIndices_.length())
-        script->ion->copySafepointIndices(&safepointIndices_[0], masm);
+        ionScript->copySafepointIndices(&safepointIndices_[0], masm);
     if (osiIndices_.length())
-        script->ion->copyOsiIndices(&osiIndices_[0], masm);
+        ionScript->copyOsiIndices(&osiIndices_[0], masm);
     if (cacheList_.length())
-        script->ion->copyCacheEntries(&cacheList_[0], masm);
+        ionScript->copyCacheEntries(&cacheList_[0], masm);
     if (barrierOffsets_.length())
-        script->ion->copyPrebarrierEntries(&barrierOffsets_[0], masm);
+        ionScript->copyPrebarrierEntries(&barrierOffsets_[0], masm);
     if (safepoints_.size())
-        script->ion->copySafepoints(&safepoints_);
+        ionScript->copySafepoints(&safepoints_);
 
     JS_ASSERT(graph.mir().numScripts() > 0);
-    script->ion->copyScriptEntries(graph.mir().scripts());
+    ionScript->copyScriptEntries(graph.mir().scripts());
 
     linkAbsoluteLabels();
 
@@ -3045,7 +3068,7 @@ CodeGenerator::generate()
     // since a GC can occur during code generation. All barriers are emitted
     // off-by-default, and are toggled on here if necessary.
     if (cx->compartment->needsBarrier())
-        script->ion->toggleBarriers(true);
+        ionScript->toggleBarriers(true);
 
     return true;
 }
diff --git a/js/src/ion/CompileInfo.h b/js/src/ion/CompileInfo.h
index 370635913c2f..c6ed074dbe99 100644
--- a/js/src/ion/CompileInfo.h
+++ b/js/src/ion/CompileInfo.h
@@ -17,12 +17,23 @@ CountArgSlots(JSFunction *fun)
     return fun ? fun->nargs + 2 : 1; // +2 for |scopeChain| and |this|, or +1 for |scopeChain|
 }
 
+enum ExecutionMode {
+    // Normal JavaScript execution
+    SequentialExecution,
+
+    // JavaScript code to be executed in parallel worker threads,
+    // e.g. by ParallelArray
+    ParallelExecution
+};
+
 // Contains information about the compilation source for IR being generated.
 class CompileInfo
 {
   public:
-    CompileInfo(JSScript *script, JSFunction *fun, jsbytecode *osrPc, bool constructing)
-      : script_(script), fun_(fun), osrPc_(osrPc), constructing_(constructing)
+    CompileInfo(JSScript *script, JSFunction *fun, jsbytecode *osrPc, bool constructing,
+                ExecutionMode executionMode)
+      : script_(script), fun_(fun), osrPc_(osrPc), constructing_(constructing),
+        executionMode_(executionMode)
     {
         JS_ASSERT_IF(osrPc, JSOp(*osrPc) == JSOP_LOOPENTRY);
         nslots_ = script->nslots + CountArgSlots(fun);
@@ -133,12 +144,21 @@ class CompileInfo
         return script()->argumentsHasVarBinding();
     }
 
+    ExecutionMode executionMode() const {
+        return executionMode_;
+    }
+
+    bool isParallelExecution() const {
+        return executionMode_ == ParallelExecution;
+    }
+
   private:
     JSScript *script_;
     JSFunction *fun_;
     unsigned nslots_;
     jsbytecode *osrPc_;
     bool constructing_;
+    ExecutionMode executionMode_;
 };
 
 } // namespace ion
diff --git a/js/src/ion/ExecutionModeInlines.h b/js/src/ion/ExecutionModeInlines.h
new file mode 100644
index 000000000000..6921dd9b7f30
--- /dev/null
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef jsion_compilemode_h__
+#define jsion_compilemode_h__
+
+namespace js {
+namespace ion {
+
+static inline bool HasIonScript(JSScript *script, ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return script->hasIonScript();
+      case ParallelExecution: return script->hasParallelIonScript();
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return false;
+}
+
+static inline IonScript *GetIonScript(JSScript *script, ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return script->ion;
+      case ParallelExecution: return script->parallelIon;
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return NULL;
+}
+
+static inline void SetIonScript(JSScript *script, ExecutionMode cmode, IonScript *ionScript)
+{
+    switch (cmode) {
+      case SequentialExecution: script->ion = ionScript; return;
+      case ParallelExecution: script->parallelIon = ionScript; return;
+    }
+    JS_NOT_REACHED("No such execution mode");
+}
+
+static inline bool CanIonCompile(HandleScript script, ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return script->canIonCompile();
+      case ParallelExecution: return script->canParallelIonCompile();
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return false;
+}
+
+static inline bool CanIonCompile(JSContext *cx, HandleFunction fun, ExecutionMode cmode)
+{
+    if (!fun->isInterpreted())
+        return false;
+    RootedScript script(cx, fun->script());
+    return CanIonCompile(script, cmode);
+}
+
+static inline bool CompilingOffThread(JSScript *script, ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return script->isIonCompilingOffThread();
+      case ParallelExecution: return script->isParallelIonCompilingOffThread();
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return false;
+}
+
+static inline bool CompilingOffThread(HandleScript script, ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return script->isIonCompilingOffThread();
+      case ParallelExecution: return script->isParallelIonCompilingOffThread();
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return false;
+}
+
+static inline bool Disabled(JSScript *script, ExecutionMode cmode) {
+    switch (cmode) {
+      case SequentialExecution: return script->isIonCompilingOffThread();
+      case ParallelExecution: return script->isParallelIonCompilingOffThread();
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return false;
+}
+
+static inline types::CompilerOutput::Kind CompilerOutputKind(ExecutionMode cmode)
+{
+    switch (cmode) {
+      case SequentialExecution: return types::CompilerOutput::Ion;
+      case ParallelExecution: return types::CompilerOutput::ParallelIon;
+    }
+    JS_NOT_REACHED("No such execution mode");
+    return types::CompilerOutput::Ion;
+}
+
+}
+}
+
+#endif
diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index e846c25c810a..02a413b11b9b 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -37,6 +37,7 @@
 #include "ion/IonFrames-inl.h"
 #include "ion/CompilerRoot.h"
 #include "methodjit/Retcon.h"
+#include "ExecutionModeInlines.h"
 
 #if JS_TRACE_LOGGING
 #include "TraceLogging.h"
@@ -963,6 +964,16 @@ class AutoDestroyAllocator
     }
 };
 
+class SequentialCompileContext {
+public:
+    ExecutionMode executionMode() {
+        return SequentialExecution;
+    }
+
+    bool compile(IonBuilder *builder, MIRGraph *graph,
+                 AutoDestroyAllocator &autoDestroy);
+};
+
 void
 AttachFinishedCompilations(JSContext *cx)
 {
@@ -988,7 +999,8 @@ AttachFinishedCompilations(JSContext *cx)
 
             CodeGenerator codegen(builder, *builder->backgroundCompiledLir);
 
-            types::AutoEnterCompilation enterCompiler(cx, types::AutoEnterCompilation::Ion);
+            ExecutionMode executionMode = builder->info().executionMode();
+            types::AutoEnterCompilation enterCompiler(cx, CompilerOutputKind(executionMode));
             enterCompiler.initExisting(builder->recompileInfo);
 
             bool success;
@@ -1018,8 +1030,10 @@ AttachFinishedCompilations(JSContext *cx)
 
 static const size_t BUILDER_LIFO_ALLOC_PRIMARY_CHUNK_SIZE = 1 << 12;
 
+template <typename CompileContext>
 static bool
-IonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc, bool constructing)
+IonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc, bool constructing,
+           CompileContext &compileContext)
 {
     AssertCanGC();
 #if JS_TRACE_LOGGING
@@ -1045,7 +1059,9 @@ IonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc,
         return false;
 
     MIRGraph *graph = alloc->new_<MIRGraph>(temp);
-    CompileInfo *info = alloc->new_<CompileInfo>(script, fun, osrPc, constructing);
+    ExecutionMode executionMode = compileContext.executionMode();
+    CompileInfo *info = alloc->new_<CompileInfo>(script, fun, osrPc, constructing,
+                                                 executionMode);
     if (!info)
         return false;
 
@@ -1057,13 +1073,26 @@ IonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc,
 
     AutoFlushCache afc("IonCompile");
 
-    types::AutoEnterCompilation enterCompiler(cx, types::AutoEnterCompilation::Ion);
+    types::AutoEnterCompilation enterCompiler(cx, CompilerOutputKind(executionMode));
     enterCompiler.init(script, false, 0);
 
     AutoTempAllocatorRooter root(cx, temp);
 
     IonBuilder *builder = alloc->new_<IonBuilder>(cx, temp, graph, &oracle, info);
+    if (!compileContext.compile(builder, graph, autoDestroy)) {
+        IonSpew(IonSpew_Abort, "IM Compilation failed.");
+        return false;
+    }
+
+    return true;
+}
+
+bool
+SequentialCompileContext::compile(IonBuilder *builder, MIRGraph *graph,
+                                  AutoDestroyAllocator &autoDestroy)
+{
     JS_ASSERT(!builder->script()->ion);
+    JSContext *cx = GetIonContext()->cx;
 
     IonSpewNewFunction(graph, builder->script().unsafeGet());
 
@@ -1108,7 +1137,8 @@ IonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc,
 bool
 TestIonCompile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc, bool constructing)
 {
-    if (!IonCompile(cx, script, fun, osrPc, constructing)) {
+    SequentialCompileContext compileContext;
+    if (!IonCompile(cx, script, fun, osrPc, constructing, compileContext)) {
         if (!cx->isExceptionPending())
             ForbidCompilation(cx, script);
         return false;
@@ -1228,7 +1258,8 @@ Compile(JSContext *cx, JSScript *script, JSFunction *fun, jsbytecode *osrPc, boo
             return Method_Skipped;
     }
 
-    if (!IonCompile(cx, script, fun, osrPc, constructing))
+    SequentialCompileContext compileContext;
+    if (!IonCompile(cx, script, fun, osrPc, constructing, compileContext))
         return Method_CantCompile;
 
     // Compilation succeeded, but we invalidated right away.
@@ -1724,7 +1755,11 @@ ion::Invalidate(types::TypeCompartment &types, FreeOp *fop,
     bool anyInvalidation = false;
     for (size_t i = 0; i < invalid.length(); i++) {
         const types::CompilerOutput &co = *invalid[i].compilerOutput(types);
-        if (co.isIon()) {
+        switch (co.kind()) {
+          case types::CompilerOutput::MethodJIT:
+            break;
+          case types::CompilerOutput::Ion:
+          case types::CompilerOutput::ParallelIon:
             JS_ASSERT(co.isValid());
             IonSpew(IonSpew_Invalidate, " Invalidate %s:%u, IonScript %p",
                     co.script->filename, co.script->lineno, co.ion());
@@ -1750,29 +1785,38 @@ ion::Invalidate(types::TypeCompartment &types, FreeOp *fop,
     // until its last invalidated frame is destroyed.
     for (size_t i = 0; i < invalid.length(); i++) {
         types::CompilerOutput &co = *invalid[i].compilerOutput(types);
-        if (co.isIon()) {
-            JS_ASSERT(co.isValid());
-            JSScript *script = co.script;
-            IonScript *ionScript = script->ionScript();
-
-            JSCompartment *compartment = script->compartment();
-            if (compartment->needsBarrier()) {
-                // We're about to remove edges from the JSScript to gcthings
-                // embedded in the IonScript. Perform one final trace of the
-                // IonScript for the incremental GC, as it must know about
-                // those edges.
-                IonScript::Trace(compartment->barrierTracer(), ionScript);
-            }
-
-            ionScript->decref(fop);
-            script->ion = NULL;
-            co.invalidate();
-
-            // Wait for the scripts to get warm again before doing another
-            // compile, unless we are recompiling *because* a script got hot.
-            if (resetUses)
-                script->resetUseCount();
+        ExecutionMode executionMode;
+        switch (co.kind()) {
+          case types::CompilerOutput::MethodJIT:
+            continue;
+          case types::CompilerOutput::Ion:
+            executionMode = SequentialExecution;
+            break;
+          case types::CompilerOutput::ParallelIon:
+            executionMode = ParallelExecution;
+            break;
         }
+        JS_ASSERT(co.isValid());
+        JSScript *script = co.script;
+        IonScript *ionScript = GetIonScript(script, executionMode);
+
+        JSCompartment *compartment = script->compartment();
+        if (compartment->needsBarrier()) {
+            // We're about to remove edges from the JSScript to gcthings
+            // embedded in the IonScript. Perform one final trace of the
+            // IonScript for the incremental GC, as it must know about
+            // those edges.
+            IonScript::Trace(compartment->barrierTracer(), ionScript);
+        }
+
+        ionScript->decref(fop);
+        SetIonScript(script, executionMode, NULL);
+        co.invalidate();
+
+        // Wait for the scripts to get warm again before doing another
+        // compile, unless we are recompiling *because* a script got hot.
+        if (resetUses)
+            script->resetUseCount();
     }
 }
 
@@ -1891,3 +1935,42 @@ AutoFlushCache::AutoFlushCache(const char *nonce, IonCompartment *comp)
 }
 int js::ion::LabelBase::id_count = 0;
 
+void
+ion::PurgeCaches(JSScript *script, JSCompartment *c) {
+    if (script->hasIonScript())
+        script->ion->purgeCaches(c);
+
+    if (script->hasParallelIonScript())
+        script->ion->purgeCaches(c);
+}
+
+size_t
+ion::MemoryUsed(JSScript *script, JSMallocSizeOfFun mallocSizeOf) {
+    size_t result = 0;
+
+    if (script->hasIonScript())
+        result += script->ion->sizeOfIncludingThis(mallocSizeOf);
+
+    if (script->hasParallelIonScript())
+        result += script->parallelIon->sizeOfIncludingThis(mallocSizeOf);
+
+    return result;
+}
+
+void
+ion::DestroyIonScripts(FreeOp *fop, JSScript *script) {
+    if (script->hasIonScript())
+        ion::IonScript::Destroy(fop, script->ion);
+
+    if (script->hasParallelIonScript())
+        ion::IonScript::Destroy(fop, script->parallelIon);
+}
+
+void
+ion::TraceIonScripts(JSTracer* trc, JSScript *script) {
+    if (script->hasIonScript())
+        ion::IonScript::Trace(trc, script->ion);
+
+    if (script->hasParallelIonScript())
+        ion::IonScript::Trace(trc, script->parallelIon);
+}
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index 06b8bd881cd4..9963d9d82097 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -268,6 +268,11 @@ static inline bool IsEnabled(JSContext *cx)
 void ForbidCompilation(JSContext *cx, JSScript *script);
 uint32_t UsesBeforeIonRecompile(JSScript *script, jsbytecode *pc);
 
+void PurgeCaches(JSScript *script, JSCompartment *c);
+size_t MemoryUsed(JSScript *script, JSMallocSizeOfFun mallocSizeOf);
+void DestroyIonScripts(FreeOp *fop, JSScript *script);
+void TraceIonScripts(JSTracer* trc, JSScript *script);
+
 } // namespace ion
 } // namespace js
 
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 3c87e89aded9..2abbaa6d729e 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -15,6 +15,7 @@
 
 #include "jsscriptinlines.h"
 #include "jstypedarrayinlines.h"
+#include "ExecutionModeInlines.h"
 
 #ifdef JS_THREADSAFE
 # include "prthread.h"
@@ -204,8 +205,8 @@ IonBuilder::canInlineTarget(JSFunction *target)
     }
 
     RootedScript inlineScript(cx, target->script());
-
-    if (!inlineScript->canIonCompile()) {
+    ExecutionMode executionMode = info().executionMode();
+    if (!CanIonCompile(inlineScript, executionMode)) {
         IonSpew(IonSpew_Inlining, "Cannot inline due to disable Ion compilation");
         return false;
     }
@@ -2829,7 +2830,8 @@ IonBuilder::jsop_call_inline(HandleFunction callee, uint32 argc, bool constructi
     // lifetime.
     RootedScript calleeScript(cx, callee->script());
     CompileInfo *info = cx->tempLifoAlloc().new_<CompileInfo>(calleeScript.get(), callee,
-                                                              (jsbytecode *)NULL, constructing);
+                                                              (jsbytecode *)NULL, constructing,
+                                                              SequentialExecution);
     if (!info)
         return false;
 
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index c5153eec438e..c8e5c638dde7 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -552,8 +552,9 @@ JS_SetTopFrameAnnotation(JSContext *cx, void *annotation)
     ReleaseAllJITCode(cx->runtime->defaultFreeOp());
 
     // Ensure that we'll never try to compile this again.
-    JS_ASSERT(!script->hasIonScript());
+    JS_ASSERT(!script->hasAnyIonScript());
     script->ion = ION_DISABLED_SCRIPT;
+    script->parallelIon = ION_DISABLED_SCRIPT;
 }
 
 JS_PUBLIC_API(JSObject *)
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 9733bd4f0c7b..f2986b92fe67 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -132,7 +132,7 @@ fun_getProperty(JSContext *cx, HandleObject obj_, HandleId id, MutableHandleValu
         // fully recovered, so we try to mitigate observing this behavior by
         // detecting its use early.
         RawScript script = iter.script().get(nogc);
-        if (!script->hasIonScript())
+        if (!script->hasAnyIonScript())
             ion::ForbidCompilation(cx, script);
 #endif
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index f0486dae1a81..5cf395b2c9a3 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -5876,8 +5876,7 @@ PurgeJITCaches(JSCompartment *c)
 #ifdef JS_ION
 
         /* Discard Ion caches. */
-        if (script->hasIonScript())
-            script->ion->purgeCaches(c);
+        ion::PurgeCaches(script, c);
 
 #endif
     }
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index ad31b3a7de95..2390bfb8009e 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -1997,7 +1997,7 @@ JITCodeHasCheck(HandleScript script, jsbytecode *pc, RecompileKind kind)
     }
 #endif
 
-    if (script->hasIonScript())
+    if (script->hasAnyIonScript())
         return false;
 
     return true;
@@ -2026,8 +2026,14 @@ AddPendingRecompile(JSContext *cx, HandleScript script, jsbytecode *pc,
     RecompileInfo& info = cx->compartment->types.compiledInfo;
     if (info.outputIndex != RecompileInfo::NoCompilerRunning) {
         CompilerOutput *co = info.compilerOutput(cx);
-        if (co->isIon() && co->script == script) {
-            co->invalidate();
+        switch (co->kind()) {
+          case CompilerOutput::MethodJIT:
+            break;
+          case CompilerOutput::Ion:
+          case CompilerOutput::ParallelIon:
+            if (co->script == script)
+                co->invalidate();
+            break;
         }
     }
 
@@ -2417,11 +2423,16 @@ TypeCompartment::processPendingRecompiles(FreeOp *fop)
 
     for (unsigned i = 0; i < pending->length(); i++) {
         CompilerOutput &co = *(*pending)[i].compilerOutput(*this);
-        if (co.isJM()) {
+        switch (co.kind()) {
+          case CompilerOutput::MethodJIT:
             JS_ASSERT(co.isValid());
             mjit::Recompiler::clearStackReferences(fop, co.script);
             co.mjit()->destroyChunk(fop, co.chunkIndex);
             JS_ASSERT(co.script == NULL);
+            break;
+          case CompilerOutput::Ion:
+          case CompilerOutput::ParallelIon:
+            break;
         }
     }
 
@@ -2518,7 +2529,7 @@ TypeCompartment::addPendingRecompile(JSContext *cx, const RecompileInfo &info)
     bool hasJITCode = jit && jit->chunkDescriptor(co->chunkIndex).chunk;
 
 # if defined(JS_ION)
-    hasJITCode |= !!co->script->hasIonScript();
+    hasJITCode |= !!co->script->hasAnyIonScript();
 # endif
 
     if (!hasJITCode) {
@@ -2585,6 +2596,9 @@ TypeCompartment::addPendingRecompile(JSContext *cx, HandleScript script, jsbytec
 
     if (script->hasIonScript())
         addPendingRecompile(cx, script->ionScript()->recompileInfo());
+
+    if (script->hasParallelIonScript())
+        addPendingRecompile(cx, script->parallelIonScript()->recompileInfo());
 # endif
 #endif
 }
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 93791d66673e..a95dd0dae5f0 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -1213,17 +1213,27 @@ typedef HashMap<AllocationSiteKey,ReadBarriered<TypeObject>,AllocationSiteKey,Sy
  */
 struct CompilerOutput
 {
+    enum Kind {
+        MethodJIT,
+        Ion,
+        ParallelIon
+    };
+
     JSScript *script;
-    bool isIonFlag : 1;
+
+    // This integer will always be a member of CompilerOutput::Kind,
+    // but, for portability, bitfields are limited to bool, int, and
+    // unsigned int.  You should really use the accessor below.
+    unsigned kindInt : 2;
     bool constructing : 1;
     bool barriers : 1;
     bool pendingRecompilation : 1;
-    uint32_t chunkIndex:28;
+    uint32_t chunkIndex:27;
 
     CompilerOutput();
 
-    bool isJM() const { return !isIonFlag; }
-    bool isIon() const { return isIonFlag; }
+    Kind kind() const { return static_cast<Kind>(kindInt); }
+    void setKind(Kind k) { kindInt = k; }
 
     mjit::JITScript *mjit() const;
     ion::IonScript *ion() const;
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index 7fd6a985633c..b28454fb6e94 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -88,7 +88,7 @@ namespace types {
 inline
 CompilerOutput::CompilerOutput()
   : script(NULL),
-    isIonFlag(false),
+    kindInt(MethodJIT),
     constructing(false),
     barriers(false),
     chunkIndex(false)
@@ -99,7 +99,7 @@ inline mjit::JITScript *
 CompilerOutput::mjit() const
 {
 #ifdef JS_METHODJIT
-    JS_ASSERT(isJM() && isValid());
+    JS_ASSERT(kind() == MethodJIT && isValid());
     return script->getJIT(constructing, barriers);
 #else
     return NULL;
@@ -110,11 +110,15 @@ inline ion::IonScript *
 CompilerOutput::ion() const
 {
 #ifdef JS_ION
-    JS_ASSERT(isIon() && isValid());
-    return script->ionScript();
-#else
-    return NULL;
+    JS_ASSERT(kind() != MethodJIT && isValid());
+    switch (kind()) {
+      case MethodJIT: break;
+      case Ion: return script->ionScript();
+      case ParallelIon: return script->parallelIonScript();
+    }
 #endif
+    JS_NOT_REACHED("Invalid kind of CompilerOutput");
+    return NULL;
 }
 
 inline bool
@@ -127,8 +131,9 @@ CompilerOutput::isValid() const
     TypeCompartment &types = script->compartment()->types;
 #endif
 
+    switch (kind()) {
+      case MethodJIT: {
 #ifdef JS_METHODJIT
-    if (isJM()) {
         mjit::JITScript *jit = script->getJIT(constructing, barriers);
         if (!jit)
             return false;
@@ -137,20 +142,31 @@ CompilerOutput::isValid() const
             return false;
         JS_ASSERT(this == chunk->recompileInfo.compilerOutput(types));
         return true;
-    }
 #endif
+      }
 
+      case Ion:
 #ifdef JS_ION
-    if (isIon()) {
         if (script->hasIonScript()) {
             JS_ASSERT(this == script->ion->recompileInfo().compilerOutput(types));
             return true;
         }
         if (script->isIonCompilingOffThread())
             return true;
+#endif
+        return false;
+
+      case ParallelIon:
+#ifdef JS_ION
+        if (script->hasParallelIonScript()) {
+            JS_ASSERT(this == script->parallelIonScript()->recompileInfo().compilerOutput(types));
+            return true;
+        }
+        if (script->isParallelIonCompilingOffThread())
+            return true;
+#endif
         return false;
     }
-#endif
     return false;
 }
 
@@ -387,17 +403,12 @@ struct AutoEnterCompilation
 {
     JSContext *cx;
     RecompileInfo &info;
+    CompilerOutput::Kind kind;
 
-    enum Compiler {
-        JM,
-        Ion
-    };
-    Compiler mode;
-
-    AutoEnterCompilation(JSContext *cx, Compiler mode)
+    AutoEnterCompilation(JSContext *cx, CompilerOutput::Kind kind)
       : cx(cx),
         info(cx->compartment->types.compiledInfo),
-        mode(mode)
+        kind(kind)
     {
         JS_ASSERT(cx->compartment->activeAnalysis);
         JS_ASSERT(info.outputIndex == RecompileInfo::NoCompilerRunning);
@@ -407,7 +418,7 @@ struct AutoEnterCompilation
     {
         CompilerOutput co;
         co.script = script;
-        co.isIonFlag = (mode == Ion);
+        co.setKind(kind);
         co.constructing = constructing;
         co.barriers = cx->compartment->compileBarriers();
         co.chunkIndex = chunkIndex;
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index d39cfb46f73e..5228e2b926d7 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -1007,11 +1007,11 @@ class FastInvokeGuard
 
   public:
     FastInvokeGuard(JSContext *cx, const Value &fval)
-      : fun_(cx),
-        script_(cx)
+      : fun_(cx)
+      , script_(cx)
 #ifdef JS_ION
-        , ictx_(cx, cx->compartment, NULL),
-        useIon_(ion::IsEnabled(cx))
+      , ictx_(cx, cx->compartment, NULL)
+      , useIon_(ion::IsEnabled(cx))
 #endif
     {
         initFunction(fval);
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index 7e315a230a7c..8325c3b2cee8 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -20,6 +20,7 @@
 #include "jsobjinlines.h"
 
 #include "ion/IonCode.h"
+#include "ion/Ion.h"
 
 namespace js {
 
@@ -232,8 +233,7 @@ StatsCellCallback(JSRuntime *rt, void *data, void *thing, JSGCTraceKind traceKin
 #ifdef JS_METHODJIT
         cStats->jaegerData += script->sizeOfJitScripts(rtStats->mallocSizeOf);
 # ifdef JS_ION
-        if (script->hasIonScript())
-            cStats->ionData += script->ion->sizeOfIncludingThis(rtStats->mallocSizeOf);
+        cStats->ionData += ion::MemoryUsed(script, rtStats->mallocSizeOf);
 # endif
 #endif
 
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 79400f5ba9ef..efba258c0561 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1904,8 +1904,7 @@ JSScript::finalize(FreeOp *fop)
 #ifdef JS_METHODJIT
     mjit::ReleaseScriptCode(fop, this);
 # ifdef JS_ION
-    if (hasIonScript())
-        ion::IonScript::Destroy(fop, ion);
+    ion::DestroyIonScripts(fop, this);
 # endif
 #endif
 
@@ -2597,8 +2596,7 @@ JSScript::markChildren(JSTracer *trc)
     }
 
 #ifdef JS_ION
-    if (hasIonScript())
-        ion::IonScript::Trace(trc, ion);
+    ion::TraceIonScripts(trc, this);
 #endif
 }
 
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 717d7d11e2ff..5d9b3e7db61f 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -549,26 +549,50 @@ struct JSScript : public js::gc::Cell
         return needsArgsObj() && !strictModeCode;
     }
 
-    js::ion::IonScript *ion;          /* Information attached by Ion */
+    bool hasAnyIonScript() const {
+        return hasIonScript() || hasParallelIonScript();
+    }
 
-#if defined(JS_METHODJIT) && JS_BITS_PER_WORD == 32
-    void *padding_;
-#endif
+    /* Information attached by Ion: script for sequential mode execution */
+    js::ion::IonScript *ion;
 
     bool hasIonScript() const {
         return ion && ion != ION_DISABLED_SCRIPT && ion != ION_COMPILING_SCRIPT;
     }
+
     bool canIonCompile() const {
         return ion != ION_DISABLED_SCRIPT;
     }
+
     bool isIonCompilingOffThread() const {
         return ion == ION_COMPILING_SCRIPT;
     }
+
     js::ion::IonScript *ionScript() const {
         JS_ASSERT(hasIonScript());
         return ion;
     }
 
+    /* Information attached by Ion: script for parallel mode execution */
+    js::ion::IonScript *parallelIon;
+
+    bool hasParallelIonScript() const {
+        return parallelIon && parallelIon != ION_DISABLED_SCRIPT && parallelIon != ION_COMPILING_SCRIPT;
+    }
+
+    bool canParallelIonCompile() const {
+        return parallelIon != ION_DISABLED_SCRIPT;
+    }
+
+    bool isParallelIonCompilingOffThread() const {
+        return parallelIon == ION_COMPILING_SCRIPT;
+    }
+
+    js::ion::IonScript *parallelIonScript() const {
+        JS_ASSERT(hasParallelIonScript());
+        return parallelIon;
+    }
+
     /*
      * Original compiled function for the script, if it has a function.
      * NULL for global and eval scripts.
diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp
index 32e55c558f35..59a03e5cdcb4 100644
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -8,6 +8,7 @@
 
 #if JS_ION
 # include "ion/IonBuilder.h"
+# include "ion/ExecutionModeInlines.h"
 #endif
 
 using namespace js;
@@ -294,7 +295,8 @@ WorkerThread::threadLoop()
 
         ionBuilder = state.ionWorklist.popCopy();
 
-        JS_ASSERT(ionBuilder->script()->ion == ION_COMPILING_SCRIPT);
+        ion::ExecutionMode executionMode = ionBuilder->info().executionMode();
+        JS_ASSERT(GetIonScript(ionBuilder->script().unsafeGet(), executionMode) == ION_COMPILING_SCRIPT);
 
         state.unlock();
 
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index 5ac307c462c7..3d1485c43507 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -539,7 +539,7 @@ mjit::Compiler::performCompilation()
     JS_ASSERT(cx->compartment->activeInference);
 
     {
-        types::AutoEnterCompilation enter(cx, types::AutoEnterCompilation::JM);
+        types::AutoEnterCompilation enter(cx, types::CompilerOutput::MethodJIT);
         if (!enter.init(outerScript, isConstructing, chunkIndex)) {
             js_ReportOutOfMemory(cx);
             return Compile_Error;

From 574ebc58a9d64b045f603a37716713b2c267ec29 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Thu, 8 Nov 2012 14:35:01 -0500
Subject: [PATCH 31/76] Bug 794091 - Write SessionStore with OS.File.
 r=ttaubert

---
 .../sessionstore/src/SessionStore.jsm         | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/src/SessionStore.jsm
index f5687ddaf6f1..82b5472109d0 100644
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -79,6 +79,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/debug.js");
 Cu.import("resource:///modules/TelemetryTimestamps.jsm");
 Cu.import("resource://gre/modules/TelemetryStopwatch.jsm");
+Cu.import("resource://gre/modules/osfile.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
   "resource://gre/modules/NetUtil.jsm");
@@ -441,9 +442,18 @@ let SessionStoreInternal = {
         this._prefBranch.getBoolPref("sessionstore.resume_session_once"))
       this._prefBranch.setBoolPref("sessionstore.resume_session_once", false);
 
+    this._initEncoding();
+
     this._initialized = true;
   },
 
+  _initEncoding : function ssi_initEncoding() {
+    // The (UTF-8) encoder used to write to files.
+    XPCOMUtils.defineLazyGetter(this, "_writeFileEncoder", function () {
+      return new TextEncoder();
+    });
+  },
+
   _initPrefs : function() {
     XPCOMUtils.defineLazyGetter(this, "_prefBranch", function () {
       return Services.prefs.getBranch("browser.");
@@ -4435,27 +4445,21 @@ let SessionStoreInternal = {
   _writeFile: function ssi_writeFile(aFile, aData) {
     let refObj = {};
     TelemetryStopwatch.start("FX_SESSION_RESTORE_WRITE_FILE_MS", refObj);
-    // Initialize the file output stream.
-    var ostream = Cc["@mozilla.org/network/safe-file-output-stream;1"].
-                  createInstance(Ci.nsIFileOutputStream);
-    ostream.init(aFile, 0x02 | 0x08 | 0x20, 0600, ostream.DEFER_OPEN);
+    let path = aFile.path;
+    let encoded = this._writeFileEncoder.encode(aData);
+    let promise = OS.File.writeAtomic(path, encoded, {tmpPath: path + ".tmp"});
 
-    // Obtain a converter to convert our data to a UTF-8 encoded input stream.
-    var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-                    createInstance(Ci.nsIScriptableUnicodeConverter);
-    converter.charset = "UTF-8";
-
-    // Asynchronously copy the data to the file.
-    var istream = converter.convertToInputStream(aData);
-    var self = this;
-    NetUtil.asyncCopy(istream, ostream, function(rc) {
-      if (Components.isSuccessCode(rc)) {
+    promise.then(
+      function onSuccess() {
         TelemetryStopwatch.finish("FX_SESSION_RESTORE_WRITE_FILE_MS", refObj);
         Services.obs.notifyObservers(null,
-                                     "sessionstore-state-write-complete",
-                                     "");
-      }
-    });
+                                      "sessionstore-state-write-complete",
+                                      "");
+      },
+      function onFailure(reason) {
+        TelemetryStopwatch.cancel("FX_SESSION_RESTORE_WRITE_FILE_MS", refObj);
+        Components.reportError("ssi_writeFile failure " + reason);
+      });
   }
 };
 

From f7aae016b22a8af3449bbd48846d923832d6c2bc Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Thu, 8 Nov 2012 14:35:01 -0500
Subject: [PATCH 32/76] Bug 794091 - Reorganize OS.File importScripts to avoid
 talos hangs. r=froydnj

---
 toolkit/components/osfile/osfile.jsm          | 23 ++++++++++++++++---
 .../osfile/osfile_unix_allthreads.jsm         |  3 ---
 .../components/osfile/osfile_unix_back.jsm    |  2 --
 .../components/osfile/osfile_unix_front.jsm   |  3 ---
 .../osfile/osfile_win_allthreads.jsm          |  3 ---
 toolkit/components/osfile/osfile_win_back.jsm |  2 --
 .../components/osfile/osfile_win_front.jsm    |  4 ----
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/toolkit/components/osfile/osfile.jsm b/toolkit/components/osfile/osfile.jsm
index e624798e8501..099ca38b9606 100644
--- a/toolkit/components/osfile/osfile.jsm
+++ b/toolkit/components/osfile/osfile.jsm
@@ -10,9 +10,26 @@ if (typeof Components != "undefined") {
   this.EXPORTED_SYMBOLS = ["OS"];
   Components.utils.import("resource://gre/modules/osfile/osfile_async_front.jsm", this);
 } else {
+  // At this stage, we need to import all sources at once to avoid
+  // a unique failure on tbpl + talos that seems caused by a
+  // what looks like a nested event loop bug (see bug 794091).
 #ifdef XP_WIN
-  importScripts("resource://gre/modules/osfile/osfile_win_front.jsm");
+  importScripts(
+    "resource://gre/modules/osfile/osfile_shared_allthreads.jsm",
+    "resource://gre/modules/osfile/osfile_win_allthreads.jsm",
+    "resource://gre/modules/osfile/ospath_win_back.jsm",
+    "resource://gre/modules/osfile/osfile_win_back.jsm",
+    "resource://gre/modules/osfile/osfile_shared_front.jsm",
+    "resource://gre/modules/osfile/osfile_win_front.jsm"
+  );
 #else
-  importScripts("resource://gre/modules/osfile/osfile_unix_front.jsm");
+  importScripts(
+    "resource://gre/modules/osfile/osfile_shared_allthreads.jsm",
+    "resource://gre/modules/osfile/osfile_unix_allthreads.jsm",
+    "resource://gre/modules/osfile/ospath_unix_back.jsm",
+    "resource://gre/modules/osfile/osfile_unix_back.jsm",
+    "resource://gre/modules/osfile/osfile_shared_front.jsm",
+    "resource://gre/modules/osfile/osfile_unix_front.jsm"
+  );
 #endif
-}
\ No newline at end of file
+}
diff --git a/toolkit/components/osfile/osfile_unix_allthreads.jsm b/toolkit/components/osfile/osfile_unix_allthreads.jsm
index 761ad5034015..5ba9e475f195 100644
--- a/toolkit/components/osfile/osfile_unix_allthreads.jsm
+++ b/toolkit/components/osfile/osfile_unix_allthreads.jsm
@@ -22,9 +22,6 @@ if (typeof Components != "undefined") {
   this.EXPORTED_SYMBOLS = ["OS"];
   Components.utils.import("resource://gre/modules/ctypes.jsm");
   Components.utils.import("resource://gre/modules/osfile/osfile_shared_allthreads.jsm", this);
-} else {
-  // File is included from a chrome worker
-  importScripts("resource://gre/modules/osfile/osfile_shared_allthreads.jsm");
 }
 
 (function(exports) {
diff --git a/toolkit/components/osfile/osfile_unix_back.jsm b/toolkit/components/osfile/osfile_unix_back.jsm
index 720b7186b124..8db7ffa7fde6 100644
--- a/toolkit/components/osfile/osfile_unix_back.jsm
+++ b/toolkit/components/osfile/osfile_unix_back.jsm
@@ -11,8 +11,6 @@
 
     throw new Error("osfile_unix_back.jsm cannot be used from the main thread yet");
   }
-  importScripts("resource://gre/modules/osfile/osfile_shared_allthreads.jsm");
-  importScripts("resource://gre/modules/osfile/osfile_unix_allthreads.jsm");
   (function(exports) {
      "use strict";
      if (!exports.OS) {
diff --git a/toolkit/components/osfile/osfile_unix_front.jsm b/toolkit/components/osfile/osfile_unix_front.jsm
index 908d8fc2828d..99fe6624b79d 100644
--- a/toolkit/components/osfile/osfile_unix_front.jsm
+++ b/toolkit/components/osfile/osfile_unix_front.jsm
@@ -16,9 +16,6 @@
 
     throw new Error("osfile_unix_front.jsm cannot be used from the main thread yet");
   }
-  importScripts("resource://gre/modules/osfile/osfile_unix_back.jsm");
-  importScripts("resource://gre/modules/osfile/ospath_unix_back.jsm");
-  importScripts("resource://gre/modules/osfile/osfile_shared_front.jsm");
   (function(exports) {
      "use strict";
 
diff --git a/toolkit/components/osfile/osfile_win_allthreads.jsm b/toolkit/components/osfile/osfile_win_allthreads.jsm
index e6eafc07a32d..2e4777e24857 100644
--- a/toolkit/components/osfile/osfile_win_allthreads.jsm
+++ b/toolkit/components/osfile/osfile_win_allthreads.jsm
@@ -22,9 +22,6 @@ if (typeof Components != "undefined") {
   this.EXPORTED_SYMBOLS = ["OS"];
   Components.utils.import("resource://gre/modules/ctypes.jsm");
   Components.utils.import("resource://gre/modules/osfile/osfile_shared_allthreads.jsm", this);
-} else {
-  // File is included from a chrome worker
-  importScripts("resource://gre/modules/osfile/osfile_shared_allthreads.jsm");
 }
 
 (function(exports) {
diff --git a/toolkit/components/osfile/osfile_win_back.jsm b/toolkit/components/osfile/osfile_win_back.jsm
index c5804baa5408..7954f808520b 100644
--- a/toolkit/components/osfile/osfile_win_back.jsm
+++ b/toolkit/components/osfile/osfile_win_back.jsm
@@ -28,8 +28,6 @@
 
     throw new Error("osfile_win.jsm cannot be used from the main thread yet");
   }
-  importScripts("resource://gre/modules/osfile/osfile_shared_allthreads.jsm");
-  importScripts("resource://gre/modules/osfile/osfile_win_allthreads.jsm");
 
   (function(exports) {
      "use strict";
diff --git a/toolkit/components/osfile/osfile_win_front.jsm b/toolkit/components/osfile/osfile_win_front.jsm
index 1b0484fec586..cc2fea99a8c6 100644
--- a/toolkit/components/osfile/osfile_win_front.jsm
+++ b/toolkit/components/osfile/osfile_win_front.jsm
@@ -16,10 +16,6 @@
     throw new Error("osfile_win_front.jsm cannot be used from the main thread yet");
   }
 
-  importScripts("resource://gre/modules/osfile/osfile_win_back.jsm");
-  importScripts("resource://gre/modules/osfile/ospath_win_back.jsm");
-  importScripts("resource://gre/modules/osfile/osfile_shared_front.jsm");
-
   (function(exports) {
      "use strict";
 

From f39e18e48327492f8e765cf71b3e7fd22edce6e5 Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Thu, 8 Nov 2012 20:06:50 +0100
Subject: [PATCH 33/76] Bug 805855 - Add an extra function to jemalloc to free
 dirty unused pages. r=glandium

---
 memory/mozjemalloc/jemalloc.c | 29 +++++++++++++++++++++++------
 memory/mozjemalloc/jemalloc.h | 14 ++++++++++++++
 mozglue/build/mozglue.def.in  |  1 +
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
index 289c25e07d0b..6dd3c16e82fa 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -1385,7 +1385,7 @@ static void arena_chunk_init(arena_t *arena, arena_chunk_t *chunk);
 static void	arena_chunk_dealloc(arena_t *arena, arena_chunk_t *chunk);
 static arena_run_t *arena_run_alloc(arena_t *arena, arena_bin_t *bin,
     size_t size, bool large, bool zero);
-static void	arena_purge(arena_t *arena);
+static void	arena_purge(arena_t *arena, bool all);
 static void	arena_run_dalloc(arena_t *arena, arena_run_t *run, bool dirty);
 static void	arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk,
     arena_run_t *run, size_t oldsize, size_t newsize);
@@ -3594,10 +3594,12 @@ arena_run_alloc(arena_t *arena, arena_bin_t *bin, size_t size, bool large,
 }
 
 static void
-arena_purge(arena_t *arena)
+arena_purge(arena_t *arena, bool all)
 {
 	arena_chunk_t *chunk;
 	size_t i, npages;
+	/* If all is set purge all dirty pages. */
+	size_t dirty_max = all ? 1 : opt_dirty_max;
 #ifdef MALLOC_DEBUG
 	size_t ndirty = 0;
 	rb_foreach_begin(arena_chunk_t, link_dirty, &arena->chunks_dirty,
@@ -3606,7 +3608,7 @@ arena_purge(arena_t *arena)
 	} rb_foreach_end(arena_chunk_t, link_dirty, &arena->chunks_dirty, chunk)
 	assert(ndirty == arena->ndirty);
 #endif
-	RELEASE_ASSERT(arena->ndirty > opt_dirty_max);
+	RELEASE_ASSERT(all || (arena->ndirty > opt_dirty_max));
 
 #ifdef MALLOC_STATS
 	arena->stats.npurge++;
@@ -3618,7 +3620,7 @@ arena_purge(arena_t *arena)
 	 * number of system calls, even if a chunk has only been partially
 	 * purged.
 	 */
-	while (arena->ndirty > (opt_dirty_max >> 1)) {
+	while (arena->ndirty > (dirty_max >> 1)) {
 #ifdef MALLOC_DOUBLE_PURGE
 		bool madvised = false;
 #endif
@@ -3675,7 +3677,7 @@ arena_purge(arena_t *arena)
 				arena->stats.nmadvise++;
 				arena->stats.purged += npages;
 #endif
-				if (arena->ndirty <= (opt_dirty_max >> 1))
+				if (arena->ndirty <= (dirty_max >> 1))
 					break;
 			}
 		}
@@ -3800,7 +3802,7 @@ arena_run_dalloc(arena_t *arena, arena_run_t *run, bool dirty)
 
 	/* Enforce opt_dirty_max. */
 	if (arena->ndirty > opt_dirty_max)
-		arena_purge(arena);
+		arena_purge(arena, false);
 }
 
 static void
@@ -6854,6 +6856,21 @@ _msize(const void *ptr)
 }
 #endif
 
+void
+jemalloc_free_dirty_pages(void)
+{
+	size_t i;
+	for (i = 0; i < narenas; i++) {
+		arena_t *arena = arenas[i];
+
+		if (arena != NULL) {
+			malloc_spin_lock(&arena->lock);
+			arena_purge(arena, true);
+			malloc_spin_unlock(&arena->lock);
+		}
+	}
+}
+
 /*
  * End non-standard functions.
  */
diff --git a/memory/mozjemalloc/jemalloc.h b/memory/mozjemalloc/jemalloc.h
index f91d3e4f3e8b..9af11c8d2ea4 100644
--- a/memory/mozjemalloc/jemalloc.h
+++ b/memory/mozjemalloc/jemalloc.h
@@ -116,6 +116,20 @@ static inline void jemalloc_purge_freed_pages() { }
 void    jemalloc_purge_freed_pages();
 #endif
 
+/*
+ * Free all unused dirty pages in all arenas. Calling this function will slow
+ * down subsequent allocations so it is recommended to use it only when
+ * memory needs to be reclaimed at all costs (see bug 805855). This function
+ * provides functionality similar to mallctl("arenas.purge") in jemalloc 3.
+ */
+
+#if !defined(MOZ_NATIVE_JEMALLOC)
+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
+__attribute__((weak))
+#endif /* defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) */
+void    jemalloc_free_dirty_pages();
+#endif /* !defined(MOZ_NATIVE_JEMALLOC) */
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/mozglue/build/mozglue.def.in b/mozglue/build/mozglue.def.in
index 6b27f88d2599..6faa4d37bf74 100644
--- a/mozglue/build/mozglue.def.in
+++ b/mozglue/build/mozglue.def.in
@@ -24,6 +24,7 @@ EXPORTS
   je_malloc_good_size
 #endif
   jemalloc_stats
+  jemalloc_free_dirty_pages
   ; A hack to work around the CRT (see giant comment in Makefile.in)
   frex=je_dumb_free_thunk
 #endif

From fbc8afdb64aee983b3fb8d5980ea2e1fa4f0d8c2 Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Mon, 12 Nov 2012 17:41:23 +0100
Subject: [PATCH 34/76] Bug 805855 - Free dirty pages in response to all
 memory-pressure messages. r=jlebar

---
 b2g/app/b2g.js                        |   4 +
 modules/libpref/src/init/all.js       |   3 +
 xpcom/base/AvailableMemoryTracker.cpp | 117 ++++++++++++++++++++++++--
 xpcom/base/AvailableMemoryTracker.h   |  12 +--
 xpcom/base/Makefile.in                |   3 +-
 5 files changed, 120 insertions(+), 19 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 5ebc5f192166..07b3a09b71e9 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -587,3 +587,7 @@ pref("general.useragent.override.facebook.com", "\(Mobile#(Android; Mobile");
 pref("general.useragent.override.youtube.com", "\(Mobile#(Android; Mobile");
 
 pref("jsloader.reuseGlobal", true);
+
+// Enable freeing dirty pages when minimizing memory; this reduces memory
+// consumption when applications are sent to the background.
+pref("memory.free_dirty_pages", true);
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index c4af8e992caa..258116b68ff0 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3810,6 +3810,9 @@ pref("memory.low_memory_notification_interval_ms", 10000);
 // window to be collected via the GC/CC.
 pref("memory.ghost_window_timeout_seconds", 60);
 
+// Disable freeing dirty pages when minimizing memory.
+pref("memory.free_dirty_pages", false);
+
 pref("social.enabled", false);
 
 // Disable idle observer fuzz, because only privileged content can access idle
diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
index 5276fd9586d3..69af67d80309 100644
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -5,22 +5,37 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/AvailableMemoryTracker.h"
-#include "nsThread.h"
-#include "nsIObserverService.h"
-#include "mozilla/Services.h"
-#include "mozilla/Preferences.h"
-#include "nsWindowsDllInterceptor.h"
+
 #include "prinrval.h"
 #include "pratom.h"
 #include "prenv.h"
+
 #include "nsIMemoryReporter.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIRunnable.h"
+#include "nsISupports.h"
 #include "nsPrintfCString.h"
-#include <windows.h>
+#include "nsThread.h"
+
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
+
+#if defined(XP_WIN)
+#   include "nsWindowsDllInterceptor.h"
+#   include <windows.h>
+#endif
+
+#if defined(MOZ_MEMORY)
+#   include "jemalloc.h"
+#endif  // MOZ_MEMORY
 
 using namespace mozilla;
 
 namespace {
 
+#if defined(XP_WIN)
+
 // We don't want our diagnostic functions to call malloc, because that could
 // call VirtualAlloc, and we'd end up back in here!  So here are a few simple
 // debugging macros (modeled on jemalloc's), which hopefully won't allocate.
@@ -461,6 +476,86 @@ public:
 
 NS_IMPL_ISUPPORTS1(NumLowPhysicalMemoryEventsMemoryReporter, nsIMemoryReporter)
 
+#endif // defined(XP_WIN)
+
+/**
+ * This runnable is executed in response to a memory-pressure event; we spin
+ * the event-loop when receiving the memory-pressure event in the hope that
+ * other observers will synchronously free some memory that we'll be able to
+ * purge here.
+ */
+class nsJemallocFreeDirtyPagesRunnable MOZ_FINAL : public nsIRunnable
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIRUNNABLE
+};
+
+NS_IMPL_ISUPPORTS1(nsJemallocFreeDirtyPagesRunnable, nsIRunnable)
+
+NS_IMETHODIMP
+nsJemallocFreeDirtyPagesRunnable::Run()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+#if defined(MOZ_JEMALLOC)
+  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
+#elif defined(MOZ_MEMORY)
+  jemalloc_free_dirty_pages();
+#endif
+
+  return NS_OK;
+}
+
+/**
+ * The memory pressure watcher is used for listening to memory-pressure events
+ * and reacting upon them. We use one instance per process currently only for
+ * cleaning up dirty unused pages held by jemalloc.
+ */
+class nsMemoryPressureWatcher MOZ_FINAL : public nsIObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  void Init();
+};
+
+NS_IMPL_ISUPPORTS1(nsMemoryPressureWatcher, nsIObserver)
+
+/**
+ * Initialize and subscribe to the memory-pressure events. We subscribe to the
+ * observer service in this method and not in the constructor because we need
+ * to hold a strong reference to 'this' before calling the observer service.
+ */
+void
+nsMemoryPressureWatcher::Init()
+{
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+
+  if (os) {
+    os->AddObserver(this, "memory-pressure", /* ownsWeak */ false);
+  }
+}
+
+/**
+ * Reacts to all types of memory-pressure events, launches a runnable to
+ * free dirty pages held by jemalloc.
+ * @see nsMemoryPressureWatcher::FreeDirtyPages
+ */
+NS_IMETHODIMP
+nsMemoryPressureWatcher::Observe(nsISupports *subject, const char *topic,
+                                 const PRUnichar *data)
+{
+  MOZ_ASSERT(!strcmp(topic, "memory-pressure"), "Unknown topic");
+
+  nsRefPtr<nsIRunnable> runnable = new nsJemallocFreeDirtyPagesRunnable();
+
+  NS_DispatchToMainThread(runnable);
+
+  return NS_OK;
+}
+
 } // anonymous namespace
 
 namespace mozilla {
@@ -468,7 +563,7 @@ namespace AvailableMemoryTracker {
 
 void Activate()
 {
-#if defined(_M_IX86)
+#if defined(_M_IX86) && defined(XP_WIN)
   MOZ_ASSERT(sInitialized);
   MOZ_ASSERT(!sHooksActive);
 
@@ -496,6 +591,12 @@ void Activate()
   }
   sHooksActive = true;
 #endif
+
+  if (Preferences::GetBool("memory.free_dirty_pages", false)) {
+    // This object is held alive by the observer service.
+    nsRefPtr<nsMemoryPressureWatcher> watcher = new nsMemoryPressureWatcher();
+    watcher->Init();
+  }
 }
 
 void Init()
@@ -509,7 +610,7 @@ void Init()
   // process, because we aren't going to run out of virtual memory, and the
   // system is likely to have a fair bit of physical memory.
 
-#if defined(_M_IX86)
+#if defined(_M_IX86) && defined(XP_WIN)
   // Don't register the hooks if we're a build instrumented for PGO: If we're
   // an instrumented build, the compiler adds function calls all over the place
   // which may call VirtualAlloc; this makes it hard to prevent
diff --git a/xpcom/base/AvailableMemoryTracker.h b/xpcom/base/AvailableMemoryTracker.h
index 5f5e21c1e031..9f6cc48d47ad 100644
--- a/xpcom/base/AvailableMemoryTracker.h
+++ b/xpcom/base/AvailableMemoryTracker.h
@@ -10,10 +10,9 @@
 namespace mozilla {
 namespace AvailableMemoryTracker {
 
-// The AvailableMemoryTracker is implemented only on Windows.  But to make
-// callers' lives easier, we stub out empty calls for all its public functions.
-// So you can always initialize the AvailableMemoryTracker; it just might not
-// do anything.
+// The AvailableMemoryTracker launches a memory pressure watcher on all
+// platforms to react to low-memory situations and on Windows it implements
+// the full functionality used to monitor how much memory is available.
 //
 // Init() must be called before any other threads have started, because it
 // modifies the in-memory implementations of some DLL functions in
@@ -22,13 +21,8 @@ namespace AvailableMemoryTracker {
 // The hooks don't do anything until Activate() is called.  It's an error to
 // call Activate() without first calling Init().
 
-#if defined(XP_WIN)
 void Init();
 void Activate();
-#else
-void Init() {}
-void Activate() {}
-#endif
 
 } // namespace AvailableMemoryTracker
 } // namespace mozilla
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 99e0841f15c9..f8e7de550459 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -43,6 +43,7 @@ CPPSRCS		= \
 		nsGZFileWriter.cpp \
 		nsMemoryInfoDumper.cpp \
 		nsMessageLoop.cpp \
+		AvailableMemoryTracker.cpp \
 		$(NULL)
 
 ifeq ($(OS_ARCH),Linux)
@@ -93,8 +94,6 @@ CSRCS		+= pure_api.c
 EXPORTS		+= pure.h
 endif
 
-CPPSRCS += AvailableMemoryTracker.cpp
-
 endif #if OS_ARCH == WINNT
 
 SDK_XPIDLSRCS   = \

From 28c8889945f9251b1cf8f3f260d61669af9a9256 Mon Sep 17 00:00:00 2001
From: Chuck Lee <chulee@mozilla.com>
Date: Mon, 12 Nov 2012 19:19:48 +0800
Subject: [PATCH 35/76] Bug 806307 - Queue target messages before listener
 ready and resend after ready. r=vicamo

---
 dom/system/gonk/RadioInterfaceLayer.js | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 243ed79cf4bd..d51fc4fb78de 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -281,6 +281,8 @@ function RadioInterfaceLayer() {
 
   this.portAddressedSmsApps = {};
   this.portAddressedSmsApps[WAP.WDP_PORT_PUSH] = this.handleSmsWdpPortPush.bind(this);
+
+  this._targetMessageQueue = [];
 }
 RadioInterfaceLayer.prototype = {
 
@@ -657,6 +659,12 @@ RadioInterfaceLayer.prototype = {
   },
 
   _sendTargetMessage: function _sendTargetMessage(permission, message, options) {
+
+    if (!this._sysMsgListenerReady) {
+      this._enqueueTargetMessage(permission, message, options);
+      return;
+    }
+
     let targets = this._messageManagerByPermission[permission];
     if (!targets) {
       return;
@@ -924,6 +932,36 @@ RadioInterfaceLayer.prototype = {
     this._ensureRadioState();
   },
 
+  _enqueueTargetMessage: function _enqueueTargetMessage(permission, message, options) {
+    let msg = { permission : permission,
+                message : message,
+                options : options };
+    // Remove previous queued message of same message type, only one message
+    // per message type is allowed in queue.
+    let messageQueue = this._targetMessageQueue;
+    for(let i = 0; i < messageQueue.length; i++) {
+      if (messageQueue[i].message === message) {
+        messageQueue.splice(i, 1);
+        break;
+      }
+    }
+
+    messageQueue.push(msg);
+  },
+
+  _resendQueuedTargetMessage: function _resendQueuedTargetMessage() {
+    // Here uses this._sendTargetMessage() to resend message, which will
+    // enqueue message if listener is not ready.
+    // So only resend after listener is ready, or it will cause infinate loop and
+    // hang the system.
+
+    // Dequeue and resend messages.
+    for each (let msg in this._targetMessageQueue) {
+      this._sendTargetMessage(msg.permission, msg.message, msg.options);
+    }
+    this._targetMessageQueue = null;
+  },
+
   _ensureRadioState: function _ensureRadioState() {
     debug("Reported radio state is " + this.rilContext.radioState +
           ", desired radio enabled state is " + this._radioEnabled);
@@ -1490,6 +1528,7 @@ RadioInterfaceLayer.prototype = {
       case kSysMsgListenerReadyObserverTopic:
         Services.obs.removeObserver(this, kSysMsgListenerReadyObserverTopic);
         this._sysMsgListenerReady = true;
+        this._resendQueuedTargetMessage();
         this._ensureRadioState();
         break;
       case kMozSettingsChangedObserverTopic:

From 863324557ab7310c0346e339676586b45e3e5df8 Mon Sep 17 00:00:00 2001
From: Tetsuharu OHZEKI <saneyuki.s.snyk@gmail.com>
Date: Tue, 13 Nov 2012 18:58:49 -0500
Subject: [PATCH 36/76] Bug 810794 - Enable to config
 'network.cookie.cookieBehavior'. r=mleibovic

---
 mobile/android/base/locales/en-US/android_strings.dtd |  7 ++++++-
 mobile/android/base/resources/values/arrays.xml       | 10 ++++++++++
 mobile/android/base/resources/xml/preferences.xml.in  |  8 +++++---
 mobile/android/base/strings.xml.in                    |  5 +++++
 mobile/android/chrome/content/browser.js              |  6 +++---
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 44fac14817e3..0c74c15f0c96 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -71,7 +71,12 @@
 <!ENTITY pref_do_not_track "Tell sites not to track me">
 <!ENTITY pref_telemetry "Send performance data">
 <!ENTITY pref_remember_signons "Remember passwords">
-<!ENTITY pref_cookies "Enable cookies">
+
+<!ENTITY pref_cookies "Cookies">
+<!ENTITY pref_cookies_accept_all "Enabled">
+<!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party">
+<!ENTITY pref_cookies_disabled "Disabled">
+
 <!ENTITY pref_char_encoding "Character encoding">
 <!ENTITY pref_char_encoding_on "Show menu">
 <!ENTITY pref_char_encoding_off "Don\'t show menu">
diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
index 8f35d2b2f47f..8e15cb10c659 100644
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -37,6 +37,16 @@
         <item>true</item>
         <item>false</item>
     </string-array>
+    <string-array name="pref_cookies_entries">
+        <item>@string/pref_cookies_accept_all</item>
+        <item>@string/pref_cookies_not_accept_foreign</item>
+        <item>@string/pref_cookies_disabled</item>
+    </string-array>
+    <string-array name="pref_cookies_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
     <string-array name="pref_import_android_entries">
         <item>@string/awesomebar_bookmarks_title</item>
         <item>@string/awesomebar_history_title</item>
diff --git a/mobile/android/base/resources/xml/preferences.xml.in b/mobile/android/base/resources/xml/preferences.xml.in
index 3058dade972a..9b2d568b2555 100644
--- a/mobile/android/base/resources/xml/preferences.xml.in
+++ b/mobile/android/base/resources/xml/preferences.xml.in
@@ -77,9 +77,11 @@
                             android:defaultValue="true"
                             android:persistent="false" />
 
-        <CheckBoxPreference android:key="network.cookie.cookieBehavior"
-                            android:title="@string/pref_cookies"
-                            android:persistent="false" />
+        <ListPreference android:key="network.cookie.cookieBehavior"
+                        android:title="@string/pref_cookies"
+                        android:entries="@array/pref_cookies_entries"
+                        android:entryValues="@array/pref_cookies_values"
+                        android:persistent="false" />
 
 #ifdef MOZ_TELEMETRY_REPORTING
         <CheckBoxPreference android:key="toolkit.telemetry.enabled"
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index f345c55795ce..6c297b3f2480 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -77,7 +77,12 @@
   <string name="pref_do_not_track">&pref_do_not_track;</string>
   <string name="pref_telemetry">&pref_telemetry;</string>
   <string name="pref_remember_signons">&pref_remember_signons;</string>
+
   <string name="pref_cookies">&pref_cookies;</string>
+  <string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string>
+  <string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string>
+  <string name="pref_cookies_disabled">&pref_cookies_disabled;</string>
+
   <string name="pref_char_encoding">&pref_char_encoding;</string>
   <string name="pref_char_encoding_on">&pref_char_encoding_on;</string>
   <string name="pref_char_encoding_off">&pref_char_encoding_off;</string>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index fe2f2217afd6..53d6db254978 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -875,8 +875,8 @@ var BrowserApp = {
         // preferences to be actual booleans.
         switch (prefName) {
           case "network.cookie.cookieBehavior":
-            pref.type = "bool";
-            pref.value = pref.value == 0;
+            pref.type = "string";
+            pref.value = pref.value.toString();
             break;
           case "font.size.inflation.minTwips":
             pref.type = "string";
@@ -923,7 +923,7 @@ var BrowserApp = {
     switch (json.name) {
       case "network.cookie.cookieBehavior":
         json.type = "int";
-        json.value = (json.value ? 0 : 2);
+        json.value = parseInt(json.value);
         break;
       case "font.size.inflation.minTwips":
         json.type = "int";

From e17477fec2ac33defc6801e04c8ee0df6fdd6990 Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Tue, 13 Nov 2012 16:06:42 -0800
Subject: [PATCH 37/76] Bug 810427 - Device storage - Add access fields to
 permission checks. r=dougt

---
 dom/base/nsContentPermissionHelper.cpp        | 13 +++-
 dom/base/nsContentPermissionHelper.h          |  6 +-
 dom/devicestorage/nsDeviceStorage.cpp         | 62 ++++++++++++++-----
 dom/devicestorage/nsDeviceStorage.h           |  9 +++
 .../base/nsIContentPermissionPrompt.idl       |  8 ++-
 dom/ipc/PBrowser.ipdl                         |  4 +-
 dom/ipc/TabChild.cpp                          |  2 +-
 dom/ipc/TabChild.h                            |  7 ++-
 dom/ipc/TabParent.cpp                         |  4 +-
 dom/ipc/TabParent.h                           |  2 +-
 dom/src/geolocation/nsGeolocation.cpp         | 14 ++++-
 .../notification/nsDesktopNotification.cpp    | 12 +++-
 12 files changed, 112 insertions(+), 31 deletions(-)

diff --git a/dom/base/nsContentPermissionHelper.cpp b/dom/base/nsContentPermissionHelper.cpp
index 875d87748d83..fd8737c4442f 100644
--- a/dom/base/nsContentPermissionHelper.cpp
+++ b/dom/base/nsContentPermissionHelper.cpp
@@ -25,11 +25,13 @@ nsContentPermissionRequestProxy::~nsContentPermissionRequestProxy()
 
 nsresult
 nsContentPermissionRequestProxy::Init(const nsACString & type,
+                                      const nsACString & access,
                                       ContentPermissionRequestParent* parent)
 {
   NS_ASSERTION(parent, "null parent");
   mParent = parent;
   mType   = type;
+  mAccess = access;
 
   nsCOMPtr<nsIContentPermissionPrompt> prompt = do_CreateInstance(NS_CONTENT_PERMISSION_PROMPT_CONTRACTID);
   if (!prompt) {
@@ -55,6 +57,13 @@ nsContentPermissionRequestProxy::GetType(nsACString & aType)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsContentPermissionRequestProxy::GetAccess(nsACString & aAccess)
+{
+  aAccess = mAccess;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsContentPermissionRequestProxy::GetWindow(nsIDOMWindow * *aRequestingWindow)
 {
@@ -114,6 +123,7 @@ namespace mozilla {
 namespace dom {
 
 ContentPermissionRequestParent::ContentPermissionRequestParent(const nsACString& aType,
+                                                               const nsACString& aAccess,
                                                                nsIDOMElement *aElement,
                                                                const IPC::Principal& aPrincipal)
 {
@@ -122,6 +132,7 @@ ContentPermissionRequestParent::ContentPermissionRequestParent(const nsACString&
   mPrincipal = aPrincipal;
   mElement   = aElement;
   mType      = aType;
+  mAccess    = aAccess;
 }
 
 ContentPermissionRequestParent::~ContentPermissionRequestParent()
@@ -134,7 +145,7 @@ ContentPermissionRequestParent::Recvprompt()
 {
   mProxy = new nsContentPermissionRequestProxy();
   NS_ASSERTION(mProxy, "Alloc of request proxy failed");
-  if (NS_FAILED(mProxy->Init(mType, this))) {
+  if (NS_FAILED(mProxy->Init(mType, mAccess, this))) {
     mProxy->Cancel();
   }
   return true;
diff --git a/dom/base/nsContentPermissionHelper.h b/dom/base/nsContentPermissionHelper.h
index 7411dbb73474..1260fde12374 100644
--- a/dom/base/nsContentPermissionHelper.h
+++ b/dom/base/nsContentPermissionHelper.h
@@ -22,13 +22,14 @@ namespace dom {
 class ContentPermissionRequestParent : public PContentPermissionRequestParent
 {
  public:
-  ContentPermissionRequestParent(const nsACString& type, nsIDOMElement *element, const IPC::Principal& principal);
+  ContentPermissionRequestParent(const nsACString& type, const nsACString& access, nsIDOMElement *element, const IPC::Principal& principal);
   virtual ~ContentPermissionRequestParent();
 
   nsCOMPtr<nsIPrincipal> mPrincipal;
   nsCOMPtr<nsIDOMElement>    mElement;
   nsCOMPtr<nsContentPermissionRequestProxy> mProxy;
   nsCString mType;
+  nsCString mAccess;
 
  private:
   virtual bool Recvprompt();
@@ -44,7 +45,7 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest
   nsContentPermissionRequestProxy();
   virtual ~nsContentPermissionRequestProxy();
 
-  nsresult Init(const nsACString& type, mozilla::dom::ContentPermissionRequestParent* parent);
+  nsresult Init(const nsACString& type, const nsACString& access, mozilla::dom::ContentPermissionRequestParent* parent);
   void OnParentDestroyed();
 
   NS_DECL_ISUPPORTS
@@ -54,6 +55,7 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest
   // Non-owning pointer to the ContentPermissionRequestParent object which owns this proxy.
   mozilla::dom::ContentPermissionRequestParent* mParent;
   nsCString mType;
+  nsCString mAccess;
 };
 #endif // nsContentPermissionHelper_h
 
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index a189a76481ef..4e699f07b524 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -200,6 +200,25 @@ DeviceStorageTypeChecker::GetPermissionForType(const nsAString& aType, nsACStrin
   return NS_OK;
 }
 
+nsresult
+DeviceStorageTypeChecker::GetAccessForRequest(const DeviceStorageRequestType aRequestType, nsACString& aAccessResult)
+{
+  switch(aRequestType) {
+    case DEVICE_STORAGE_REQUEST_READ:
+    case DEVICE_STORAGE_REQUEST_WATCH:
+    case DEVICE_STORAGE_REQUEST_STAT:
+      aAccessResult.AssignLiteral("read");
+      break;
+    case DEVICE_STORAGE_REQUEST_WRITE:
+    case DEVICE_STORAGE_REQUEST_DELETE:
+      aAccessResult.AssignLiteral("write");
+      break;
+    default:
+      aAccessResult.AssignLiteral("undefined");
+  }
+  return NS_OK;
+}
+
 class IOEventComplete : public nsRunnable
 {
 public:
@@ -1039,6 +1058,13 @@ nsDOMDeviceStorageCursor::GetType(nsACString & aType)
   return DeviceStorageTypeChecker::GetPermissionForType(mFile->mStorageType, aType);
 }
 
+NS_IMETHODIMP
+nsDOMDeviceStorageCursor::GetAccess(nsACString & aAccess)
+{
+  aAccess = NS_LITERAL_CSTRING("read");
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMDeviceStorageCursor::GetPrincipal(nsIPrincipal * *aRequestingPrincipal)
 {
@@ -1392,14 +1418,6 @@ class DeviceStorageRequest MOZ_FINAL
 {
 public:
 
-    enum DeviceStorageRequestType {
-        DEVICE_STORAGE_REQUEST_READ,
-        DEVICE_STORAGE_REQUEST_WRITE,
-        DEVICE_STORAGE_REQUEST_DELETE,
-        DEVICE_STORAGE_REQUEST_WATCH,
-        DEVICE_STORAGE_REQUEST_STAT
-    };
-
     DeviceStorageRequest(const DeviceStorageRequestType aRequestType,
                          nsPIDOMWindow *aWindow,
                          nsIPrincipal *aPrincipal,
@@ -1456,7 +1474,12 @@ public:
       if (NS_FAILED(rv)) {
         return rv;
       }
-      child->SendPContentPermissionRequestConstructor(this, type, IPC::Principal(mPrincipal));
+      nsCString access;
+      rv = DeviceStorageTypeChecker::GetAccessForRequest(DeviceStorageRequestType(mRequestType), access);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      child->SendPContentPermissionRequestConstructor(this, type, access, IPC::Principal(mPrincipal));
 
       Sendprompt();
       return NS_OK;
@@ -1479,6 +1502,15 @@ public:
     return NS_OK;
   }
 
+  NS_IMETHOD GetAccess(nsACString & aAccess)
+  {
+    nsresult rv = DeviceStorageTypeChecker::GetAccessForRequest(DeviceStorageRequestType(mRequestType), aAccess);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
   NS_IMETHOD GetPrincipal(nsIPrincipal * *aRequestingPrincipal)
   {
     NS_IF_ADDREF(*aRequestingPrincipal = mPrincipal);
@@ -1814,7 +1846,7 @@ nsDOMDeviceStorage::AddNamed(nsIDOMBlob *aBlob,
     r = new PostErrorEvent(request, POST_ERROR_EVENT_ILLEGAL_TYPE);
   }
   else {
-    r = new DeviceStorageRequest(DeviceStorageRequest::DEVICE_STORAGE_REQUEST_WRITE,
+    r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WRITE,
                                  win, mPrincipal, dsf, request, aBlob);
   }
 
@@ -1867,7 +1899,7 @@ nsDOMDeviceStorage::GetInternal(const JS::Value & aPath,
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
   } else {
-    r = new DeviceStorageRequest(DeviceStorageRequest::DEVICE_STORAGE_REQUEST_READ,
+    r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_READ,
                                  win, mPrincipal, dsf, request);
   }
   NS_DispatchToMainThread(r);
@@ -1901,7 +1933,7 @@ nsDOMDeviceStorage::Delete(const JS::Value & aPath, JSContext* aCx, nsIDOMDOMReq
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
   }
   else {
-    r = new DeviceStorageRequest(DeviceStorageRequest::DEVICE_STORAGE_REQUEST_DELETE,
+    r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_DELETE,
                                  win, mPrincipal, dsf, request);
   }
   NS_DispatchToMainThread(r);
@@ -1920,7 +1952,7 @@ nsDOMDeviceStorage::Stat(nsIDOMDOMRequest** aRetval)
   NS_ADDREF(*aRetval = request);
 
   nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
-  nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DeviceStorageRequest::DEVICE_STORAGE_REQUEST_STAT,
+  nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_STAT,
                                                      win,
                                                      mPrincipal,
                                                      dsf,
@@ -2042,7 +2074,7 @@ nsDOMDeviceStorage::EnumerateInternal(const JS::Value & aName,
     if (NS_FAILED(rv)) {
       return rv;
     }
-    child->SendPContentPermissionRequestConstructor(r, type, IPC::Principal(mPrincipal));
+    child->SendPContentPermissionRequestConstructor(r, type, NS_LITERAL_CSTRING("read"), IPC::Principal(mPrincipal));
 
     r->Sendprompt();
 
@@ -2229,7 +2261,7 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
 
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
-  nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DeviceStorageRequest::DEVICE_STORAGE_REQUEST_WATCH,
+  nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
                                                      win, mPrincipal, dsf, request, this, aListener);
   NS_DispatchToMainThread(r);
   return nsDOMEventTargetHelper::AddEventListener(aType, aListener, aUseCapture, aWantsUntrusted, aArgc);
diff --git a/dom/devicestorage/nsDeviceStorage.h b/dom/devicestorage/nsDeviceStorage.h
index 279c2977b0db..557430200eab 100644
--- a/dom/devicestorage/nsDeviceStorage.h
+++ b/dom/devicestorage/nsDeviceStorage.h
@@ -43,6 +43,14 @@ using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::dom::devicestorage;
 
+enum DeviceStorageRequestType {
+    DEVICE_STORAGE_REQUEST_READ,
+    DEVICE_STORAGE_REQUEST_WRITE,
+    DEVICE_STORAGE_REQUEST_DELETE,
+    DEVICE_STORAGE_REQUEST_WATCH,
+    DEVICE_STORAGE_REQUEST_STAT
+};
+
 class DeviceStorageTypeChecker MOZ_FINAL
 {
 public:
@@ -57,6 +65,7 @@ public:
   bool Check(const nsAString& aType, nsIFile* aFile);
 
   static nsresult GetPermissionForType(const nsAString& aType, nsACString& aPermissionResult);
+  static nsresult GetAccessForRequest(const DeviceStorageRequestType aRequestType, nsACString& aAccessResult);
 
 private:
   nsString mPicturesExtensions;
diff --git a/dom/interfaces/base/nsIContentPermissionPrompt.idl b/dom/interfaces/base/nsIContentPermissionPrompt.idl
index a22b979538f6..0fdda0ea66e1 100644
--- a/dom/interfaces/base/nsIContentPermissionPrompt.idl
+++ b/dom/interfaces/base/nsIContentPermissionPrompt.idl
@@ -13,7 +13,7 @@ interface nsIDOMElement;
  * permission to perform a privileged operation such as
  * geolocation.
  */
-[scriptable, uuid(E1F3796C-ADFA-414B-B2A7-AC62F29395EE)]
+[scriptable, uuid(1de67000-2de8-11e2-81c1-0800200c9a66)]
 interface nsIContentPermissionRequest : nsISupports {
 
   /**
@@ -22,6 +22,12 @@ interface nsIContentPermissionRequest : nsISupports {
    */
   readonly attribute ACString type;
 
+  /**
+   *  The access of the permission request, such as
+   *  "read".
+   */
+  readonly attribute ACString access;
+
   /**
    *  The principal of the permission request.
    */
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 8a2e5402a922..e1ae01bf0119 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -186,6 +186,8 @@ parent:
      *
      * @param aType
      *   The type of permission to request.
+     * @param aAccess
+     *   Access type. "read" for example.
      * @param aPrincipal
      *   The principal of the request.
      *
@@ -193,7 +195,7 @@ parent:
      *       principals that can live in the content process should
      *       provided.
      */
-    PContentPermissionRequest(nsCString aType, Principal principal);
+    PContentPermissionRequest(nsCString aType, nsCString aAccess, Principal principal);
 
     PContentDialog(uint32_t aType, nsCString aName, nsCString aFeatures,
                    int32_t[] aIntParams, nsString[] aStringParams);
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 5c4b73208010..4b6468471dd6 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -1500,7 +1500,7 @@ TabChild::DeallocPContentDialog(PContentDialogChild* aDialog)
 }
 
 PContentPermissionRequestChild*
-TabChild::AllocPContentPermissionRequest(const nsCString& aType, const IPC::Principal&)
+TabChild::AllocPContentPermissionRequest(const nsCString& aType, const nsCString& aAccess, const IPC::Principal&)
 {
   NS_RUNTIMEABORT("unused");
   return nullptr;
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 0027de61a6b9..589978efb703 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -258,16 +258,19 @@ public:
 #ifdef DEBUG
     virtual PContentPermissionRequestChild* SendPContentPermissionRequestConstructor(PContentPermissionRequestChild* aActor,
                                                                                      const nsCString& aType,
+                                                                                     const nsCString& aAccess,
                                                                                      const IPC::Principal& aPrincipal)
     {
       PCOMContentPermissionRequestChild* child = static_cast<PCOMContentPermissionRequestChild*>(aActor);
-      PContentPermissionRequestChild* request = PBrowserChild::SendPContentPermissionRequestConstructor(aActor, aType, aPrincipal);
+      PContentPermissionRequestChild* request = PBrowserChild::SendPContentPermissionRequestConstructor(aActor, aType, aAccess, aPrincipal);
       child->mIPCOpen = true;
       return request;
     }
 #endif /* DEBUG */
 
-    virtual PContentPermissionRequestChild* AllocPContentPermissionRequest(const nsCString& aType, const IPC::Principal& aPrincipal);
+    virtual PContentPermissionRequestChild* AllocPContentPermissionRequest(const nsCString& aType,
+                                                                           const nsCString& aAccess,
+                                                                           const IPC::Principal& aPrincipal);
     virtual bool DeallocPContentPermissionRequest(PContentPermissionRequestChild* actor);
 
     virtual POfflineCacheUpdateChild* AllocPOfflineCacheUpdate(
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index eafb173c2fc4..475fce2ba91f 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -323,9 +323,9 @@ TabParent::DeallocPDocumentRenderer(PDocumentRendererParent* actor)
 }
 
 PContentPermissionRequestParent*
-TabParent::AllocPContentPermissionRequest(const nsCString& type, const IPC::Principal& principal)
+TabParent::AllocPContentPermissionRequest(const nsCString& type, const nsCString& access, const IPC::Principal& principal)
 {
-  return new ContentPermissionRequestParent(type, mFrameElement, principal);
+  return new ContentPermissionRequestParent(type, access, mFrameElement, principal);
 }
 
 bool
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index a0c3a9d0a2f5..eef891e11f30 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -184,7 +184,7 @@ public:
     virtual bool DeallocPDocumentRenderer(PDocumentRendererParent* actor);
 
     virtual PContentPermissionRequestParent*
-    AllocPContentPermissionRequest(const nsCString& aType, const IPC::Principal& aPrincipal);
+    AllocPContentPermissionRequest(const nsCString& aType, const nsCString& aAccess, const IPC::Principal& aPrincipal);
     virtual bool DeallocPContentPermissionRequest(PContentPermissionRequestParent* actor);
 
     virtual POfflineCacheUpdateParent* AllocPOfflineCacheUpdate(
diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index 9688d184a3c2..014b4e7210ec 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -353,6 +353,13 @@ nsGeolocationRequest::GetType(nsACString & aType)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsGeolocationRequest::GetAccess(nsACString & aAccess)
+{
+  aAccess = "unused";
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGeolocationRequest::GetWindow(nsIDOMWindow * *aRequestingWindow)
 {
@@ -1411,9 +1418,10 @@ nsGeolocation::RegisterRequestWithPrompt(nsGeolocationRequest* request)
     // Retain a reference so the object isn't deleted without IPDL's knowledge.
     // Corresponding release occurs in DeallocPContentPermissionRequest.
     request->AddRef();
-
-    nsCString type = NS_LITERAL_CSTRING("geolocation");
-    child->SendPContentPermissionRequestConstructor(request, type, IPC::Principal(mPrincipal));
+    child->SendPContentPermissionRequestConstructor(request,
+                                                    NS_LITERAL_CSTRING("geolocation"),
+                                                    NS_LITERAL_CSTRING("unused"),
+                                                    IPC::Principal(mPrincipal));
 
     request->Sendprompt();
     return true;
diff --git a/dom/src/notification/nsDesktopNotification.cpp b/dom/src/notification/nsDesktopNotification.cpp
index d590703df7fc..1542c855a20c 100644
--- a/dom/src/notification/nsDesktopNotification.cpp
+++ b/dom/src/notification/nsDesktopNotification.cpp
@@ -106,8 +106,10 @@ nsDOMDesktopNotification::nsDOMDesktopNotification(const nsAString & title,
     // Corresponding release occurs in DeallocPContentPermissionRequest.
     nsRefPtr<nsDesktopNotificationRequest> copy = request;
 
-    nsCString type = NS_LITERAL_CSTRING("desktop-notification");
-    child->SendPContentPermissionRequestConstructor(copy.forget().get(), type, IPC::Principal(mPrincipal));
+    child->SendPContentPermissionRequestConstructor(request,
+                                                    NS_LITERAL_CSTRING("desktop-notification"),
+                                                    NS_LITERAL_CSTRING("unused"),
+                                                    IPC::Principal(mPrincipal));
 
     request->Sendprompt();
     return;
@@ -271,3 +273,9 @@ nsDesktopNotificationRequest::GetType(nsACString & aType)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDesktopNotificationRequest::GetAccess(nsACString & aAccess)
+{
+  aAccess = "unused";
+  return NS_OK;
+}

From 9a5e695ca3598e34a5efec1cd8f5a9a355e790f6 Mon Sep 17 00:00:00 2001
From: Jeff Hammel <jhammel@mozilla.com>
Date: Tue, 13 Nov 2012 16:10:25 -0800
Subject: [PATCH 38/76] Bug 805633 - update mozhttpd on m-c;r=wlach ; DONTBUILD
 because NPOTB

---
 testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py | 4 ++++
 testing/mozbase/mozhttpd/setup.py             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py b/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
index 275cb2b4d3be..b7ea21b0c083 100755
--- a/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
+++ b/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
@@ -68,6 +68,10 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     log_requests = False
     request = None
 
+    def __init__(self, *args, **kwargs):
+        SimpleHTTPServer.SimpleHTTPRequestHandler.__init__(self, *args, **kwargs)
+        self.extensions_map['.svg'] = 'image/svg+xml'
+
     def _try_handler(self, method):
         if self.log_requests:
             self.request_log.append({ 'method': method,
diff --git a/testing/mozbase/mozhttpd/setup.py b/testing/mozbase/mozhttpd/setup.py
index ecdec74a1244..7f027d0c616c 100644
--- a/testing/mozbase/mozhttpd/setup.py
+++ b/testing/mozbase/mozhttpd/setup.py
@@ -11,7 +11,7 @@ try:
 except IOError:
     description = None
 
-PACKAGE_VERSION = '0.4'
+PACKAGE_VERSION = '0.5'
 
 deps = []
 

From 0014c4cd4a55efd8ec6d72dc73cd561fb61eeb44 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 13 Nov 2012 19:14:07 -0500
Subject: [PATCH 39/76] Bug 746674 - Download icon progressbar hard to see for
 people with mono/dichromacy. r=mak.

---
 browser/themes/gnomestripe/downloads/downloads.css | 5 +++--
 browser/themes/pinstripe/downloads/downloads.css   | 5 +++--
 browser/themes/winstripe/downloads/downloads.css   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/browser/themes/gnomestripe/downloads/downloads.css b/browser/themes/gnomestripe/downloads/downloads.css
index 4bdfe0085380..2c2b1c37a75c 100644
--- a/browser/themes/gnomestripe/downloads/downloads.css
+++ b/browser/themes/gnomestripe/downloads/downloads.css
@@ -262,7 +262,8 @@ toolbar[iconsize="large"] #downloads-indicator-icon {
   -moz-appearance: none;
   min-width: 0;
   min-height: 0;
-  background-image: -moz-linear-gradient(#5ab9ff, #37a4ff);
+  background-color: rgb(90, 185, 255);
+  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px);
   border: 1px solid;
   border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
   border-radius: 2px 0 0 2px;
@@ -280,7 +281,7 @@ toolbar[iconsize="large"] #downloads-indicator-icon {
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
-  background-image: -moz-linear-gradient(#dce651, #dae631);
+  background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
diff --git a/browser/themes/pinstripe/downloads/downloads.css b/browser/themes/pinstripe/downloads/downloads.css
index 10a3035d94a1..78999323213e 100644
--- a/browser/themes/pinstripe/downloads/downloads.css
+++ b/browser/themes/pinstripe/downloads/downloads.css
@@ -260,7 +260,8 @@ richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:ac
   -moz-appearance: none;
   min-width: 0;
   min-height: 0;
-  background-image: -moz-linear-gradient(#5ab9ff, #37a4ff);
+  background-color: rgb(90, 185, 255);
+  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px);
   border: 1px solid;
   border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
   border-radius: 2px 0 0 2px;
@@ -278,7 +279,7 @@ richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:ac
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
-  background-image: -moz-linear-gradient(#dce651, #dae631);
+  background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
diff --git a/browser/themes/winstripe/downloads/downloads.css b/browser/themes/winstripe/downloads/downloads.css
index 0e17f10e2777..bca5790e0941 100644
--- a/browser/themes/winstripe/downloads/downloads.css
+++ b/browser/themes/winstripe/downloads/downloads.css
@@ -259,7 +259,8 @@ richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:ac
   -moz-appearance: none;
   min-width: 0;
   min-height: 0;
-  background-image: -moz-linear-gradient(#5ab9ff, #37a4ff);
+  background-color: rgb(90, 185, 255);
+  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px);
   border: 1px solid;
   border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
   border-radius: 2px 0 0 2px;
@@ -277,7 +278,7 @@ richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:ac
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
-  background-image: -moz-linear-gradient(#dce651, #dae631);
+  background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {

From c841ebfda098730bc73005f4822b848292467dd2 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 13 Nov 2012 16:47:59 -0800
Subject: [PATCH 40/76]  Bug 786331 - WebGL tests that use a video can loop
 indefinitely. r=bjacob

---
 .../textures/tex-image-and-sub-image-2d-with-video.html          | 1 +
 .../test/webgl/conformance/textures/texture-npot-video.html      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/content/canvas/test/webgl/conformance/textures/tex-image-and-sub-image-2d-with-video.html b/content/canvas/test/webgl/conformance/textures/tex-image-and-sub-image-2d-with-video.html
index 483758a9a062..1985633dc83c 100644
--- a/content/canvas/test/webgl/conformance/textures/tex-image-and-sub-image-2d-with-video.html
+++ b/content/canvas/test/webgl/conformance/textures/tex-image-and-sub-image-2d-with-video.html
@@ -107,6 +107,7 @@ function runTest(videoElement)
     runOneIteration(videoElement, true, false, green, red);
 
     glErrorShouldBe(gl, gl.NO_ERROR, "should be no errors");
+    videoElement.removeEventListener("playing", runTest);
     finishTest();
 }
 </script>
diff --git a/content/canvas/test/webgl/conformance/textures/texture-npot-video.html b/content/canvas/test/webgl/conformance/textures/texture-npot-video.html
index 2e86c1925239..f50777598c5e 100644
--- a/content/canvas/test/webgl/conformance/textures/texture-npot-video.html
+++ b/content/canvas/test/webgl/conformance/textures/texture-npot-video.html
@@ -139,6 +139,7 @@ function runTest(videoElement)
     runOneIteration(videoElement, true, false, red, green, false, false, false);
 
     glErrorShouldBe(gl, gl.NO_ERROR, "should be no errors");
+    videoElement.removeEventListener("playing", runTest);
     finishTest();
 }
 </script>

From 4c1429e727a81c70f0960f26a45dcee73d278b2a Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Tue, 13 Nov 2012 16:54:42 -0800
Subject: [PATCH 41/76] Bug 811545 - Turn off reader mode logging. r=bnicholson

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

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 53d6db254978..ebf88bf03be5 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -7117,7 +7117,7 @@ let Reader = {
   // Version of the cache database schema
   DB_VERSION: 1,
 
-  DEBUG: 1,
+  DEBUG: 0,
 
   // Don't try to parse the page if it has too many elements (for memory and
   // performance reasons)

From d93d233b865184dcfcee9adffc5d0a6d56a095d3 Mon Sep 17 00:00:00 2001
From: Rob Wood <rwood@mozilla.com>
Date: Tue, 13 Nov 2012 07:47:56 -0800
Subject: [PATCH 42/76] Bug 808865 - Develop WebSMS test for
 getNumberOfMessagesForText, update manifest; r=jgriffin

---
 dom/sms/tests/marionette/manifest.ini         |  1 +
 .../marionette/test_number_of_messages.js     | 76 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 dom/sms/tests/marionette/test_number_of_messages.js

diff --git a/dom/sms/tests/marionette/manifest.ini b/dom/sms/tests/marionette/manifest.ini
index 8a0cc1af7f5b..bca7ab7d7b94 100644
--- a/dom/sms/tests/marionette/manifest.ini
+++ b/dom/sms/tests/marionette/manifest.ini
@@ -11,3 +11,4 @@ qemu = true
 [test_outgoing_delete.js]
 [test_getmessage.js]
 [test_getmessage_notfound.js]
+[test_number_of_messages.js]
diff --git a/dom/sms/tests/marionette/test_number_of_messages.js b/dom/sms/tests/marionette/test_number_of_messages.js
new file mode 100644
index 000000000000..9055dd498f36
--- /dev/null
+++ b/dom/sms/tests/marionette/test_number_of_messages.js
@@ -0,0 +1,76 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 10000;
+
+SpecialPowers.addPermission("sms", true, document);
+SpecialPowers.setBoolPref("dom.sms.enabled", true);
+
+let sms = window.navigator.mozSms;
+
+// Specified here: https://developer.mozilla.org/en-US/docs/DOM/SmsManager
+let maxCharsPerSms = 160;
+
+function verifyInitialState() {
+  log("Verifying initial state.");
+  ok(sms, "mozSms");
+  // Ensure test is starting clean with no existing SMS messages
+  startTest();
+}
+
+function startTest() {
+  // Build test data strings
+  let testData = ["", "a",
+                  buildString("b", maxCharsPerSms / 2),
+                  buildString("c", maxCharsPerSms - 1),
+                  buildString("d", maxCharsPerSms),
+                  buildString("e", maxCharsPerSms + 1),
+                  buildString("f", maxCharsPerSms * 1.5),
+                  buildString("g", maxCharsPerSms * 10.5)];
+
+  // Test with each data string
+  testData.forEach(function(text){ testGetNumberOfMsgs(text); });
+
+  // We're done
+  cleanUp();
+}
+
+function buildString(char, numChars) {
+  // Build string that contains the specified character repeated x times
+  let string = new Array(numChars + 1).join(char);
+  return string;
+}
+
+function testGetNumberOfMsgs(text) {
+  // Test that getNumberOfMessagesForText returns expected value for given txt
+  log("getNumberOfMessagesForText length " + text.length + ".");
+
+  if (text.length) {
+    if (text.length > maxCharsPerSms) {
+      expNumSms = Math.ceil(text.length / maxCharsPerSms);
+    } else {
+      expNumSms = 1;
+    }
+  } else {
+    expNumSms = 0;
+  }
+
+  numMultiPartSms = sms.getNumberOfMessagesForText(text);
+
+  if (numMultiPartSms == expNumSms) {
+    log("Returned " + expNumSms + " as expected.");
+    ok(true, "getNumberOfMessagesForText returned expected value");
+  } else {
+    log("Returned " + numMultiPartSms + " but expected " + expNumSms + ".");
+    ok(false, "getNumberOfMessagesForText returned unexpected value");
+  }
+}
+
+function cleanUp() {
+  SpecialPowers.removePermission("sms", document);
+  SpecialPowers.clearUserPref("dom.sms.enabled");
+  finish();
+}
+
+// Start the test
+verifyInitialState();

From 0cb04eb1bb8f23048510ec2f5093f3be3af27d9b Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 13 Nov 2012 17:13:44 -0800
Subject: [PATCH 43/76] Bug 811176 - Purge small exec pools on GC (r=njn)

---
 js/src/assembler/jit/ExecutableAllocator.h | 7 +++++++
 js/src/jscntxt.h                           | 3 +++
 js/src/jsgc.cpp                            | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h
index 0b520816f8c0..2fe679b9a311 100644
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -212,6 +212,13 @@ public:
         //JS_ASSERT(m_pools.empty());     // if this asserts we have a pool leak
     }
 
+    void purge() {
+        for (size_t i = 0; i < m_smallPools.length(); i++)
+            m_smallPools[i]->release();
+
+	m_smallPools.clear();
+    }
+
     // alloc() returns a pointer to some memory, and also (by reference) a
     // pointer to reference-counted pool. The caller owns a reference to the
     // pool; i.e. alloc() increments the count before returning the object.
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 2e05f355a84d..cb8705a8d1f0 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -514,6 +514,9 @@ struct JSRuntime : js::RuntimeFriendFields
         JS_ASSERT(execAlloc_);
         return *execAlloc_;
     }
+    JSC::ExecutableAllocator *maybeExecAlloc() {
+        return execAlloc_;
+    }
     WTF::BumpPointerAllocator *getBumpPointerAllocator(JSContext *cx) {
         return bumpAlloc_ ? bumpAlloc_ : createBumpPointerAllocator(cx);
     }
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 5cf395b2c9a3..039d8854b46a 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -4010,6 +4010,10 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
         if (rt->gcIsFull)
             SweepScriptFilenames(rt);
 
+        /* Clear out any small pools that we're hanging on to. */
+        if (JSC::ExecutableAllocator *execAlloc = rt->maybeExecAlloc())
+            execAlloc->purge();
+
         /*
          * This removes compartments from rt->compartment, so we do it last to make
          * sure we don't miss sweeping any compartments.

From c06b9e5dc9947aa9fba8e89c5caab7b45a34b877 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 13 Nov 2012 17:14:53 -0800
Subject: [PATCH 44/76] Bug 811176 - Shrinking GCs should clean up everything
 (r=terrence)

---
 js/src/jsgc.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 039d8854b46a..868fb7ed6479 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -4578,7 +4578,7 @@ IsDeterministicGCReason(gcreason::Reason reason)
 #endif
 
 static bool
-ShouldCleanUpEverything(JSRuntime *rt, gcreason::Reason reason)
+ShouldCleanUpEverything(JSRuntime *rt, gcreason::Reason reason, JSGCInvocationKind gckind)
 {
     // During shutdown, we must clean everything up, for the sake of leak
     // detection. When a runtime has no contexts, or we're doing a GC before a
@@ -4589,7 +4589,8 @@ ShouldCleanUpEverything(JSRuntime *rt, gcreason::Reason reason)
     // we need to clear everything away.
     return !rt->hasContexts() ||
            reason == gcreason::SHUTDOWN_CC ||
-           reason == gcreason::DEBUG_MODE_GC;
+           reason == gcreason::DEBUG_MODE_GC ||
+           gckind == GC_SHRINK;
 }
 
 static void
@@ -4657,7 +4658,7 @@ Collect(JSRuntime *rt, bool incremental, int64_t budget,
             collectedCount++;
     }
 
-    rt->gcShouldCleanUpEverything = ShouldCleanUpEverything(rt, reason);
+    rt->gcShouldCleanUpEverything = ShouldCleanUpEverything(rt, reason, gckind);
 
     gcstats::AutoGCSlice agc(rt->gcStats, collectedCount, compartmentCount, reason);
 

From 75e0cf4d31329fe98e105df4ea4ee0c40eb47999 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 13 Nov 2012 17:14:57 -0800
Subject: [PATCH 45/76] Bug 811553 - Only count major page faults when possible
 (r=terrence)

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

diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index 92f1e7758b58..0868bd9962c5 100644
--- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp
@@ -390,7 +390,7 @@ GetPageFaultCount()
     int err = getrusage(RUSAGE_SELF, &usage);
     if (err)
         return 0;
-    return usage.ru_minflt + usage.ru_majflt;
+    return usage.ru_majflt;
 }
 
 #else

From 9cb0f91d55fa038e7fed1770d48d9ba27d3a745c Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 13 Nov 2012 20:19:18 -0500
Subject: [PATCH 46/76] Backed out changesets 0b6b3d2856a4 and 30776e402787
 (bug 115199) for reftest failures.

---
 dom/base/nsDOMClassInfo.cpp                |   8 -
 dom/base/nsDOMClassInfoClasses.h           |   2 -
 dom/interfaces/css/nsIDOMCSSPageRule.idl   |   4 +-
 layout/generic/nsPageContentFrame.cpp      |  28 ++-
 layout/generic/nsPageContentFrame.h        |   9 +
 layout/generic/nsPageFrame.cpp             |  57 ++----
 layout/generic/nsSimplePageSequence.cpp    |  22 ++-
 layout/generic/nsSimplePageSequence.h      |   3 +
 layout/reftests/printing/115199-1-ref.html |  20 --
 layout/reftests/printing/115199-1.html     |  25 ---
 layout/reftests/printing/115199-2-ref.html |  18 --
 layout/reftests/printing/115199-2a.html    |  24 ---
 layout/reftests/printing/115199-2b.html    |  24 ---
 layout/reftests/printing/reftest.list      |   3 -
 layout/style/nsCSSParser.cpp               |  52 ++----
 layout/style/nsCSSPropList.h               |  45 ++---
 layout/style/nsCSSProps.h                  |   3 -
 layout/style/nsCSSRuleProcessor.cpp        |  32 +---
 layout/style/nsCSSRuleProcessor.h          |   3 -
 layout/style/nsCSSRules.cpp                | 207 ---------------------
 layout/style/nsCSSRules.h                  |  81 +-------
 layout/style/nsStyleSet.cpp                |  33 ----
 layout/style/nsStyleSet.h                  |   6 -
 layout/style/test/Makefile.in              |   1 -
 layout/style/test/test_page_parser.html    | 109 -----------
 layout/style/ua.css                        |   1 -
 26 files changed, 102 insertions(+), 718 deletions(-)
 delete mode 100644 layout/reftests/printing/115199-1-ref.html
 delete mode 100644 layout/reftests/printing/115199-1.html
 delete mode 100644 layout/reftests/printing/115199-2-ref.html
 delete mode 100644 layout/reftests/printing/115199-2a.html
 delete mode 100644 layout/reftests/printing/115199-2b.html
 delete mode 100644 layout/style/test/test_page_parser.html

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 19e9ed65709c..06ef343ec68c 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -285,7 +285,6 @@
 #include "nsIDOMCSSSupportsRule.h"
 #include "nsIDOMMozCSSKeyframeRule.h"
 #include "nsIDOMMozCSSKeyframesRule.h"
-#include "nsIDOMCSSPageRule.h"
 #include "nsIDOMCSSPrimitiveValue.h"
 #include "nsIDOMCSSStyleRule.h"
 #include "nsIDOMCSSStyleSheet.h"
@@ -1617,9 +1616,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
-  NS_DEFINE_CLASSINFO_DATA(CSSPageRule, nsDOMGenericSH,
-                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
-
   NS_DEFINE_CLASSINFO_DATA(MediaQueryList, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(MutationObserver, nsDOMMutationObserverSH,
@@ -4329,10 +4325,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframesRule)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(CSSPageRule, nsIDOMCSSPageRule)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSPageRule)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(MediaQueryList, nsIDOMMediaQueryList)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaQueryList)
   DOM_CLASSINFO_MAP_END
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index c778387607c2..992fb4d025a4 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -478,8 +478,6 @@ DOMCI_CLASS(TouchEvent)
 DOMCI_CLASS(MozCSSKeyframeRule)
 DOMCI_CLASS(MozCSSKeyframesRule)
 
-DOMCI_CLASS(CSSPageRule)
-
 DOMCI_CLASS(MediaQueryList)
 
 DOMCI_CLASS(MutationObserver)
diff --git a/dom/interfaces/css/nsIDOMCSSPageRule.idl b/dom/interfaces/css/nsIDOMCSSPageRule.idl
index f940415f3785..7d010070ec38 100644
--- a/dom/interfaces/css/nsIDOMCSSPageRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSPageRule.idl
@@ -5,10 +5,10 @@
 
 #include "nsIDOMCSSRule.idl"
 
-[scriptable, uuid(6126024d-d716-4ad8-bc53-24dd6d5846b1)]
+[scriptable, uuid(a6cf90bd-15b3-11d2-932e-00805f8add32)]
 interface nsIDOMCSSPageRule : nsIDOMCSSRule
 {
-           //attribute DOMString        selectorText;
+           attribute DOMString        selectorText;
                                         // raises(DOMException) on setting
 
   readonly attribute nsIDOMCSSStyleDeclaration  style;
diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index ff55ae5d1785..f2a6511b6509 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -24,6 +24,19 @@ NS_NewPageContentFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 
 NS_IMPL_FRAMEARENA_HELPERS(nsPageContentFrame)
 
+/* virtual */ nsSize
+nsPageContentFrame::ComputeSize(nsRenderingContext *aRenderingContext,
+                                nsSize aCBSize, nscoord aAvailableWidth,
+                                nsSize aMargin, nsSize aBorder, nsSize aPadding,
+                                uint32_t aFlags)
+{
+  NS_ASSERTION(mPD, "Pages are supposed to have page data");
+  nscoord height = (!mPD || mPD->mReflowSize.height == NS_UNCONSTRAINEDSIZE)
+                   ? NS_UNCONSTRAINEDSIZE
+                   : (mPD->mReflowSize.height - mPD->mReflowMargin.TopBottom());
+  return nsSize(aAvailableWidth, height);
+}
+
 NS_IMETHODIMP
 nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
                            nsHTMLReflowMetrics&     aDesiredSize,
@@ -44,19 +57,18 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
   // Set our size up front, since some parts of reflow depend on it
   // being already set.  Note that the computed height may be
   // unconstrained; that's ok.  Consumers should watch out for that.
-  nsSize  maxSize(aReflowState.ComputedWidth(),
-                  aReflowState.ComputedHeight());
-  SetSize(maxSize);
+  SetSize(nsSize(aReflowState.availableWidth, aReflowState.availableHeight));
  
   // A PageContentFrame must always have one child: the canvas frame.
   // Resize our frame allowing it only to be as big as we are
   // XXX Pay attention to the page's border and padding...
   if (mFrames.NotEmpty()) {
     nsIFrame* frame = mFrames.FirstChild();
+    nsSize  maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
     nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize);
-    kidReflowState.SetComputedHeight(maxSize.height);
+    kidReflowState.SetComputedHeight(aReflowState.availableHeight);
 
-    mPD->mPageContentSize = maxSize.width;
+    mPD->mPageContentSize  = aReflowState.availableWidth;
 
     // Reflow the page content area
     rv = ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, 0, 0, 0, aStatus);
@@ -100,9 +112,9 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
   NS_ASSERTION(NS_FRAME_IS_COMPLETE(fixedStatus), "fixed frames can be truncated, but not incomplete");
 
   // Return our desired size
-  aDesiredSize.width = aReflowState.ComputedWidth();
-  if (aReflowState.ComputedHeight() != NS_UNCONSTRAINEDSIZE) {
-    aDesiredSize.height = aReflowState.ComputedHeight();
+  aDesiredSize.width = aReflowState.availableWidth;
+  if (aReflowState.availableHeight != NS_UNCONSTRAINEDSIZE) {
+    aDesiredSize.height = aReflowState.availableHeight;
   }
 
   FinishAndStoreOverflow(&aDesiredSize);
diff --git a/layout/generic/nsPageContentFrame.h b/layout/generic/nsPageContentFrame.h
index 462491fa8bd7..88834a9d25d2 100644
--- a/layout/generic/nsPageContentFrame.h
+++ b/layout/generic/nsPageContentFrame.h
@@ -33,6 +33,15 @@ public:
 
   virtual void SetSharedPageData(nsSharedPageData* aPD) { mPD = aPD; }
 
+  /**
+   *  Computes page size based on shared page data; SetSharedPageData must be
+   *  given valid data first.
+   */
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
+                             nsSize aCBSize, nscoord aAvailableWidth,
+                             nsSize aMargin, nsSize aBorder, nsSize aPadding,
+                             uint32_t aFlags) MOZ_OVERRIDE;
+
   virtual bool HasTransformGetter() const MOZ_OVERRIDE { return true; }
 
   /**
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 5a5ed5a28c96..8c1c6bc3a085 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -72,9 +72,10 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*           aPresContext,
     if (mPD->mReflowSize.height == NS_UNCONSTRAINEDSIZE) {
       avHeight = NS_UNCONSTRAINEDSIZE;
     } else {
-      avHeight = mPD->mReflowSize.height;
+      avHeight = mPD->mReflowSize.height - mPD->mReflowMargin.TopBottom();
     }
-    nsSize  maxSize(mPD->mReflowSize.width, avHeight);
+    nsSize  maxSize(mPD->mReflowSize.width - mPD->mReflowMargin.LeftRight(),
+                    avHeight);
     float scale = aPresContext->GetPageScale();
     maxSize.width = NSToCoordCeil(maxSize.width / scale);
     if (maxSize.height != NS_UNCONSTRAINEDSIZE) {
@@ -96,46 +97,9 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*           aPresContext,
     kidReflowState.mFlags.mIsTopOfPage = true;
     kidReflowState.mFlags.mTableIsSplittable = true;
 
-    // Use the margins given in the @page rule.
-    // If a margin is 'auto', use the margin from the print settings for that side.
-    nsMargin pageContentMargin;
-    const nsStyleSides& marginStyle = kidReflowState.mStyleMargin->mMargin;
-    NS_FOR_CSS_SIDES(side) {
-      if (marginStyle.GetUnit(side) == eStyleUnit_Auto) {
-        pageContentMargin.Side(side) = mPD->mReflowMargin.Side(side);
-      } else {
-        pageContentMargin.Side(side) = kidReflowState.mComputedMargin.Side(side);
-      }
-    }
-
-
-    nscoord maxWidth = maxSize.width - pageContentMargin.LeftRight() / scale;
-    nscoord maxHeight;
-    if (maxSize.height == NS_UNCONSTRAINEDSIZE) {
-      maxHeight = NS_UNCONSTRAINEDSIZE;
-    } else {
-      maxHeight = maxSize.height - pageContentMargin.TopBottom() / scale;
-    }
-
-    // Check the width and height, if they're too small we reset the margins
-    // back to the default.
-    if (maxWidth < onePixelInTwips ||
-       (maxHeight != NS_UNCONSTRAINEDSIZE && maxHeight < onePixelInTwips)) {
-      NS_FOR_CSS_SIDES(side) {
-        pageContentMargin.Side(side) = mPD->mReflowMargin.Side(side);
-      }
-      maxWidth = maxSize.width - pageContentMargin.LeftRight() / scale;
-      if (maxHeight != NS_UNCONSTRAINEDSIZE) {
-        maxHeight = maxSize.height - pageContentMargin.TopBottom() / scale;
-      }
-    }
-
-    kidReflowState.SetComputedWidth(maxWidth);
-    kidReflowState.SetComputedHeight(maxHeight);
-
     // calc location of frame
-    nscoord xc = pageContentMargin.left;
-    nscoord yc = pageContentMargin.top;
+    nscoord xc = mPD->mReflowMargin.left + mPD->mExtraMargin.left;
+    nscoord yc = mPD->mReflowMargin.top + mPD->mExtraMargin.top;
 
     // Get the child's desired size
     ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, xc, yc, 0, aStatus);
@@ -256,7 +220,7 @@ nscoord nsPageFrame::GetXPosition(nsRenderingContext& aRenderingContext,
   nscoord x = aRect.x;
   switch (aJust) {
     case nsIPrintSettings::kJustLeft:
-      x += mPD->mEdgePaperMargin.left;
+      x += mPD->mExtraMargin.left + mPD->mEdgePaperMargin.left;
       break;
 
     case nsIPrintSettings::kJustCenter:
@@ -264,7 +228,7 @@ nscoord nsPageFrame::GetXPosition(nsRenderingContext& aRenderingContext,
       break;
 
     case nsIPrintSettings::kJustRight:
-      x += aRect.width - width - mPD->mEdgePaperMargin.right;
+      x += aRect.width - width - mPD->mExtraMargin.right - mPD->mEdgePaperMargin.right;
       break;
   } // switch
 
@@ -381,9 +345,9 @@ nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
     nscoord x = GetXPosition(aRenderingContext, aRect, aJust, str);
     nscoord y;
     if (aHeaderFooter == eHeader) {
-      y = aRect.y + mPD->mEdgePaperMargin.top;
+      y = aRect.y + mPD->mExtraMargin.top + mPD->mEdgePaperMargin.top;
     } else {
-      y = aRect.YMost() - aHeight - mPD->mEdgePaperMargin.bottom;
+      y = aRect.YMost() - aHeight - mPD->mExtraMargin.bottom - mPD->mEdgePaperMargin.bottom;
     }
 
     // set up new clip and draw the text
@@ -547,7 +511,8 @@ nsPageFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   nsRect clipRect(nsPoint(0, 0), child->GetSize());
   // Note: this computation matches how we compute maxSize.height
   // in nsPageFrame::Reflow
-  nscoord expectedPageContentHeight = NSToCoordCeil(GetSize().height / scale);
+  nscoord expectedPageContentHeight = 
+    NSToCoordCeil((GetSize().height - mPD->mReflowMargin.TopBottom()) / scale);
   if (clipRect.height > expectedPageContentHeight) {
     // We're doing print-selection, with one long page-content frame.
     // Clip to the appropriate page-content slice for the current page.
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 09baa2437af6..e5dd41d1c66b 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -65,6 +65,7 @@ nsSharedPageData::nsSharedPageData() :
   mDocURL(nullptr),
   mReflowSize(0,0),
   mReflowMargin(0,0,0,0),
+  mExtraMargin(0,0,0,0),
   mEdgePaperMargin(0,0,0,0),
   mPageContentXMost(0),
   mPageContentSize(0)
@@ -219,12 +220,31 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
   }
   mPageData->mReflowMargin = mMargin;
 
+  // Compute the size of each page and the x coordinate that each page will
+  // be placed at
+  nscoord extraThreshold = NS_MAX(pageSize.width, pageSize.height)/10;
+  int32_t gapInTwips = Preferences::GetInt("print.print_extra_margin");
+  gapInTwips = NS_MAX(0, gapInTwips);
+
+  nscoord extraGap = aPresContext->CSSTwipsToAppUnits(gapInTwips);
+  extraGap = NS_MIN(extraGap, extraThreshold); // clamp to 1/10 of the largest dim of the page
+
+  nsMargin extraMargin(0,0,0,0);
+  if (aPresContext->IsScreen()) {
+    extraMargin.SizeTo(extraGap, extraGap, extraGap, extraGap);
+  }
+
+  mPageData->mExtraMargin = extraMargin;
+
   // We use the CSS "margin" property on the -moz-page pseudoelement
   // to determine the space between each page in print preview.
   // Keep a running y-offset for each page.
   nscoord y = 0;
   nscoord maxXMost = 0;
 
+  nsSize availSize(pageSize.width + extraMargin.LeftRight(),
+                   pageSize.height + extraMargin.TopBottom());
+
   // Tile the pages vertically
   nsHTMLReflowMetrics kidSize;
   for (nsIFrame* kidFrame = mFrames.FirstChild(); nullptr != kidFrame; ) {
@@ -234,7 +254,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
 
     // Reflow the page
     nsHTMLReflowState kidReflowState(aPresContext, aReflowState, kidFrame,
-                                     pageSize);
+                                     availSize);
     nsReflowStatus  status;
 
     kidReflowState.SetComputedWidth(kidReflowState.availableWidth);
diff --git a/layout/generic/nsSimplePageSequence.h b/layout/generic/nsSimplePageSequence.h
index 5955af075285..4d2e1f8c7193 100644
--- a/layout/generic/nsSimplePageSequence.h
+++ b/layout/generic/nsSimplePageSequence.h
@@ -31,6 +31,9 @@ public:
 
   nsSize      mReflowSize;
   nsMargin    mReflowMargin;
+  // Extra Margin between the device area and the edge of the page;
+  // approximates unprintable area
+  nsMargin    mExtraMargin;
   // Margin for headers and footers; it defaults to 4/100 of an inch on UNIX 
   // and 0 elsewhere; I think it has to do with some inconsistency in page size
   // computations
diff --git a/layout/reftests/printing/115199-1-ref.html b/layout/reftests/printing/115199-1-ref.html
deleted file mode 100644
index 7899e1c092fe..000000000000
--- a/layout/reftests/printing/115199-1-ref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-print">
-<head>
-  <style>
-    * {
-      margin: 0;
-      padding: 0;
-    }
-    body {
-      margin: 0.1in 0.1in;
-    }
-    div {
-      border: 0.25in solid green;
-    }
-  </style>
-</head>
-<body>
-  <div></div>
-</body>
-</html>
diff --git a/layout/reftests/printing/115199-1.html b/layout/reftests/printing/115199-1.html
deleted file mode 100644
index 1aaef1e7b027..000000000000
--- a/layout/reftests/printing/115199-1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-print">
-<head>
-  <style>
-    @page {
-      /*
-       * Default page margins are .5in and the reference file adds .1inch margin
-       * to the body hence we do .6in to match this.
-       */
-      margin: 0.6in;
-    }
-    * {
-      margin: 0;
-      padding: 0;
-    }
-    div {
-      width: 100%;
-      border: 0.25in solid green;
-    }
-  </style>
-</head>
-<body>
-  <div></div>
-</body>
-</html>
diff --git a/layout/reftests/printing/115199-2-ref.html b/layout/reftests/printing/115199-2-ref.html
deleted file mode 100644
index b6c15e62d293..000000000000
--- a/layout/reftests/printing/115199-2-ref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-print">
-<head>
-  <style>
-    * {
-      margin: 0;
-      padding: 0;
-    }
-    div {
-      width: 100%;
-      border: 0.25in solid green;
-    }
-  </style>
-</head>
-<body>
-  <div></div>
-</body>
-</html>
diff --git a/layout/reftests/printing/115199-2a.html b/layout/reftests/printing/115199-2a.html
deleted file mode 100644
index 1e70f47e3541..000000000000
--- a/layout/reftests/printing/115199-2a.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-print">
-<head>
-  <style>
-    @page {
-      /*
-       * Test a margin that causes the page to have zero width.
-       */
-      margin: 0 2.5in;
-    }
-    * {
-      margin: 0;
-      padding: 0;
-    }
-    div {
-      width: 100%;
-      border: 0.25in solid green;
-    }
-  </style>
-</head>
-<body>
-  <div></div>
-</body>
-</html>
diff --git a/layout/reftests/printing/115199-2b.html b/layout/reftests/printing/115199-2b.html
deleted file mode 100644
index 620542fe2c7d..000000000000
--- a/layout/reftests/printing/115199-2b.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-print">
-<head>
-  <style>
-    @page {
-      /*
-       * Test huge margins, they should be reset back the default margin size.
-       */
-      margin: 10in;
-    }
-    * {
-      margin: 0;
-      padding: 0;
-    }
-    div {
-      width: 100%;
-      border: 0.25in solid green;
-    }
-  </style>
-</head>
-<body>
-  <div></div>
-</body>
-</html>
diff --git a/layout/reftests/printing/reftest.list b/layout/reftests/printing/reftest.list
index 13e9543c94d1..55d6378d132e 100644
--- a/layout/reftests/printing/reftest.list
+++ b/layout/reftests/printing/reftest.list
@@ -20,8 +20,5 @@
 == 626395-2c.html 626395-2-ref.html
 == 626395-2d.html 626395-2-ref.html
 == 652178-1.html 652178-1-ref.html
-== 115199-1.html 115199-1-ref.html
-== 115199-2a.html 115199-2-ref.html
-== 115199-2b.html 115199-2-ref.html
 == 652178-1.html 652178-1-ref2.html
 == 745025-1.html 745025-1-ref.html
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index bf0d61b5ea1b..06aab520ba16 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -400,18 +400,12 @@ protected:
     eParseDeclaration_InBraces       = 1 << 0,
     eParseDeclaration_AllowImportant = 1 << 1
   };
-  enum nsCSSContextType {
-    eCSSContext_General,
-    eCSSContext_Page
-  };
 
-  css::Declaration* ParseDeclarationBlock(uint32_t aFlags,
-                                          nsCSSContextType aContext = eCSSContext_General);
+  css::Declaration* ParseDeclarationBlock(uint32_t aFlags);
   bool ParseDeclaration(css::Declaration* aDeclaration,
                         uint32_t aFlags,
                         bool aMustCallValueAppended,
-                        bool* aChanged,
-                        nsCSSContextType aContext = eCSSContext_General);
+                        bool* aChanged);
 
   bool ParseProperty(nsCSSProperty aPropID);
   bool ParsePropertyByFunction(nsCSSProperty aPropID);
@@ -2266,6 +2260,13 @@ CSSParserImpl::ParseFontDescriptor(nsCSSFontFaceRule* aRule)
 }
 
 
+bool
+CSSParserImpl::ParsePageRule(RuleAppendFunc aAppendFunc, void* aData)
+{
+  // XXX not yet implemented
+  return false;
+}
+
 bool
 CSSParserImpl::ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aData)
 {
@@ -2302,26 +2303,6 @@ CSSParserImpl::ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aData)
   return true;
 }
 
-bool
-CSSParserImpl::ParsePageRule(RuleAppendFunc aAppendFunc, void* aData)
-{
-  // TODO: There can be page selectors after @page such as ":first", ":left".
-  uint32_t parseFlags = eParseDeclaration_InBraces |
-                        eParseDeclaration_AllowImportant;
-  nsAutoPtr<css::Declaration> declaration(
-                                ParseDeclarationBlock(parseFlags,
-                                                      eCSSContext_Page));
-  if (!declaration) {
-    return false;
-  }
-
-  // Takes ownership of declaration.
-  nsRefPtr<nsCSSPageRule> rule = new nsCSSPageRule(declaration);
-
-  (*aAppendFunc)(rule, aData);
-  return true;
-}
-
 already_AddRefed<nsCSSKeyframeRule>
 CSSParserImpl::ParseKeyframeRule()
 {
@@ -2335,6 +2316,7 @@ CSSParserImpl::ParseKeyframeRule()
   uint32_t parseFlags = eParseDeclaration_InBraces;
   nsAutoPtr<css::Declaration> declaration(ParseDeclarationBlock(parseFlags));
   if (!declaration) {
+    REPORT_UNEXPECTED(PEBadSelectorKeyframeRuleIgnored);
     return nullptr;
   }
 
@@ -3910,7 +3892,7 @@ CSSParserImpl::ParseSelector(nsCSSSelectorList* aList,
 }
 
 css::Declaration*
-CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags, nsCSSContextType aContext)
+CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags)
 {
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
@@ -3926,7 +3908,7 @@ CSSParserImpl::ParseDeclarationBlock(uint32_t aFlags, nsCSSContextType aContext)
   if (declaration) {
     for (;;) {
       bool changed;
-      if (!ParseDeclaration(declaration, aFlags, true, &changed, aContext)) {
+      if (!ParseDeclaration(declaration, aFlags, true, &changed)) {
         if (!SkipDeclaration(checkForBraces)) {
           break;
         }
@@ -4317,12 +4299,8 @@ bool
 CSSParserImpl::ParseDeclaration(css::Declaration* aDeclaration,
                                 uint32_t aFlags,
                                 bool aMustCallValueAppended,
-                                bool* aChanged,
-                                nsCSSContextType aContext)
+                                bool* aChanged)
 {
-  NS_PRECONDITION(aContext == eCSSContext_General ||
-                  aContext == eCSSContext_Page,
-                  "Must be page or general context");
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
   mTempData.AssertInitialState();
@@ -4366,9 +4344,7 @@ CSSParserImpl::ParseDeclaration(css::Declaration* aDeclaration,
   // Map property name to its ID and then parse the property
   nsCSSProperty propID = nsCSSProps::LookupProperty(propertyName,
                                                     nsCSSProps::eEnabled);
-  if (eCSSProperty_UNKNOWN == propID ||
-     (aContext == nsCSSContextType::eCSSContext_Page &&
-      !nsCSSProps::PropHasFlags(propID, CSS_PROPERTY_APPLIES_TO_PAGE_RULE))) { // unknown property
+  if (eCSSProperty_UNKNOWN == propID) { // unknown property
     if (!NonMozillaVendorIdentifier(propertyName)) {
       const PRUnichar *params[] = {
         propertyName.get()
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index 631f52f94824..0a711120787a 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -1919,8 +1919,7 @@ CSS_PROP_SHORTHAND(
     margin,
     Margin,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "")
 CSS_PROP_MARGIN(
     margin-bottom,
@@ -1929,8 +1928,7 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "",
     VARIANT_AHLP | VARIANT_CALC,
     nullptr,
@@ -1940,8 +1938,7 @@ CSS_PROP_SHORTHAND(
     -moz-margin-end,
     margin_end,
     CSS_PROP_DOMPROP_PREFIXED(MarginEnd),
-    CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+    CSS_PROPERTY_PARSE_FUNCTION,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -1950,8 +1947,7 @@ CSS_PROP_MARGIN(
     MarginEndValue,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_STORES_CALC,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -1963,8 +1959,7 @@ CSS_PROP_SHORTHAND(
     margin_left,
     MarginLeft,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -1974,8 +1969,7 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_REPORT_OTHER_NAME |
-        CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_STORES_CALC,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -1987,8 +1981,7 @@ CSS_PROP_MARGIN(
     MarginLeftLTRSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2000,8 +1993,7 @@ CSS_PROP_MARGIN(
     MarginLeftRTLSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2013,8 +2005,7 @@ CSS_PROP_SHORTHAND(
     margin_right,
     MarginRight,
     CSS_PROPERTY_PARSE_FUNCTION |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -2024,8 +2015,7 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_REPORT_OTHER_NAME |
-        CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_STORES_CALC,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -2037,8 +2027,7 @@ CSS_PROP_MARGIN(
     MarginRightLTRSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2050,8 +2039,7 @@ CSS_PROP_MARGIN(
     MarginRightRTLSource,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_DIRECTIONAL_SOURCE |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_DIRECTIONAL_SOURCE,
     "",
     0,
     kBoxPropSourceKTable,
@@ -2062,8 +2050,7 @@ CSS_PROP_SHORTHAND(
     -moz-margin-start,
     margin_start,
     CSS_PROP_DOMPROP_PREFIXED(MarginStart),
-    CSS_PROPERTY_PARSE_FUNCTION |
-    CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+    CSS_PROPERTY_PARSE_FUNCTION,
     "")
 #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_MARGIN(
@@ -2072,8 +2059,7 @@ CSS_PROP_MARGIN(
     MarginStartValue,
     CSS_PROPERTY_PARSE_INACCESSIBLE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
-        CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_STORES_CALC,
     "",
     VARIANT_AHLP | VARIANT_CALC, // for internal use
     nullptr,
@@ -2087,8 +2073,7 @@ CSS_PROP_MARGIN(
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_APPLIES_TO_PAGE_RULE,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "",
     VARIANT_AHLP | VARIANT_CALC,
     nullptr,
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 13550a24e6d9..c1c53ace0306 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -104,9 +104,6 @@ MOZ_STATIC_ASSERT((CSS_PROPERTY_PARSE_PROPERTY_MASK &
 // Does the property apply to ::-moz-placeholder?
 #define CSS_PROPERTY_APPLIES_TO_PLACEHOLDER       (1<<18)
 
-// This property is allowed in an @page rule.
-#define CSS_PROPERTY_APPLIES_TO_PAGE_RULE         (1<<19)
-
 /**
  * Types of animatable values.
  */
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 264b59858394..d04ff3b7eeb6 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -979,7 +979,6 @@ struct RuleCascadeData {
 
   nsTArray<nsFontFaceRuleContainer> mFontFaceRules;
   nsTArray<nsCSSKeyframesRule*> mKeyframesRules;
-  nsTArray<nsCSSPageRule*> mPageRules;
 
   // Looks up or creates the appropriate list in |mAttributeSelectors|.
   // Returns null only on allocation failure.
@@ -1030,7 +1029,6 @@ RuleCascadeData::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
 
   n += mFontFaceRules.SizeOfExcludingThis(aMallocSizeOf);
   n += mKeyframesRules.SizeOfExcludingThis(aMallocSizeOf);
-  n += mPageRules.SizeOfExcludingThis(aMallocSizeOf);
 
   return n;
 }
@@ -2683,24 +2681,6 @@ nsCSSRuleProcessor::AppendKeyframesRules(
   return true;
 }
 
-// Append all the currently-active page rules to aArray.  Return
-// true for success and false for failure.
-bool
-nsCSSRuleProcessor::AppendPageRules(
-                              nsPresContext* aPresContext,
-                              nsTArray<nsCSSPageRule*>& aArray)
-{
-  RuleCascadeData* cascade = GetRuleCascade(aPresContext);
-
-  if (cascade) {
-    if (!aArray.AppendElements(cascade->mPageRules)) {
-      return false;
-    }
-  }
-  
-  return true;
-}
-
 nsresult
 nsCSSRuleProcessor::ClearRuleCascades()
 {
@@ -2999,13 +2979,11 @@ struct CascadeEnumData {
   CascadeEnumData(nsPresContext* aPresContext,
                   nsTArray<nsFontFaceRuleContainer>& aFontFaceRules,
                   nsTArray<nsCSSKeyframesRule*>& aKeyframesRules,
-                  nsTArray<nsCSSPageRule*>& aPageRules,
                   nsMediaQueryResultCacheKey& aKey,
                   uint8_t aSheetType)
     : mPresContext(aPresContext),
       mFontFaceRules(aFontFaceRules),
       mKeyframesRules(aKeyframesRules),
-      mPageRules(aPageRules),
       mCacheKey(aKey),
       mSheetType(aSheetType)
   {
@@ -3028,7 +3006,6 @@ struct CascadeEnumData {
   nsPresContext* mPresContext;
   nsTArray<nsFontFaceRuleContainer>& mFontFaceRules;
   nsTArray<nsCSSKeyframesRule*>& mKeyframesRules;
-  nsTArray<nsCSSPageRule*>& mPageRules;
   nsMediaQueryResultCacheKey& mCacheKey;
   PLArenaPool mArena;
   // Hooray, a manual PLDHashTable since nsClassHashtable doesn't
@@ -3045,7 +3022,6 @@ struct CascadeEnumData {
  *      but kept in order per-weight, and
  *  (2) add any @font-face rules, in order, into data->mFontFaceRules.
  *  (3) add any @keyframes rules, in order, into data->mKeyframesRules.
- *  (4) add any @page rules, in order, into data->mPageRules.
  */
 static bool
 CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
@@ -3098,12 +3074,7 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
       return false;
     }
   }
-  else if (css::Rule::PAGE_RULE == type) {
-    nsCSSPageRule* pageRule = static_cast<nsCSSPageRule*>(aRule);
-    if (!data->mPageRules.AppendElement(pageRule)) {
-      return false;
-    }
-  }
+
   return true;
 }
 
@@ -3204,7 +3175,6 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
     if (newCascade) {
       CascadeEnumData data(aPresContext, newCascade->mFontFaceRules,
                            newCascade->mKeyframesRules,
-                           newCascade->mPageRules,
                            newCascade->mCacheKey,
                            mSheetType);
       if (!data.mRulesByWeight.ops)
diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h
index 905eb47deefb..07bf5f2b8c34 100644
--- a/layout/style/nsCSSRuleProcessor.h
+++ b/layout/style/nsCSSRuleProcessor.h
@@ -121,9 +121,6 @@ public:
   bool AppendKeyframesRules(nsPresContext* aPresContext,
                             nsTArray<nsCSSKeyframesRule*>& aArray);
 
-  bool AppendPageRules(nsPresContext* aPresContext,
-                       nsTArray<nsCSSPageRule*>& aArray);
-
 #ifdef DEBUG
   void AssertQuirksChangeOK() {
     NS_ASSERTION(!mRuleCascades, "can't toggle quirks style sheet without "
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 3335c16563fb..26cf81b4ca8c 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -36,7 +36,6 @@
 #include "nsPrintfCString.h"
 #include "nsDOMClassInfoID.h"
 #include "mozilla/dom/CSSStyleDeclarationBinding.h"
-#include "StyleRule.h"
 
 namespace css = mozilla::css;
 
@@ -2327,212 +2326,6 @@ nsCSSKeyframesRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
   return n;
 }
 
-// -------------------------------------------
-// nsCSSPageStyleDeclaration
-//
-
-nsCSSPageStyleDeclaration::nsCSSPageStyleDeclaration(nsCSSPageRule* aRule)
-  : mRule(aRule)
-{
-}
-
-nsCSSPageStyleDeclaration::~nsCSSPageStyleDeclaration()
-{
-  NS_ASSERTION(!mRule, "DropReference not called.");
-}
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCSSPageStyleDeclaration)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCSSPageStyleDeclaration)
-
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(nsCSSPageStyleDeclaration)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSPageStyleDeclaration)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
-
-css::Declaration*
-nsCSSPageStyleDeclaration::GetCSSDeclaration(bool aAllocate)
-{
-  if (mRule) {
-    return mRule->Declaration();
-  } else {
-    return nullptr;
-  }
-}
-
-void
-nsCSSPageStyleDeclaration::GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv)
-{
-  GetCSSParsingEnvironmentForRule(mRule, aCSSParseEnv);
-}
-
-NS_IMETHODIMP
-nsCSSPageStyleDeclaration::GetParentRule(nsIDOMCSSRule** aParent)
-{
-  NS_ENSURE_ARG_POINTER(aParent);
-
-  NS_IF_ADDREF(*aParent = mRule);
-  return NS_OK;
-}
-
-nsresult
-nsCSSPageStyleDeclaration::SetCSSDeclaration(css::Declaration* aDecl)
-{
-  NS_ABORT_IF_FALSE(aDecl, "must be non-null");
-  mRule->ChangeDeclaration(aDecl);
-  return NS_OK;
-}
-
-nsIDocument*
-nsCSSPageStyleDeclaration::DocToUpdate()
-{
-  return nullptr;
-}
-
-nsINode*
-nsCSSPageStyleDeclaration::GetParentObject()
-{
-  return mRule ? mRule->GetDocument() : nullptr;
-}
-
-// -------------------------------------------
-// nsCSSPageRule
-//
-
-nsCSSPageRule::nsCSSPageRule(const nsCSSPageRule& aCopy)
-  // copy everything except our reference count and mDOMDeclaration
-  : Rule(aCopy)
-  , mDeclaration(new css::Declaration(*aCopy.mDeclaration))
-{
-}
-
-nsCSSPageRule::~nsCSSPageRule()
-{
-  if (mDOMDeclaration) {
-    mDOMDeclaration->DropReference();
-  }
-}
-
-/* virtual */ already_AddRefed<css::Rule>
-nsCSSPageRule::Clone() const
-{
-  nsRefPtr<css::Rule> clone = new nsCSSPageRule(*this);
-  return clone.forget();
-}
-
-NS_IMPL_ADDREF(nsCSSPageRule)
-NS_IMPL_RELEASE(nsCSSPageRule)
-
-DOMCI_DATA(CSSPageRule, nsCSSPageRule)
-
-// QueryInterface implementation for nsCSSPageRule
-NS_INTERFACE_MAP_BEGIN(nsCSSPageRule)
-  NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSPageRule)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSPageRule)
-NS_INTERFACE_MAP_END
-
-IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(nsCSSPageRule, Rule)
-
-#ifdef DEBUG
-void
-nsCSSPageRule::List(FILE* out, int32_t aIndent) const
-{
-  // FIXME: WRITE ME
-}
-#endif
-
-/* virtual */ int32_t
-nsCSSPageRule::GetType() const
-{
-  return Rule::PAGE_RULE;
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::GetType(uint16_t* aType)
-{
-  *aType = nsIDOMCSSRule::PAGE_RULE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::GetCssText(nsAString& aCssText)
-{
-  aCssText.AppendLiteral("@page { ");
-  nsAutoString tmp;
-  mDeclaration->ToString(tmp);
-  aCssText.Append(tmp);
-  aCssText.AppendLiteral(" }");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::SetCssText(const nsAString& aCssText)
-{
-  // FIXME: implement???
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
-{
-  return Rule::GetParentStyleSheet(aSheet);
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::GetParentRule(nsIDOMCSSRule** aParentRule)
-{
-  return Rule::GetParentRule(aParentRule);
-}
-
-css::ImportantRule*
-nsCSSPageRule::GetImportantRule()
-{
-  if (!mDeclaration->HasImportantData()) {
-    return nullptr;
-  }
-  if (!mImportantRule) {
-    mImportantRule = new css::ImportantRule(mDeclaration);
-  }
-  return mImportantRule;
-}
-
-/* virtual */ void
-nsCSSPageRule::MapRuleInfoInto(nsRuleData* aRuleData)
-{
-  mDeclaration->MapNormalRuleInfoInto(aRuleData);
-}
-
-NS_IMETHODIMP
-nsCSSPageRule::GetStyle(nsIDOMCSSStyleDeclaration** aStyle)
-{
-  if (!mDOMDeclaration) {
-    mDOMDeclaration = new nsCSSPageStyleDeclaration(this);
-  }
-  NS_ADDREF(*aStyle = mDOMDeclaration);
-  return NS_OK;
-}
-
-void
-nsCSSPageRule::ChangeDeclaration(css::Declaration* aDeclaration)
-{
-  mImportantRule = nullptr;
-  mDeclaration = aDeclaration;
-
-  nsCSSStyleSheet* sheet = GetStyleSheet();
-  if (sheet) {
-    sheet->SetModifiedByChildRule();
-  }
-}
-
-/* virtual */ size_t
-nsCSSPageRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
-{
-  return aMallocSizeOf(this);
-}
-
 namespace mozilla {
 
 CSSSupportsRule::CSSSupportsRule(bool aConditionMet,
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index eb79435e276c..0a4e7b22448a 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -28,8 +28,12 @@
 #include "nsTArray.h"
 #include "nsDOMCSSDeclaration.h"
 #include "Declaration.h"
-#include "nsIDOMCSSPageRule.h"
-#include "StyleRule.h"
+
+namespace mozilla {
+namespace css {
+class StyleRule;
+}
+}
 
 class nsMediaList;
 
@@ -429,79 +433,6 @@ private:
   nsString                                   mName;
 };
 
-class nsCSSPageRule;
-
-class nsCSSPageStyleDeclaration MOZ_FINAL : public nsDOMCSSDeclaration
-{
-public:
-  nsCSSPageStyleDeclaration(nsCSSPageRule *aRule);
-  virtual ~nsCSSPageStyleDeclaration();
-
-  NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;
-  void DropReference() { mRule = nullptr; }
-  virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate) MOZ_OVERRIDE;
-  virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl) MOZ_OVERRIDE;
-  virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
-  virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSPageStyleDeclaration,
-                                                         nsICSSDeclaration)
-
-  virtual nsINode *GetParentObject();
-
-protected:
-  // This reference is not reference-counted. The rule object tells us
-  // when it's about to go away.
-  nsCSSPageRule *mRule;
-};
-
-class nsCSSPageRule MOZ_FINAL : public mozilla::css::Rule,
-                                public nsIDOMCSSPageRule
-{
-public:
-  // WARNING: Steals the contents of aDeclaration
-  nsCSSPageRule(nsAutoPtr<mozilla::css::Declaration> aDeclaration)
-    : mDeclaration(aDeclaration),
-      mImportantRule(nullptr)
-  {
-  }
-private:
-  nsCSSPageRule(const nsCSSPageRule& aCopy);
-  ~nsCSSPageRule();
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIStyleRule methods
-#ifdef DEBUG
-  virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
-#endif
-
-  // Rule methods
-  DECL_STYLE_RULE_INHERIT
-  virtual int32_t GetType() const;
-  virtual already_AddRefed<mozilla::css::Rule> Clone() const;
-
-  // nsIDOMCSSRule interface
-  NS_DECL_NSIDOMCSSRULE
-
-  // nsIDOMCSSPageRule interface
-  NS_DECL_NSIDOMCSSPAGERULE
-
-  mozilla::css::Declaration* Declaration()   { return mDeclaration; }
-
-  void ChangeDeclaration(mozilla::css::Declaration* aDeclaration);
-
-  mozilla::css::ImportantRule* GetImportantRule();
-
-  virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
-private:
-  nsAutoPtr<mozilla::css::Declaration>    mDeclaration;
-  // lazily created when needed:
-  nsRefPtr<nsCSSPageStyleDeclaration>     mDOMDeclaration;
-  nsRefPtr<mozilla::css::ImportantRule>   mImportantRule;
-};
-
 namespace mozilla {
 
 class CSSSupportsRule : public css::GroupRule,
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 2334b95554ec..e6decbc4c075 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -1165,24 +1165,6 @@ nsStyleSet::ResolveAnonymousBoxStyle(nsIAtom* aPseudoTag,
   FileRules(EnumRulesMatching<AnonBoxRuleProcessorData>, &data, nullptr,
             &ruleWalker);
 
-  if (aPseudoTag == nsCSSAnonBoxes::pageContent) {
-    // Add any @page rules that are specified.
-    nsTArray<nsCSSPageRule*> rules;
-    nsTArray<css::ImportantRule*> importantRules;
-    nsPresContext* presContext = PresContext();
-    presContext->StyleSet()->AppendPageRules(presContext, rules);
-    for (uint32_t i = 0, i_end = rules.Length(); i != i_end; ++i) {
-      ruleWalker.Forward(rules[i]);
-      css::ImportantRule* importantRule = rules[i]->GetImportantRule();
-      if (importantRule) {
-        importantRules.AppendElement(importantRule);
-      }
-    }
-    for (uint32_t i = 0, i_end = importantRules.Length(); i != i_end; ++i) {
-      ruleWalker.Forward(importantRules[i]);
-    }
-  }
-
   return GetContext(aParentContext, ruleWalker.CurrentNode(), nullptr,
                     false, false,
                     aPseudoTag, nsCSSPseudoElements::ePseudo_AnonBox,
@@ -1260,21 +1242,6 @@ nsStyleSet::AppendKeyframesRules(nsPresContext* aPresContext,
   return true;
 }
 
-bool
-nsStyleSet::AppendPageRules(nsPresContext* aPresContext,
-                            nsTArray<nsCSSPageRule*>& aArray)
-{
-  NS_ENSURE_FALSE(mInShutdown, false);
-
-  for (uint32_t i = 0; i < NS_ARRAY_LENGTH(gCSSSheetTypes); ++i) {
-    nsCSSRuleProcessor* ruleProc = static_cast<nsCSSRuleProcessor*>
-                                    (mRuleProcessors[gCSSSheetTypes[i]].get());
-    if (ruleProc && !ruleProc->AppendPageRules(aPresContext, aArray))
-      return false;
-  }
-  return true;
-}
-
 void
 nsStyleSet::BeginShutdown(nsPresContext* aPresContext)
 {
diff --git a/layout/style/nsStyleSet.h b/layout/style/nsStyleSet.h
index ddf70da2b619..fec5cf70654f 100644
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@@ -29,7 +29,6 @@
 class nsIURI;
 class nsCSSFontFaceRule;
 class nsCSSKeyframesRule;
-class nsCSSPageRule;
 class nsRuleWalker;
 struct RuleProcessorData;
 struct TreeMatchContext;
@@ -153,11 +152,6 @@ class nsStyleSet
   bool AppendKeyframesRules(nsPresContext* aPresContext,
                               nsTArray<nsCSSKeyframesRule*>& aArray);
 
-  // Append all the currently-active page rules to aArray.  Return
-  // true for success and false for failure.
-  bool AppendPageRules(nsPresContext* aPresContext,
-                       nsTArray<nsCSSPageRule*>& aArray);
-
   // Begin ignoring style context destruction, to avoid lots of unnecessary
   // work on document teardown.
   void BeginShutdown(nsPresContext* aPresContext);
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 74a6b3b06e12..aff0d6725dc4 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -187,7 +187,6 @@ MOCHITEST_FILES =	test_acid3_test46.html \
 		visited_image_loading_frame_empty.html \
 		test_load_events_on_stylesheets.html \
 		test_bug721136.html \
-		test_page_parser.html \
 		test_bug732153.html \
 		test_bug732209.html \
 		bug732209-css.sjs \
diff --git a/layout/style/test/test_page_parser.html b/layout/style/test/test_page_parser.html
deleted file mode 100644
index e8e0dc85f7cd..000000000000
--- a/layout/style/test/test_page_parser.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!-- https://bugzilla.mozilla.org/show_bug.cgi?id=115199 -->
-<head>
-  <meta charset="UTF-8">
-  <title>Test of @page parser</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-</head>
-<body>
-<p>@page parsing (<a
-  target="_blank"
-  href="https://bugzilla.mozilla.org/show_bug.cgi?id=115199"
->bug 115199</a>)</p>
-<pre id="display"></pre>
-<style type="text/css" id="testbox"></style>
-<script class="testbody" type="text/javascript">
-  function _(b) { return "@page { " + b + " }"; };
-
-  var testset = [
-    // CSS 2.1 only allows margin properties in the page rule.
-
-    // Check a bad property.
-    { rule: "position: absolute;" },
-
-    // Check good properties.
-    // NOTE: The margin-*-value and margin-*-source properties are not really
-    // expected and will need to be removed once bug 241234 is addressed.
-    { rule: _("margin: 2in;"), expected: {
-      "margin-top": "2in",
-      "margin-right-value": "2in",
-      "margin-bottom": "2in",
-      "margin-left-value": "2in",
-      "margin-left-ltr-source": "physical",
-      "margin-left-rtl-source": "physical",
-      "margin-right-ltr-source": "physical",
-      "margin-right-rtl-source": "physical"
-    }},
-    { rule: _("margin-top: 2in;"), expected: {"margin-top": "2in"}},
-    { rule: _("margin-left: 2in;"), expected: {
-      "margin-left-value": "2in",
-      "margin-left-ltr-source": "physical",
-      "margin-left-rtl-source": "physical",
-    }},
-    { rule: _("margin-bottom: 2in;"), expected: {"margin-bottom": "2in"}},
-    { rule: _("margin-right: 2in;"), expected: {
-      "margin-right-value": "2in",
-      "margin-right-ltr-source": "physical",
-      "margin-right-rtl-source": "physical",
-    }}
-  ];
-
-  var display = document.getElementById("display");
-  var sheet = document.styleSheets[1];
-
-  for (var curTest = 0; curTest < testset.length; curTest++) {
-    try {
-      while(sheet.cssRules.length > 0)
-        sheet.deleteRule(0);
-      sheet.insertRule(testset[curTest].rule, 0);
-    } catch (e) {
-      ok(e.name == "SyntaxError"
-         && e instanceof DOMException
-         && e.code == DOMException.SYNTAX_ERR
-         && !('expected' in testset[curTest]),
-         testset[curTest].rule + " syntax error thrown", e);
-    }
-
-    try {
-      if (testset[curTest].expected) {
-        is(sheet.cssRules.length, 1,
-           testset[curTest].rule + " rule count");
-           is(sheet.cssRules[0].type, CSSRule.PAGE_RULE,
-           testset[curTest].rule + " rule type");
-
-        var expected = testset[curTest].expected;
-        var s = sheet.cssRules[0].style;
-        var n = 0;
-
-        // everything is set that should be
-        for (var name in expected) {
-          is(s.getPropertyValue(name), expected[name],
-             testset[curTest].rule + " (prop " + name + ")");
-          n++;
-        }
-        // nothing else is set
-        is(s.length, n, testset[curTest].rule + "prop count");
-        for (var i = 0; i < s.length; i++) {
-          ok(s[i] in expected, testset[curTest].rule,
-             "Unexpected item #" + i + ": " + s[i]);
-        }
-      } else {
-        if (sheet.cssRules.length == 0) {
-          is(sheet.cssRules.length, 0,
-             testset[curTest].rule + " rule count (0)");
-        } else {
-          is(sheet.cssRules.length, 1,
-             testset[curTest].rule + " rule count (1 non-page)");
-          isnot(sheet.cssRules[0].type, CSSRule.PAGE_RULE,
-                testset[curTest].rule + " rule type (1 non-page)");
-        }
-      }
-    } catch (e) {
-      ok(false, testset[curTest].rule, "During test: " + e);
-    }
-  }
-</script>
-</body>
-</html>
diff --git a/layout/style/ua.css b/layout/style/ua.css
index a97bc3f18987..a10b8cc836c4 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -193,7 +193,6 @@
 
 *|*::-moz-pagecontent {
   display: block !important;
-  margin: auto;
 }
 
 *|*::-moz-pagebreak {

From 08d30b4c4a0cd1aef1d89397c6ba0a852b9760e0 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 13 Nov 2012 14:55:02 -0500
Subject: [PATCH 47/76] Bug 811419 - fix accumulation of the zero bucket in
 flag histograms; r=taras

---
 ipc/chromium/src/base/histogram.cc                            | 4 ++--
 toolkit/components/telemetry/tests/unit/test_TelemetryPing.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipc/chromium/src/base/histogram.cc b/ipc/chromium/src/base/histogram.cc
index ea27737fce21..ff9cd52349e1 100644
--- a/ipc/chromium/src/base/histogram.cc
+++ b/ipc/chromium/src/base/histogram.cc
@@ -955,7 +955,7 @@ FlagHistogram::FactoryGet(const std::string &name, Flags flags)
     fh->InitializeBucketRange();
     fh->SetFlags(flags);
     size_t zero_index = fh->BucketIndex(0);
-    fh->Histogram::Accumulate(1, 1, zero_index);
+    fh->Histogram::Accumulate(0, 1, zero_index);
     h = StatisticsRecorder::RegisterOrDeleteDuplicate(fh);
   }
 
@@ -983,7 +983,7 @@ FlagHistogram::Accumulate(Sample value, Count count, size_t index)
   DCHECK_EQ(value, 1);
   Histogram::Accumulate(value, 1, index);
   size_t zero_index = BucketIndex(0);
-  Histogram::Accumulate(1, -1, zero_index);
+  Histogram::Accumulate(0, -1, zero_index);
 }
 
 void
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
index 461e3d798cfa..34ffe0439a01 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
@@ -209,7 +209,7 @@ function checkPayload(request, reason, successfulPings) {
     bucket_count: 3,
     histogram_type: 3,
     values: {0:1, 1:0},
-    sum: 1
+    sum: 0
   };
   let flag = payload.histograms[TELEMETRY_TEST_FLAG];
   do_check_eq(uneval(flag), uneval(expected_flag));

From d2b1e8aa5c90ad795516d720d94d0a71b7ff4113 Mon Sep 17 00:00:00 2001
From: Todd Whiteman <toddw@ActiveState.com>
Date: Tue, 13 Nov 2012 18:03:01 -0800
Subject: [PATCH 48/76] b=809601 correct drag and drop event coords when over
 child windows r=karlt

--HG--
extra : transplant_source : %FD%BBAYt%96G%D5_%1C%F4D%8F_%40%2C%E6%DA%60%7C
---
 widget/gtk2/nsWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index 1fc0e915ac72..28176e9d6530 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -5641,7 +5641,7 @@ drag_motion_event_cb(GtkWidget *aWidget,
 
     return nsDragService::GetInstance()->
         ScheduleMotionEvent(innerMostWindow, aDragContext,
-                            nsIntPoint(aX, aY), aTime);
+                            nsIntPoint(retx, rety), aTime);
 }
 
 static void
@@ -5711,7 +5711,7 @@ drag_drop_event_cb(GtkWidget *aWidget,
 
     return nsDragService::GetInstance()->
         ScheduleDropEvent(innerMostWindow, aDragContext,
-                          nsIntPoint(aX, aY), aTime);
+                          nsIntPoint(retx, rety), aTime);
 }
 
 static void

From 5082e638964b61cf36ab77428fc35f699946e51a Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 13 Nov 2012 18:04:42 -0800
Subject: [PATCH 49/76] b=798157 use ARGB visuals only for popups that will be
 translucent r=roc

--HG--
extra : transplant_source : %87%9FFG%FA%9E%1D%12i%1C%B9%93%E5%F4%85%C8s%02%7B7
---
 layout/xul/base/src/nsMenuPopupFrame.cpp |  1 +
 widget/gtk2/nsWindow.cpp                 | 20 ++++++++------------
 widget/nsWidgetInitData.h                | 11 +++++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 256d9a6b62da..23036e598630 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -271,6 +271,7 @@ nsMenuPopupFrame::CreateWidgetForView(nsIView* aView)
   nsIAtom *tag = nullptr;
   if (parentContent)
     tag = parentContent->Tag();
+  widgetData.mSupportTranslucency = mode == eTransparencyTransparent;
   widgetData.mDropShadow = !(viewHasTransparentContent || tag == nsGkAtoms::menulist);
   widgetData.mPopupLevel = PopupLevel(widgetData.mNoAutoHide);
 
diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index 28176e9d6530..edb47b24a3a7 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -3466,18 +3466,13 @@ nsWindow::Create(nsIWidget        *aParent,
             mShell = gtk_window_new(type);
             gtk_window_set_wmclass(GTK_WINDOW(mShell), "Popup",
                                    gdk_get_program_class());
-            
-            if (!aInitData->mNoAutoHide) {
-                GdkScreen *screen = gtk_widget_get_screen(mShell);
-                // Use an RGBA visual for all short-lived popup windows if
-                // we are on a compositing window manager. We don't do this in
+
+            if (aInitData->mSupportTranslucency) {
+                // We need to select an ARGB visual here instead of in
                 // SetTransparencyMode() because it has to be done before the
-                // widget is realized.
-                // Normally we would need to hook up to the screen's
-                // "composited-changed" signal, but we don't do that because
-                // we are only changing the visual on short-lived windows,
-                // so it doesn't matter too much if the screens compositor
-                // goes away
+                // widget is realized.  An ARGB visual is only useful if we
+                // are on a compositing window manager.
+                GdkScreen *screen = gtk_widget_get_screen(mShell);
                 if (gdk_screen_is_composited(screen)) {
 #if defined(MOZ_WIDGET_GTK2)
                     GdkColormap *colormap =
@@ -3488,7 +3483,8 @@ nsWindow::Create(nsIWidget        *aParent,
                     gtk_widget_set_visual(mShell, visual);
 #endif
                 }
-            } else {
+            }
+            if (aInitData->mNoAutoHide) {
                 // ... but the window manager does not decorate this window,
                 // nor provide a separate taskbar icon.
                 if (mBorderStyle == eBorderStyle_default) {
diff --git a/widget/nsWidgetInitData.h b/widget/nsWidgetInitData.h
index bfcf338883e9..5edc3d86efd6 100644
--- a/widget/nsWidgetInitData.h
+++ b/widget/nsWidgetInitData.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -102,7 +102,8 @@ struct nsWidgetInitData {
       mRTL(false),
       mNoAutoHide(false),
       mIsDragPopup(false),
-      mIsAnimationSuppressed(false)
+      mIsAnimationSuppressed(false),
+      mSupportTranslucency(false)
   {
   }
 
@@ -117,8 +118,10 @@ struct nsWidgetInitData {
   bool          mRTL;
   bool          mNoAutoHide; // true for noautohide panels
   bool          mIsDragPopup;  // true for drag feedback panels
-  bool          mIsAnimationSuppressed;  // true if window creation animation is
-                                         // suppressed, e.g. for session restore
+  // true if window creation animation is suppressed, e.g. for session restore
+  bool          mIsAnimationSuppressed;
+  // true if the window should support an alpha channel, if available.
+  bool          mSupportTranslucency;
 };
 
 #endif // nsWidgetInitData_h__

From d9e25f6131178f1d08629dee384e034aa646dc1c Mon Sep 17 00:00:00 2001
From: Alex Vincent <ajvincent@gmail.com>
Date: Tue, 13 Nov 2012 21:16:00 -0500
Subject: [PATCH 50/76] Bug 810559 - Switch publicID and systemID to match IDL
 and SAX specification. r=smaug

---
 parser/xml/src/nsSAXXMLReader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parser/xml/src/nsSAXXMLReader.cpp b/parser/xml/src/nsSAXXMLReader.cpp
index 522049b144f6..791796c8778b 100644
--- a/parser/xml/src/nsSAXXMLReader.cpp
+++ b/parser/xml/src/nsSAXXMLReader.cpp
@@ -179,8 +179,8 @@ nsSAXXMLReader::HandleStartDTD(const PRUnichar *aName,
   mPublicId = aPublicId;
   if (mLexicalHandler) {
     return mLexicalHandler->StartDTD(nsDependentString(aName),
-                                     nsDependentString(aSystemId),
-                                     nsDependentString(aPublicId));
+                                     nsDependentString(aPublicId),
+                                     nsDependentString(aSystemId));
   }
 
   return NS_OK;

From adb5273df5d196446aa3cd360f8af55cd88919ad Mon Sep 17 00:00:00 2001
From: Rob Wood <rwood@mozilla.com>
Date: Tue, 6 Nov 2012 16:26:10 -0500
Subject: [PATCH 51/76] Bug 807777 - Develop tests to verify filtering SMS
 messages by read/unread, update manifest; r=jgriffin

---
 dom/sms/tests/marionette/manifest.ini         |   2 +
 dom/sms/tests/marionette/test_filter_read.js  | 229 ++++++++++++++++++
 .../tests/marionette/test_filter_unread.js    | 223 +++++++++++++++++
 3 files changed, 454 insertions(+)
 create mode 100644 dom/sms/tests/marionette/test_filter_read.js
 create mode 100644 dom/sms/tests/marionette/test_filter_unread.js

diff --git a/dom/sms/tests/marionette/manifest.ini b/dom/sms/tests/marionette/manifest.ini
index bca7ab7d7b94..92ac3e48ca01 100644
--- a/dom/sms/tests/marionette/manifest.ini
+++ b/dom/sms/tests/marionette/manifest.ini
@@ -11,4 +11,6 @@ qemu = true
 [test_outgoing_delete.js]
 [test_getmessage.js]
 [test_getmessage_notfound.js]
+[test_filter_read.js]
+[test_filter_unread.js]
 [test_number_of_messages.js]
diff --git a/dom/sms/tests/marionette/test_filter_read.js b/dom/sms/tests/marionette/test_filter_read.js
new file mode 100644
index 000000000000..7fd72e637b6c
--- /dev/null
+++ b/dom/sms/tests/marionette/test_filter_read.js
@@ -0,0 +1,229 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 20000;
+
+SpecialPowers.addPermission("sms", true, document);
+SpecialPowers.setBoolPref("dom.sms.enabled", true);
+
+let sms = window.navigator.mozSms;
+let numberMsgs = 10;
+let smsList = new Array();
+
+function verifyInitialState() {
+  log("Verifying initial state.");
+  ok(sms, "mozSms");
+  // Ensure test is starting clean with no existing sms messages
+  deleteAllMsgs(simulateIncomingSms);
+}
+
+function deleteAllMsgs(nextFunction) {
+  let msgList = new Array();
+  let filter = new MozSmsFilter;
+
+  let request = sms.getMessages(filter, false);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    ok(event.target.result, "smsrequest event.target.result");
+    cursor = event.target.result;
+    // Check if message was found
+    if (cursor.message) {
+      msgList.push(cursor.message.id);
+      // Now get next message in the list
+      cursor.continue();
+    } else {
+      // No (more) messages found
+      if (msgList.length) {
+        log("Found " + msgList.length + " SMS messages to delete.");
+        deleteMsgs(msgList, nextFunction);
+      } else {
+        log("No SMS messages found.");
+        nextFunction();
+      }
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    log("sms.getMessages error: " + event.target.error.name);
+    ok(false,"Could not get SMS messages");
+    cleanUp();
+  };
+}
+
+function deleteMsgs(msgList, nextFunction) {
+  let smsId = msgList.shift();
+
+  log("Deleting SMS (id: " + smsId + ").");
+  let request = sms.delete(smsId);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    if (event.target.result) {
+      // Message deleted, continue until none are left
+      if (msgList.length) {
+        deleteMsgs(msgList, nextFunction);
+      } else {
+        log("Finished deleting SMS messages.");
+        nextFunction();
+      }
+    } else {
+      log("SMS delete failed.");
+      ok(false,"sms.delete request returned false");
+      cleanUp();
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    ok(false, "sms.delete request returned unexpected error: "
+        + event.target.error.name );
+    cleanUp();
+  };
+}
+
+function simulateIncomingSms() {
+  let text = "Incoming SMS number " + (smsList.length + 1);
+  let remoteNumber = "5552229797";
+
+  log("Simulating incoming SMS number " + (smsList.length + 1) + " of "
+      + numberMsgs + ".");
+
+  // Simulate incoming sms sent from remoteNumber to our emulator
+  rcvdEmulatorCallback = false;
+  runEmulatorCmd("sms send " + remoteNumber + " " + text, function(result) {
+    is(result[0], "OK", "emulator callback");
+    rcvdEmulatorCallback = true;
+  });
+}
+
+// Callback for incoming sms
+sms.onreceived = function onreceived(event) {
+  log("Received 'onreceived' sms event.");
+  let incomingSms = event.message;
+  log("Received SMS (id: " + incomingSms.id + ").");
+
+  // Add newly received message to array of received msgs
+  smsList.push(incomingSms);
+
+  // Wait for emulator to catch up before continuing
+  waitFor(nextRep,function() {
+    return(rcvdEmulatorCallback);
+  });
+};
+
+function nextRep() {
+  if (smsList.length < numberMsgs) {
+    simulateIncomingSms();
+  } else {
+    // Marking all messages except first as read
+    // Can remove first one from smsList array
+    smsList.shift();
+    markMsgRead(smsList.slice(0));
+  }
+}
+
+function markMsgRead(smsMsgs) {  
+  nextSms = smsMsgs.shift();
+  log("Marking SMS (id: " + nextSms.id + ") as read.");
+  let request = sms.markMessageRead(nextSms.id, true);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    if (event.target.result) {
+      // Message marked as read, continue until none are left
+      if (smsMsgs.length) {
+        markMsgRead(smsMsgs);
+      } else {
+        // Done, now test the filter
+        getMsgs();
+      }
+    } else {
+      log("SMS markMessageRead failed.");
+      ok(false,"sms.markMessageRead request returned false");
+      cleanUp();
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    ok(false, "sms.markMessageRead request returned unexpected error: "
+        + event.target.error.name );
+    cleanUp();
+  };
+}
+
+function getMsgs() {
+  var filter = new MozSmsFilter();
+  let foundSmsList = new Array();
+
+  // Set filter for read messages
+  filter.read = true;
+
+  log("Getting the read SMS messages.");
+  let request = sms.getMessages(filter, false);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    ok(event.target.result, "smsrequest event.target.result");
+    cursor = event.target.result;
+
+    if (cursor.message) {
+      // Another message found
+      log("Got SMS (id: " + cursor.message.id + ").");
+      // Store found message
+      foundSmsList.push(cursor.message);
+      // Now get next message in the list
+      cursor.continue();
+    } else {
+      // No more messages; ensure correct number found
+      if (foundSmsList.length == smsList.length) {
+        log("SMS getMessages returned " + foundSmsList.length +
+            " messages as expected.");
+        verifyFoundMsgs(foundSmsList);
+      } else {
+        log("SMS getMessages returned " + foundSmsList.length +
+            " messages, but expected " + smsList.length + ".");
+        ok(false, "Incorrect number of messages returned by sms.getMessages");
+        deleteAllMsgs(cleanUp);
+      }
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    log("sms.getMessages error: " + event.target.error.name);
+    ok(false,"Could not get SMS messages");
+    cleanUp();
+  };
+}
+
+function verifyFoundMsgs(foundSmsList) {
+  for (var x = 0; x < foundSmsList.length; x++) {
+    is(foundSmsList[x].id, smsList[x].id, "id");
+    is(foundSmsList[x].read, true, "read");
+  }
+  deleteAllMsgs(cleanUp);
+}
+
+function cleanUp() {
+  sms.onreceived = null;
+  SpecialPowers.removePermission("sms", document);
+  SpecialPowers.clearUserPref("dom.sms.enabled");
+  finish();
+}
+
+// Start the test
+verifyInitialState();
diff --git a/dom/sms/tests/marionette/test_filter_unread.js b/dom/sms/tests/marionette/test_filter_unread.js
new file mode 100644
index 000000000000..17e67445d488
--- /dev/null
+++ b/dom/sms/tests/marionette/test_filter_unread.js
@@ -0,0 +1,223 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 20000;
+
+SpecialPowers.addPermission("sms", true, document);
+SpecialPowers.setBoolPref("dom.sms.enabled", true);
+
+let sms = window.navigator.mozSms;
+let numberMsgs = 10;
+let smsList = new Array();
+
+function verifyInitialState() {
+  log("Verifying initial state.");
+  ok(sms, "mozSms");
+  // Ensure test is starting clean with no existing sms messages
+  deleteAllMsgs(simulateIncomingSms);
+}
+
+function deleteAllMsgs(nextFunction) {
+  let msgList = new Array();
+  let filter = new MozSmsFilter;
+
+  let request = sms.getMessages(filter, false);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    ok(event.target.result, "smsrequest event.target.result");
+    cursor = event.target.result;
+    // Check if message was found
+    if (cursor.message) {
+      msgList.push(cursor.message.id);
+      // Now get next message in the list
+      cursor.continue();
+    } else {
+      // No (more) messages found
+      if (msgList.length) {
+        log("Found " + msgList.length + " SMS messages to delete.");
+        deleteMsgs(msgList, nextFunction);
+      } else {
+        log("No SMS messages found.");
+        nextFunction();
+      }
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    log("sms.getMessages error: " + event.target.error.name);
+    ok(false,"Could not get SMS messages");
+    cleanUp();
+  };
+}
+
+function deleteMsgs(msgList, nextFunction) {
+  let smsId = msgList.shift();
+
+  log("Deleting SMS (id: " + smsId + ").");
+  let request = sms.delete(smsId);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    if (event.target.result) {
+      // Message deleted, continue until none are left
+      if (msgList.length) {
+        deleteMsgs(msgList, nextFunction);
+      } else {
+        log("Finished deleting SMS messages.");
+        nextFunction();
+      }
+    } else {
+      log("SMS delete failed.");
+      ok(false,"sms.delete request returned false");
+      cleanUp();
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    ok(false, "sms.delete request returned unexpected error: "
+        + event.target.error.name );
+    cleanUp();
+  };
+}
+
+function simulateIncomingSms() {
+  let text = "Incoming SMS number " + (smsList.length + 1);
+  let remoteNumber = "5552229797";
+
+  log("Simulating incoming SMS number " + (smsList.length + 1) + " of "
+      + numberMsgs + ".");
+
+  // Simulate incoming sms sent from remoteNumber to our emulator
+  rcvdEmulatorCallback = false;
+  runEmulatorCmd("sms send " + remoteNumber + " " + text, function(result) {
+    is(result[0], "OK", "emulator callback");
+    rcvdEmulatorCallback = true;
+  });
+}
+
+// Callback for incoming sms
+sms.onreceived = function onreceived(event) {
+  log("Received 'onreceived' sms event.");
+  let incomingSms = event.message;
+  log("Received SMS (id: " + incomingSms.id + ").");
+
+  // Add newly received message to array of received msgs
+  smsList.push(incomingSms);
+
+  // Wait for emulator to catch up before continuing
+  waitFor(nextRep,function() {
+    return(rcvdEmulatorCallback);
+  });
+};
+
+function nextRep() {
+  if (smsList.length < numberMsgs) {
+    simulateIncomingSms();
+  } else {
+    markMsgRead();
+  }
+}
+
+function markMsgRead() {
+  // Mark first message read so not all will be found by filter
+  log("Marking SMS (id: " + smsList[0].id + ") as read.");
+  let request = sms.markMessageRead(smsList[0].id, true);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    if (event.target.result) {
+      // First message was marked read, so remove from expected smsList
+      smsList.shift();
+      // Now test the filter
+      getMsgs();
+    } else {
+      log("SMS markMessageRead failed.");
+      ok(false,"sms.markMessageRead request returned false");
+      cleanUp();
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    ok(false, "sms.markMessageRead request returned unexpected error: "
+        + event.target.error.name );
+    cleanUp();
+  };
+}
+
+function getMsgs() {
+  var filter = new MozSmsFilter();
+  let foundSmsList = new Array();
+
+  // Set filter for read messages
+  filter.read = false;
+
+  log("Getting the unread SMS messages.");
+  let request = sms.getMessages(filter, false);
+  ok(request instanceof MozSmsRequest,
+      "request is instanceof " + request.constructor);
+
+  request.onsuccess = function(event) {
+    log("Received 'onsuccess' smsrequest event.");
+    ok(event.target.result, "smsrequest event.target.result");
+    cursor = event.target.result;
+
+    if (cursor.message) {
+      // Another message found
+      log("Got SMS (id: " + cursor.message.id + ").");
+      // Store found message
+      foundSmsList.push(cursor.message);
+      // Now get next message in the list
+      cursor.continue();
+    } else {
+      // No more messages; ensure correct number found
+      if (foundSmsList.length == smsList.length) {
+        log("SMS getMessages returned " + foundSmsList.length +
+            " messages as expected.");
+        verifyFoundMsgs(foundSmsList);
+      } else {
+        log("SMS getMessages returned " + foundSmsList.length +
+            " messages, but expected " + smsList.length + ".");
+        ok(false, "Incorrect number of messages returned by sms.getMessages");
+        deleteAllMsgs(cleanUp);
+      }
+    }
+  };
+
+  request.onerror = function(event) {
+    log("Received 'onerror' smsrequest event.");
+    ok(event.target.error, "domerror obj");
+    log("sms.getMessages error: " + event.target.error.name);
+    ok(false,"Could not get SMS messages");
+    cleanUp();
+  };
+}
+
+function verifyFoundMsgs(foundSmsList) {
+  for (var x = 0; x < foundSmsList.length; x++) {
+    is(foundSmsList[x].id, smsList[x].id, "id");
+    is(foundSmsList[x].read, false, "read");
+  }
+  deleteAllMsgs(cleanUp);
+}
+
+function cleanUp() {
+  sms.onreceived = null;
+  SpecialPowers.removePermission("sms", document);
+  SpecialPowers.clearUserPref("dom.sms.enabled");
+  finish();
+}
+
+// Start the test
+verifyInitialState();

From cea3e17458a365c5a08086bb4e7aaaf8162cbf08 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Tue, 13 Nov 2012 18:09:10 +1300
Subject: [PATCH 52/76] Bug 779392 - Improve cubeb_alsa workaround for bug
 761274.  r=doublec

---
 media/libcubeb/README_MOZILLA   |   7 +-
 media/libcubeb/src/cubeb_alsa.c | 234 ++++++++++++++++++++++++++++----
 2 files changed, 207 insertions(+), 34 deletions(-)

diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA
index 61477673a602..240f780bae9c 100644
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -5,7 +5,6 @@ Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was 2d7d3e8f2ecabb70d2723f3c86fcb591a84b7f85.
-Plus the single commit f4c927fb1c2dc0a0580d0bca4bd267c34febada4.
-Plus the single commit 1e54b689752a1e853828cb4124985d3160694913.
-Plus the single commit e5837ecbb2389abd7e6635f4339878c5e4c1e1d5.
+The git commit ID used was dfdf4a3c0f813717819f633f8bd3099c3e58ee8a.
+Plus the single commit 1bc23c6e2e4920f38f7aa56ec56ef5e379e18cf7.
+Plus the single commit 6e9ffc59202f95f09e5adb895d10eaedf36a6ea2.
diff --git a/media/libcubeb/src/cubeb_alsa.c b/media/libcubeb/src/cubeb_alsa.c
index 63528b4b2ea5..8ce26a5c59a0 100644
--- a/media/libcubeb/src/cubeb_alsa.c
+++ b/media/libcubeb/src/cubeb_alsa.c
@@ -18,7 +18,8 @@
 
 #define CUBEB_STREAM_MAX 16
 #define CUBEB_WATCHDOG_MS 10000
-#define UNUSED __attribute__ ((__unused__))
+
+#define CUBEB_ALSA_PCM_NAME "default"
 
 #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
 
@@ -52,6 +53,12 @@ struct cubeb {
   /* Track number of active streams.  This is limited to CUBEB_STREAM_MAX
      due to resource contraints. */
   unsigned int active_streams;
+
+  /* Local configuration with handle_underrun workaround set for PulseAudio
+     ALSA plugin.  Will be NULL if the PA ALSA plugin is not in use or the
+     workaround is not required. */
+  snd_config_t * local_config;
+  int is_pa;
 };
 
 enum stream_state {
@@ -411,13 +418,165 @@ cubeb_run_thread(void * context)
   return NULL;
 }
 
+static snd_config_t *
+get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+{
+  int r;
+  snd_config_t * slave_pcm;
+  snd_config_t * slave_def;
+  snd_config_t * pcm;
+  char const * string;
+  char node_name[64];
+
+  slave_def = NULL;
+
+  r = snd_config_search(root_pcm, "slave", &slave_pcm);
+  if (r < 0) {
+    return NULL;
+  }
+
+  r = snd_config_get_string(slave_pcm, &string);
+  if (r >= 0) {
+    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
+    if (r < 0) {
+      return NULL;
+    }
+  }
+
+  do {
+    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+    if (r < 0) {
+      break;
+    }
+
+    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
+    if (r < 0) {
+      break;
+    }
+
+    r = snprintf(node_name, sizeof(node_name), "pcm.%s", string);
+    if (r < 0 || r > (int) sizeof(node_name)) {
+      break;
+    }
+    r = snd_config_search(lconf, node_name, &pcm);
+    if (r < 0) {
+      break;
+    }
+
+    return pcm;
+  } while (0);
+
+  if (slave_def) {
+    snd_config_delete(slave_def);
+  }
+
+  return NULL;
+}
+
+/* Work around PulseAudio ALSA plugin bug where the PA server forces a
+   higher than requested latency, but the plugin does not update its (and
+   ALSA's) internal state to reflect that, leading to an immediate underrun
+   situation.  Inspired by WINE's make_handle_underrun_config.
+   Reference: http://mailman.alsa-project.org/pipermail/alsa-devel/2012-July/05 */
+static snd_config_t *
+init_local_config_with_workaround(char const * pcm_name)
+{
+  int r;
+  snd_config_t * lconf;
+  snd_config_t * pcm_node;
+  snd_config_t * node;
+  char const * string;
+  char node_name[64];
+
+  lconf = NULL;
+
+  if (snd_config == NULL) {
+    return NULL;
+  }
+
+  r = snd_config_copy(&lconf, snd_config);
+  if (r < 0) {
+    return NULL;
+  }
+
+  do {
+    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
+    if (r < 0) {
+      break;
+    }
+
+    r = snd_config_get_id(pcm_node, &string);
+    if (r < 0) {
+      break;
+    }
+
+    r = snprintf(node_name, sizeof(node_name), "pcm.%s", string);
+    if (r < 0 || r > (int) sizeof(node_name)) {
+      break;
+    }
+    r = snd_config_search(lconf, node_name, &pcm_node);
+    if (r < 0) {
+      break;
+    }
+
+    /* If this PCM has a slave, walk the slave configurations until we reach the bottom. */
+    while ((node = get_slave_pcm_node(lconf, pcm_node)) != NULL) {
+      pcm_node = node;
+    }
+
+    /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+    r = snd_config_search(pcm_node, "type", &node);
+    if (r < 0) {
+      break;
+    }
+
+    r = snd_config_get_string(node, &string);
+    if (r < 0) {
+      break;
+    }
+
+    if (strcmp(string, "pulse") != 0) {
+      break;
+    }
+
+    /* Don't clobber an explicit existing handle_underrun value, set it only
+       if it doesn't already exist. */
+    r = snd_config_search(pcm_node, "handle_underrun", &node);
+    if (r != -ENOENT) {
+      break;
+    }
+
+    /* Disable pcm_pulse's asynchronous underrun handling. */
+    r = snd_config_imake_integer(&node, "handle_underrun", 0);
+    if (r < 0) {
+      break;
+    }
+
+    r = snd_config_add(pcm_node, node);
+    if (r < 0) {
+      break;
+    }
+
+    return lconf;
+  } while (0);
+
+  snd_config_delete(lconf);
+
+  return NULL;
+}
+
+
 static int
-cubeb_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream)
+cubeb_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream, snd_config_t * local_config)
 {
   int r;
 
   pthread_mutex_lock(&cubeb_alsa_mutex);
-  r = snd_pcm_open(pcm, "default", stream, SND_PCM_NONBLOCK);
+  if (local_config) {
+    r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
+  } else {
+    r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
+  }
   pthread_mutex_unlock(&cubeb_alsa_mutex);
 
   return r;
@@ -471,37 +630,20 @@ cubeb_unregister_stream(cubeb_stream * stm)
 }
 
 static void
-silent_error_handler(char const * file UNUSED, int line UNUSED, char const * function UNUSED,
-                     int err UNUSED, char const * fmt UNUSED, ...)
+silent_error_handler(char const * file, int line, char const * function,
+                     int err, char const * fmt, ...)
 {
 }
 
-static int
-pcm_uses_pulseaudio_plugin(snd_pcm_t * pcm)
-{
-  snd_output_t * out;
-  char * buf;
-  size_t bufsz;
-  int r;
-
-  snd_output_buffer_open(&out);
-  snd_pcm_dump(pcm, out);
-  bufsz = snd_output_buffer_string(out, &buf);
-  r = bufsz >= strlen(ALSA_PA_PLUGIN) &&
-      strncmp(buf, ALSA_PA_PLUGIN, strlen(ALSA_PA_PLUGIN)) == 0;
-  snd_output_close(out);
-
-  return r;
-}
-
 int
-cubeb_init(cubeb ** context, char const * context_name UNUSED)
+cubeb_init(cubeb ** context, char const * context_name)
 {
   cubeb * ctx;
   int r;
   int i;
   int fd[2];
   pthread_attr_t attr;
+  snd_pcm_t * dummy;
 
   assert(context);
   *context = NULL;
@@ -546,13 +688,38 @@ cubeb_init(cubeb ** context, char const * context_name UNUSED)
   r = pthread_attr_destroy(&attr);
   assert(r == 0);
 
+  /* Open a dummy PCM to force the configuration space to be evaluated so that
+     init_local_config_with_workaround can find and modify the default node. */
+  r = cubeb_locked_pcm_open(&dummy, SND_PCM_STREAM_PLAYBACK, NULL);
+  if (r >= 0) {
+    cubeb_locked_pcm_close(dummy);
+  }
+  ctx->is_pa = 0;
+  pthread_mutex_lock(&cubeb_alsa_mutex);
+  ctx->local_config = init_local_config_with_workaround(CUBEB_ALSA_PCM_NAME);
+  pthread_mutex_unlock(&cubeb_alsa_mutex);
+  if (ctx->local_config) {
+    ctx->is_pa = 1;
+    r = cubeb_locked_pcm_open(&dummy, SND_PCM_STREAM_PLAYBACK, ctx->local_config);
+    /* If we got a local_config, we found a PA PCM.  If opening a PCM with that
+       config fails with EINVAL, the PA PCM is too old for this workaround. */
+    if (r == -EINVAL) {
+      pthread_mutex_lock(&cubeb_alsa_mutex);
+      snd_config_delete(ctx->local_config);
+      pthread_mutex_unlock(&cubeb_alsa_mutex);
+      ctx->local_config = NULL;
+    } else if (r >= 0) {
+      cubeb_locked_pcm_close(dummy);
+    }
+  }
+
   *context = ctx;
 
   return CUBEB_OK;
 }
 
 char const *
-cubeb_get_backend_id(cubeb * ctx UNUSED)
+cubeb_get_backend_id(cubeb * ctx)
 {
   return "alsa";
 }
@@ -577,11 +744,17 @@ cubeb_destroy(cubeb * ctx)
   pthread_mutex_destroy(&ctx->mutex);
   free(ctx->fds);
 
+  if (ctx->local_config) {
+    pthread_mutex_lock(&cubeb_alsa_mutex);
+    snd_config_delete(ctx->local_config);
+    pthread_mutex_unlock(&cubeb_alsa_mutex);
+  }
+
   free(ctx);
 }
 
 int
-cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name UNUSED,
+cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,
                   cubeb_stream_params stream_params, unsigned int latency,
                   cubeb_data_callback data_callback, cubeb_state_callback state_callback,
                   void * user_ptr)
@@ -638,7 +811,7 @@ cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name
   r = pthread_mutex_init(&stm->mutex, NULL);
   assert(r == 0);
 
-  r = cubeb_locked_pcm_open(&stm->pcm, SND_PCM_STREAM_PLAYBACK);
+  r = cubeb_locked_pcm_open(&stm->pcm, SND_PCM_STREAM_PLAYBACK, ctx->local_config);
   if (r < 0) {
     cubeb_stream_destroy(stm);
     return CUBEB_ERROR;
@@ -648,9 +821,10 @@ cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name
   assert(r == 0);
 
   /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-     possibly work.  See https://bugzilla.mozilla.org/show_bug.cgi?id=761274 */
-  if (pcm_uses_pulseaudio_plugin(stm->pcm)) {
-    latency = latency < 200 ? 200 : latency;
+     possibly work.  See https://bugzilla.mozilla.org/show_bug.cgi?id=761274.
+     Only resort to this hack if the handle_underrun workaround failed. */
+  if (!ctx->local_config && ctx->is_pa) {
+    latency = latency < 500 ? 500 : latency;
   }
 
   r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,

From 23815ea3d037501204e0ee92c671af1117b77444 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Tue, 13 Nov 2012 18:19:00 +1300
Subject: [PATCH 53/76] Bug 788005 - Work around Vista's higher latency
 requirements in WinMM.  r=doublec

---
 media/libcubeb/README_MOZILLA    |  4 +---
 media/libcubeb/src/cubeb_winmm.c | 35 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA
index 240f780bae9c..df3103650861 100644
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -5,6 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was dfdf4a3c0f813717819f633f8bd3099c3e58ee8a.
-Plus the single commit 1bc23c6e2e4920f38f7aa56ec56ef5e379e18cf7.
-Plus the single commit 6e9ffc59202f95f09e5adb895d10eaedf36a6ea2.
+The git commit ID used was 6e9ffc59202f95f09e5adb895d10eaedf36a6ea2.
diff --git a/media/libcubeb/src/cubeb_winmm.c b/media/libcubeb/src/cubeb_winmm.c
index 01e0fb0a54b9..245359c4921d 100644
--- a/media/libcubeb/src/cubeb_winmm.c
+++ b/media/libcubeb/src/cubeb_winmm.c
@@ -33,6 +33,7 @@ struct cubeb {
   PSLIST_HEADER work;
   CRITICAL_SECTION lock;
   unsigned int active_streams;
+  int minimum_latency;
 };
 
 struct cubeb_stream {
@@ -190,6 +191,34 @@ cubeb_buffer_callback(HWAVEOUT waveout, UINT msg, DWORD_PTR user_ptr, DWORD_PTR
   SetEvent(stm->context->event);
 }
 
+static int
+calculate_minimum_latency(void)
+{
+  OSVERSIONINFOEX osvi;
+  DWORDLONG mask;
+
+  /* Vista's WinMM implementation underruns when less than 200ms of audio is buffered. */
+  memset(&osvi, 0, sizeof(OSVERSIONINFOEX));
+  osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+  osvi.dwMajorVersion = 6;
+  osvi.dwMinorVersion = 0;
+
+  mask = 0;
+  VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_EQUAL);
+  VER_SET_CONDITION(mask, VER_MINORVERSION, VER_EQUAL);
+
+  if (VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, mask) != 0) {
+    return 200;
+  }
+
+  /* Running under Terminal Services results in underruns with low latency. */
+  if (GetSystemMetrics(SM_REMOTESESSION) == TRUE) {
+    return 500;
+  }
+
+  return 0;
+}
+
 int
 cubeb_init(cubeb ** context, char const * context_name)
 {
@@ -222,6 +251,8 @@ cubeb_init(cubeb ** context, char const * context_name)
   InitializeCriticalSection(&ctx->lock);
   ctx->active_streams = 0;
 
+  ctx->minimum_latency = calculate_minimum_latency();
+
   *context = ctx;
 
   return CUBEB_OK;
@@ -342,6 +373,10 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
   stm->state_callback = state_callback;
   stm->user_ptr = user_ptr;
 
+  if (latency < context->minimum_latency) {
+    latency = context->minimum_latency;
+  }
+
   bufsz = (size_t) (stm->params.rate / 1000.0 * latency * bytes_per_frame(stm->params) / NBUFS);
   if (bufsz % bytes_per_frame(stm->params) != 0) {
     bufsz += bytes_per_frame(stm->params) - (bufsz % bytes_per_frame(stm->params));

From 6c2286a12d01146149a99f631aa75bf027285e39 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 14 Nov 2012 15:27:34 +1100
Subject: [PATCH 54/76] Bug 804591 - opening an existing chat window should
 restore it if minimized.  r=jaws

---
 browser/base/content/socialchat.xml           |  5 +-
 .../content/test/browser_social_chatwindow.js | 79 +++++++++++++++++++
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index 4363e713bee5..c21c55b82cf7 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -279,8 +279,9 @@
 
       <method name="showChat">
         <parameter name="aChatbox"/>
+        <parameter name="aMode"/>
         <body><![CDATA[
-          if (aChatbox.minimized)
+          if ((aMode != "minimized") && aChatbox.minimized)
             aChatbox.minimized = false;
           if (this.selectedChat != aChatbox)
             this.selectedChat = aChatbox;
@@ -353,7 +354,7 @@
           if (cb) {
             cb = cb.get();
             if (cb.parentNode) {
-              this.showChat(cb);
+              this.showChat(cb, aMode);
               if (aCallback)
                 aCallback(cb.iframe.contentWindow);
               return;
diff --git a/browser/base/content/test/browser_social_chatwindow.js b/browser/base/content/test/browser_social_chatwindow.js
index 9a1cbc92f125..b7d35169a99d 100644
--- a/browser/base/content/test/browser_social_chatwindow.js
+++ b/browser/base/content/test/browser_social_chatwindow.js
@@ -60,6 +60,85 @@ var tests = {
     }
     port.postMessage({topic: "test-init", data: { id: 1 }});
   },
+  testOpenMinimized: function(next) {
+    // In this case the sidebar opens a chat (without specifying minimized).
+    // We then minimize it and have the sidebar reopen the chat (again without
+    // minimized).  On that second call the chat should open and no longer
+    // be minimized.
+    let chats = document.getElementById("pinnedchats");
+    let port = Social.provider.getWorkerPort();
+    let seen_opened = false;
+    port.onmessage = function (e) {
+      let topic = e.data.topic;
+      switch (topic) {
+        case "test-init-done":
+          port.postMessage({topic: "test-chatbox-open"});
+          break;
+        case "chatbox-opened":
+          is(e.data.result, "ok", "the sidebar says it got a chatbox");
+          if (!seen_opened) {
+            // first time we got the opened message, so minimize the chat then
+            // re-request the same chat to be opened - we should get the
+            // message again and the chat should be restored.
+            ok(!chats.selectedChat.minimized, "chat not initially minimized")
+            chats.selectedChat.minimized = true
+            seen_opened = true;
+            port.postMessage({topic: "test-chatbox-open"});
+          } else {
+            // This is the second time we've seen this message - there should
+            // be exactly 1 chat open and it should no longer be minimized.
+            let chats = document.getElementById("pinnedchats");
+            ok(!chats.selectedChat.minimized, "chat no longer minimized")
+            chats.selectedChat.close();
+            is(chats.selectedChat, null, "should only have been one chat open");
+            port.close();
+            next();
+          }
+      }
+    }
+    port.postMessage({topic: "test-init", data: { id: 1 }});
+  },
+  // In this case the *worker* opens a chat (so minimized is specified).
+  // The worker then makes the same call again - as that second call also
+  // specifies "minimized" the chat should *not* be restored.
+  testWorkerChatWindowMinimized: function(next) {
+    const chatUrl = "https://example.com/browser/browser/base/content/test/social_chat.html";
+    let port = Social.provider.getWorkerPort();
+    let seen_opened = false;
+    ok(port, "provider has a port");
+    port.postMessage({topic: "test-init"});
+    port.onmessage = function (e) {
+      let topic = e.data.topic;
+      switch (topic) {
+        case "got-chatbox-message":
+          ok(true, "got a chat window opened");
+          let chats = document.getElementById("pinnedchats");
+          if (!seen_opened) {
+            // first time we got the opened message, so minimize the chat then
+            // re-request the same chat to be opened - we should get the
+            // message again and the chat should be restored.
+            ok(chats.selectedChat.minimized, "chatbox from worker opened as minimized");
+            seen_opened = true;
+            port.postMessage({topic: "test-worker-chat", data: chatUrl});
+            // Sadly there is no notification we can use to know the chat was
+            // re-opened :(  So we ask the chat window to "ping" us - by then
+            // the second request should have made it.
+            chats.selectedChat.iframe.contentWindow.wrappedJSObject.pingWorker();
+          } else {
+            // This is the second time we've seen this message - there should
+            // be exactly 1 chat open and it should still be minimized.
+            let chats = document.getElementById("pinnedchats");
+            ok(chats.selectedChat.minimized, "chat still minimized")
+            chats.selectedChat.close();
+            is(chats.selectedChat, null, "should only have been one chat open");
+            port.close();
+            next();
+          }
+          break;
+      }
+    }
+    port.postMessage({topic: "test-worker-chat", data: chatUrl});
+  },
   testManyChats: function(next) {
     // open enough chats to overflow the window, then check
     // if the menupopup is visible

From ec605d4e0e36fd7911f508dba81e1d8cf17e1776 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 14 Nov 2012 15:27:41 +1100
Subject: [PATCH 55/76] Bug 809274 - avoid console errors if sidebar set
 invisible multiple times without ever becoming visible.  r=felipe

---
 browser/base/content/browser-social.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 253fe6c1865f..63f820af505e 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -982,7 +982,11 @@ var SocialSidebar = {
 
   setSidebarVisibilityState: function(aEnabled) {
     let sbrowser = document.getElementById("social-sidebar-browser");
-    sbrowser.docShell.isActive = aEnabled;
+    // it's possible we'll be called twice with aEnabled=false so let's
+    // just assume we may often be called with the same state.
+    if (aEnabled == sbrowser.docShellIsActive)
+      return;
+    sbrowser.docShellIsActive = aEnabled;
     let evt = sbrowser.contentDocument.createEvent("CustomEvent");
     evt.initCustomEvent(aEnabled ? "socialFrameShow" : "socialFrameHide", true, true, {});
     sbrowser.contentDocument.documentElement.dispatchEvent(evt);

From e907939a76a45b5ce03ff9f8d5b8feb445014a94 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Tue, 13 Nov 2012 16:35:36 -0800
Subject: [PATCH 56/76] Bug 800556; remove nsIDOMCanvasRenderingContext2D;
 r=Ms2ger,sr=bz

--HG--
extra : rebase_source : 461ff127a453116f3364f4ba1e414cc527f195bd
---
 .../canvas/src/CanvasRenderingContext2D.cpp   | 910 +-----------------
 content/canvas/src/CanvasRenderingContext2D.h |  51 +-
 content/canvas/src/Makefile.in                |   1 +
 .../html/content/src/nsHTMLCanvasElement.cpp  |  28 +-
 .../canvas/nsIDOMCanvasRenderingContext2D.idl | 229 +----
 layout/build/nsLayoutModule.cpp               |   6 -
 widget/nsITaskbarPreviewController.idl        |   5 +-
 widget/windows/TaskbarPreview.cpp             |  31 +-
 widget/windows/WinTaskbar.cpp                 |   4 +-
 9 files changed, 84 insertions(+), 1181 deletions(-)

diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index 88bd1830cc5d..8c635b425ca9 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -117,17 +117,6 @@ namespace mgfx = mozilla::gfx;
 #define NS_TEXTMETRICSAZURE_PRIVATE_IID \
   {0x9793f9e7, 0x9dc1, 0x4e9c, {0x81, 0xc8, 0xfc, 0xa7, 0x14, 0xf4, 0x30, 0x79}}
 
-nsresult
-NS_NewCanvasRenderingContext2D(nsIDOMCanvasRenderingContext2D** aResult)
-{
-  Telemetry::Accumulate(Telemetry::CANVAS_2D_USED, 1);
-  nsRefPtr<nsIDOMCanvasRenderingContext2D> ctx =
-    new mozilla::dom::CanvasRenderingContext2D();
-
-  ctx.forget(aResult);
-  return NS_OK;
-}
-
 namespace mozilla {
 namespace dom {
 
@@ -534,10 +523,8 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CanvasRenderingContext2D)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasRenderingContext2D)
   NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextInternal)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports,
-                                   nsICanvasRenderingContextInternal)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 /**
@@ -667,33 +654,6 @@ CanvasRenderingContext2D::SetStyleFromString(const nsAString& str,
   CurrentState().SetColorStyle(whichStyle, color);
 }
 
-void
-CanvasRenderingContext2D::SetStyleFromStringOrInterface(const nsAString& aStr,
-                                                        nsISupports *aInterface,
-                                                        Style aWhichStyle)
-{
-  if (!aStr.IsVoid()) {
-    SetStyleFromString(aStr, aWhichStyle);
-    return;
-  }
-
-  if (aInterface) {
-    nsCOMPtr<CanvasGradient> grad(do_QueryInterface(aInterface));
-    if (grad) {
-      SetStyleFromGradient(grad, aWhichStyle);
-      return;
-    }
-
-    nsCOMPtr<CanvasPattern> pattern(do_QueryInterface(aInterface));
-    if (pattern) {
-      SetStyleFromPattern(pattern, aWhichStyle);
-      return;
-    }
-  }
-
-  WarnAboutUnexpectedStyle(mCanvasElement);
-}
-
 nsISupports*
 CanvasRenderingContext2D::GetStyleAsStringOrInterface(nsAString& aStr,
                                                       CanvasMultiGetterType& aType,
@@ -1066,20 +1026,6 @@ CanvasRenderingContext2D::GetSurfaceFormat() const
   return mOpaque ? FORMAT_B8G8R8X8 : FORMAT_B8G8R8A8;
 }
 
-//
-// CanvasRenderingContext2D impl
-//
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetCanvas(nsIDOMHTMLCanvasElement **canvas)
-{
-  if (mCanvasElement) {
-    NS_IF_ADDREF(*canvas = mCanvasElement->GetOriginalCanvas());
-  }
-
-  return NS_OK;
-}
-
 //
 // state
 //
@@ -1093,13 +1039,6 @@ CanvasRenderingContext2D::Save()
   mStyleStack.AppendElement(CurrentState());
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozSave()
-{
-  Save();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::Restore()
 {
@@ -1117,13 +1056,6 @@ CanvasRenderingContext2D::Restore()
   mTarget->SetTransform(CurrentState().transform);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozRestore()
-{
-  Restore();
-  return NS_OK;
-}
-
 //
 // transformations
 //
@@ -1145,14 +1077,6 @@ CanvasRenderingContext2D::Scale(double x, double y, ErrorResult& error)
   mTarget->SetTransform(newMatrix.Scale(x, y));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Scale(float x, float y)
-{
-  ErrorResult rv;
-  Scale((double)x, (double)y, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::Rotate(double angle, ErrorResult& error)
 {
@@ -1171,14 +1095,6 @@ CanvasRenderingContext2D::Rotate(double angle, ErrorResult& error)
   mTarget->SetTransform(rotation * mTarget->GetTransform());
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Rotate(float angle)
-{
-  ErrorResult rv;
-  Rotate((double)angle, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::Translate(double x, double y, ErrorResult& error)
 {
@@ -1196,14 +1112,6 @@ CanvasRenderingContext2D::Translate(double x, double y, ErrorResult& error)
   mTarget->SetTransform(newMatrix.Translate(x, y));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Translate(float x, float y)
-{
-  ErrorResult rv;
-  Translate((double)x, (double)y, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::Transform(double m11, double m12, double m21,
                                     double m22, double dx, double dy,
@@ -1223,15 +1131,6 @@ CanvasRenderingContext2D::Transform(double m11, double m12, double m21,
   mTarget->SetTransform(matrix * mTarget->GetTransform());
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Transform(float m11, float m12, float m21, float m22, float dx, float dy)
-{
-  ErrorResult rv;
-  Transform((double)m11, (double)m12, (double)m21, (double)m22, (double)dx,
-            (double)dy, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::SetTransform(double m11, double m12,
                                        double m21, double m22,
@@ -1252,15 +1151,6 @@ CanvasRenderingContext2D::SetTransform(double m11, double m12,
   mTarget->SetTransform(matrix);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetTransform(float m11, float m12, float m21, float m22, float dx, float dy)
-{
-  ErrorResult rv;
-  SetTransform((double)m11, (double)m12, (double)m21, (double)m22, (double)dx,
-               (double)dy, rv);
-  return rv.ErrorCode();
-}
-
 JSObject*
 MatrixToJSObject(JSContext* cx, const Matrix& matrix, ErrorResult& error)
 {
@@ -1327,19 +1217,6 @@ CanvasRenderingContext2D::SetMozCurrentTransform(JSContext* cx,
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozCurrentTransform(JSContext* cx,
-                                                 const jsval& matrix)
-{
-  if (!matrix.isObject()) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  ErrorResult rv;
-  SetMozCurrentTransform(cx, matrix.toObject(), rv);
-  return rv.ErrorCode();
-}
-
 JSObject*
 CanvasRenderingContext2D::GetMozCurrentTransform(JSContext* cx,
                                                  ErrorResult& error) const
@@ -1347,18 +1224,6 @@ CanvasRenderingContext2D::GetMozCurrentTransform(JSContext* cx,
   return MatrixToJSObject(cx, mTarget ? mTarget->GetTransform() : Matrix(), error);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozCurrentTransform(JSContext* cx,
-                                                 jsval* matrix)
-{
-  ErrorResult rv;
-  JSObject* obj = GetMozCurrentTransform(cx, rv);
-  if (!rv.Failed()) {
-    *matrix = OBJECT_TO_JSVAL(obj);
-  }
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::SetMozCurrentTransformInverse(JSContext* cx,
                                                         JSObject& currentTransform,
@@ -1379,19 +1244,6 @@ CanvasRenderingContext2D::SetMozCurrentTransformInverse(JSContext* cx,
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozCurrentTransformInverse(JSContext* cx,
-                                                        const jsval& matrix)
-{
-  if (!matrix.isObject()) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  ErrorResult rv;
-  SetMozCurrentTransformInverse(cx, matrix.toObject(), rv);
-  return rv.ErrorCode();
-}
-
 JSObject*
 CanvasRenderingContext2D::GetMozCurrentTransformInverse(JSContext* cx,
                                                         ErrorResult& error) const
@@ -1410,36 +1262,10 @@ CanvasRenderingContext2D::GetMozCurrentTransformInverse(JSContext* cx,
   return MatrixToJSObject(cx, ctm, error);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozCurrentTransformInverse(JSContext* cx,
-                                                        jsval* matrix)
-{
-  ErrorResult rv;
-  JSObject* obj = GetMozCurrentTransformInverse(cx, rv);
-  if (!rv.Failed()) {
-    *matrix = OBJECT_TO_JSVAL(obj);
-  }
-  return rv.ErrorCode();
-}
-
 //
 // colors
 //
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetGlobalAlpha(float aGlobalAlpha)
-{
-  SetGlobalAlpha((double)aGlobalAlpha);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetGlobalAlpha(float *aGlobalAlpha)
-{
-  *aGlobalAlpha = GlobalAlpha();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetStyleFromJSValue(JSContext* cx,
                                               JS::Value& value,
@@ -1480,19 +1306,19 @@ CanvasRenderingContext2D::SetStyleFromJSValue(JSContext* cx,
 
 static JS::Value
 WrapStyle(JSContext* cx, JSObject* obj,
-          nsIDOMCanvasRenderingContext2D::CanvasMultiGetterType type,
+          CanvasRenderingContext2D::CanvasMultiGetterType type,
           nsAString& str, nsISupports* supports, ErrorResult& error)
 {
   JS::Value v;
   bool ok;
   switch (type) {
-    case nsIDOMCanvasRenderingContext2D::CMG_STYLE_STRING:
+    case CanvasRenderingContext2D::CMG_STYLE_STRING:
     {
       ok = xpc::StringToJsval(cx, str, &v);
       break;
     }
-    case nsIDOMCanvasRenderingContext2D::CMG_STYLE_PATTERN:
-    case nsIDOMCanvasRenderingContext2D::CMG_STYLE_GRADIENT:
+    case CanvasRenderingContext2D::CMG_STYLE_PATTERN:
+    case CanvasRenderingContext2D::CMG_STYLE_GRADIENT:
     {
       ok = dom::WrapObject(cx, obj, supports, &v);
       break;
@@ -1506,39 +1332,6 @@ WrapStyle(JSContext* cx, JSObject* obj,
   return v;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetStrokeStyle(nsIVariant *aValue)
-{
-  if (!aValue)
-      return NS_ERROR_FAILURE;
-
-  nsString str;
-
-  nsresult rv;
-  uint16_t vtype;
-  rv = aValue->GetDataType(&vtype);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (vtype == nsIDataType::VTYPE_INTERFACE ||
-      vtype == nsIDataType::VTYPE_INTERFACE_IS)
-  {
-    nsIID *iid;
-    nsCOMPtr<nsISupports> sup;
-    rv = aValue->GetAsInterface(&iid, getter_AddRefs(sup));
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (iid) {
-      NS_Free(iid);
-    }
-
-    str.SetIsVoid(true);
-    return SetStrokeStyle_multi(str, sup);
-  }
-
-  rv = aValue->GetAsAString(str);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return SetStrokeStyle_multi(str, nullptr);
-}
 
 JS::Value
 CanvasRenderingContext2D::GetStrokeStyle(JSContext* cx,
@@ -1550,66 +1343,6 @@ CanvasRenderingContext2D::GetStrokeStyle(JSContext* cx,
   return WrapStyle(cx, GetWrapper(), t, str, supports, error);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetStrokeStyle(nsIVariant **aResult)
-{
-  nsCOMPtr<nsIWritableVariant> wv = do_CreateInstance(NS_VARIANT_CONTRACTID);
-
-  nsCOMPtr<nsISupports> sup;
-  nsString str;
-  int32_t t;
-  nsresult rv = GetStrokeStyle_multi(str, getter_AddRefs(sup), &t);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (t == CMG_STYLE_STRING) {
-    rv = wv->SetAsAString(str);
-  } else if (t == CMG_STYLE_PATTERN) {
-    rv = wv->SetAsInterface(NS_GET_IID(nsIDOMCanvasPattern),
-                            sup);
-  } else if (t == CMG_STYLE_GRADIENT) {
-    rv = wv->SetAsInterface(NS_GET_IID(nsIDOMCanvasGradient),
-                            sup);
-  } else {
-    NS_ERROR("Unknown type from GetStroke/FillStyle_multi!");
-    return NS_ERROR_FAILURE;
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  NS_IF_ADDREF(*aResult = wv.get());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetFillStyle(nsIVariant *aValue)
-{
-  if (!aValue) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsString str;
-  nsresult rv;
-  uint16_t vtype;
-  rv = aValue->GetDataType(&vtype);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (vtype == nsIDataType::VTYPE_INTERFACE ||
-      vtype == nsIDataType::VTYPE_INTERFACE_IS)
-  {
-    nsIID *iid;
-    nsCOMPtr<nsISupports> sup;
-    rv = aValue->GetAsInterface(&iid, getter_AddRefs(sup));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    str.SetIsVoid(true);
-    return SetFillStyle_multi(str, sup);
-  }
-
-  rv = aValue->GetAsAString(str);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return SetFillStyle_multi(str, nullptr);
-}
-
 JS::Value
 CanvasRenderingContext2D::GetFillStyle(JSContext* cx,
                                        ErrorResult& error)
@@ -1620,35 +1353,6 @@ CanvasRenderingContext2D::GetFillStyle(JSContext* cx,
   return WrapStyle(cx, GetWrapper(), t, str, supports, error);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetFillStyle(nsIVariant **aResult)
-{
-  nsCOMPtr<nsIWritableVariant> wv = do_CreateInstance(NS_VARIANT_CONTRACTID);
-
-  nsCOMPtr<nsISupports> sup;
-  nsString str;
-  int32_t t;
-  nsresult rv = GetFillStyle_multi(str, getter_AddRefs(sup), &t);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (t == CMG_STYLE_STRING) {
-    rv = wv->SetAsAString(str);
-  } else if (t == CMG_STYLE_PATTERN) {
-    rv = wv->SetAsInterface(NS_GET_IID(nsIDOMCanvasPattern),
-                            sup);
-  } else if (t == CMG_STYLE_GRADIENT) {
-    rv = wv->SetAsInterface(NS_GET_IID(nsIDOMCanvasGradient),
-                            sup);
-  } else {
-    NS_ERROR("Unknown type from GetStroke/FillStyle_multi!");
-    return NS_ERROR_FAILURE;
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  NS_IF_ADDREF(*aResult = wv.get());
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetFillRule(const nsAString& aString)
 {
@@ -1664,63 +1368,16 @@ CanvasRenderingContext2D::SetFillRule(const nsAString& aString)
   CurrentState().fillRule = rule;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozFillRule(const nsAString& aString)
-{
-  SetFillRule(aString);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::GetFillRule(nsAString& aString)
 {
-    switch (CurrentState().fillRule) {
-    case FILL_WINDING:
-      aString.AssignLiteral("nonzero"); break;
-    case FILL_EVEN_ODD:
-      aString.AssignLiteral("evenodd"); break;
-    }
+  switch (CurrentState().fillRule) {
+  case FILL_WINDING:
+    aString.AssignLiteral("nonzero"); break;
+  case FILL_EVEN_ODD:
+    aString.AssignLiteral("evenodd"); break;
+  }
 }
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozFillRule(nsAString& aString)
-{
-  GetFillRule(aString);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetStrokeStyle_multi(const nsAString& aStr, nsISupports *aInterface)
-{
-  SetStyleFromStringOrInterface(aStr, aInterface, STYLE_STROKE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetStrokeStyle_multi(nsAString& aStr, nsISupports **aInterface, int32_t *aType)
-{
-  CanvasMultiGetterType type;
-  NS_IF_ADDREF(*aInterface = GetStyleAsStringOrInterface(aStr, type, STYLE_STROKE));
-  *aType = type;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetFillStyle_multi(const nsAString& aStr, nsISupports *aInterface)
-{
-  SetStyleFromStringOrInterface(aStr, aInterface, STYLE_FILL);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetFillStyle_multi(nsAString& aStr, nsISupports **aInterface, int32_t *aType)
-{
-  CanvasMultiGetterType type;
-  NS_IF_ADDREF(*aInterface = GetStyleAsStringOrInterface(aStr, type, STYLE_FILL));
-  *aType = type;
-  return NS_OK;
-}
-
 //
 // gradients and patterns
 //
@@ -1739,15 +1396,6 @@ CanvasRenderingContext2D::CreateLinearGradient(double x0, double y0, double x1,
   return grad.forget();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::CreateLinearGradient(float x0, float y0, float x1, float y1,
-                                               nsIDOMCanvasGradient **_retval)
-{
-  ErrorResult rv;
-  *_retval = CreateLinearGradient(x0, y0, x1, y1, rv).get();
-  return rv.ErrorCode();
-}
-
 already_AddRefed<nsIDOMCanvasGradient>
 CanvasRenderingContext2D::CreateRadialGradient(double x0, double y0, double r0,
                                                double x1, double y1, double r1,
@@ -1769,16 +1417,6 @@ CanvasRenderingContext2D::CreateRadialGradient(double x0, double y0, double r0,
   return grad.forget();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::CreateRadialGradient(float x0, float y0, float r0,
-                                               float x1, float y1, float r1,
-                                               nsIDOMCanvasGradient **_retval)
-{
-  ErrorResult rv;
-  *_retval = CreateRadialGradient(x0, y0, r0, x1, y1, r1, rv).get();
-  return rv.ErrorCode();
-}
-
 already_AddRefed<nsIDOMCanvasPattern>
 CanvasRenderingContext2D::CreatePattern(const HTMLImageOrCanvasOrVideoElement& element,
                                         const nsAString& repeat,
@@ -1855,66 +1493,9 @@ CanvasRenderingContext2D::CreatePattern(const HTMLImageOrCanvasOrVideoElement& e
   return pat.forget();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::CreatePattern(nsIDOMHTMLElement *image,
-                                        const nsAString& repeat,
-                                        nsIDOMCanvasPattern **_retval)
-{
-  HTMLImageOrCanvasOrVideoElement element;
-  if (!ToHTMLImageOrCanvasOrVideoElement(image, element)) {
-    return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
-  }
-
-  ErrorResult rv;
-  *_retval = CreatePattern(element, repeat, rv).get();
-  return rv.ErrorCode();
-}
-
 //
 // shadows
 //
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetShadowOffsetX(float x)
-{
-  SetShadowOffsetX((double)x);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetShadowOffsetX(float *x)
-{
-  *x = static_cast<float>(ShadowOffsetX());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetShadowOffsetY(float y)
-{
-  SetShadowOffsetY((double)y);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetShadowOffsetY(float *y)
-{
-  *y = static_cast<float>(ShadowOffsetY());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetShadowBlur(float blur)
-{
-  SetShadowBlur((double)blur);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetShadowBlur(float *blur)
-{
-  *blur = ShadowBlur();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetShadowColor(const nsAString& shadowColor)
 {
@@ -1926,20 +1507,6 @@ CanvasRenderingContext2D::SetShadowColor(const nsAString& shadowColor)
   CurrentState().shadowColor = color;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozShadowColor(const nsAString& colorstr)
-{
-  SetShadowColor(colorstr);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozShadowColor(nsAString& color)
-{
-  GetShadowColor(color);
-  return NS_OK;
-}
-
 //
 // rects
 //
@@ -1957,13 +1524,6 @@ CanvasRenderingContext2D::ClearRect(double x, double y, double w,
   RedrawUser(gfxRect(x, y, w, h));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::ClearRect(float x, float y, float w, float h)
-{
-  ClearRect((double)x, (double)y, (double)w, (double)h);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::FillRect(double x, double y, double w,
                                    double h)
@@ -2036,13 +1596,6 @@ CanvasRenderingContext2D::FillRect(double x, double y, double w,
   RedrawUser(gfxRect(x, y, w, h));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::FillRect(float x, float y, float w, float h)
-{
-  FillRect((double)x, (double)y, (double)w, (double)h);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::StrokeRect(double x, double y, double w,
                                      double h)
@@ -2117,13 +1670,6 @@ CanvasRenderingContext2D::StrokeRect(double x, double y, double w,
   Redraw();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::StrokeRect(float x, float y, float w, float h)
-{
-  StrokeRect((double)x, (double)y, (double)w, (double)h);
-  return NS_OK;
-}
-
 //
 // path bits
 //
@@ -2137,20 +1683,6 @@ CanvasRenderingContext2D::BeginPath()
   mPathTransformWillUpdate = false;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozBeginPath()
-{
-  BeginPath();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozClosePath()
-{
-  ClosePath();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::Fill()
 {
@@ -2173,13 +1705,6 @@ CanvasRenderingContext2D::Fill()
   Redraw();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozFill()
-{
-  Fill();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::Stroke()
 {
@@ -2209,13 +1734,6 @@ CanvasRenderingContext2D::Stroke()
   Redraw();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozStroke()
-{
-  Stroke();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::Clip()
 {
@@ -2229,45 +1747,6 @@ CanvasRenderingContext2D::Clip()
   CurrentState().clipsPushed.push_back(mPath);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozClip()
-{
-  Clip();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::MoveTo(float x, float y)
-{
-  MoveTo((double)x, (double)y);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::LineTo(float x, float y)
-{
-  LineTo((double)x, (double)y);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::QuadraticCurveTo(float cpx, float cpy, float x,
-                                           float y)
-{
-  QuadraticCurveTo((double)cpx, (double)cpy, (double)x, (double)y);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::BezierCurveTo(float cp1x, float cp1y,
-                                        float cp2x, float cp2y,
-                                        float x, float y)
-{
-  BezierCurveTo((double)cp1x, (double)cp1y, (double)cp2x, (double)cp2y,
-                (double)x, (double)y);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::ArcTo(double x1, double y1, double x2,
                                 double y2, double radius,
@@ -2347,15 +1826,7 @@ CanvasRenderingContext2D::ArcTo(double x1, double y1, double x2,
 
   LineTo(x3, y3);
 
-  Arc(cx, cy, radius, angle0, angle1, anticlockwise);
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::ArcTo(float x1, float y1, float x2, float y2, float radius)
-{
-  ErrorResult rv;
-  ArcTo(x1, y1, x2, y2, radius, rv);
-  return rv.ErrorCode();
+  Arc(cx, cy, radius, angle0, angle1, anticlockwise, error);
 }
 
 void
@@ -2377,17 +1848,6 @@ CanvasRenderingContext2D::Arc(double x, double y, double r,
   ArcToBezier(this, Point(x, y), r, startAngle, endAngle, anticlockwise);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Arc(float x, float y,
-                              float r,
-                              float startAngle, float endAngle,
-                              bool ccw)
-{
-  ErrorResult rv;
-  Arc(x, y, r, startAngle, endAngle, ccw, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::Rect(double x, double y, double w, double h)
 {
@@ -2412,13 +1872,6 @@ CanvasRenderingContext2D::Rect(double x, double y, double w, double h)
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::Rect(float x, float y, float w, float h)
-{
-  Rect((double)x, (double)y, (double)w, (double)h);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::EnsureWritablePath()
 {
@@ -2714,21 +2167,6 @@ CanvasRenderingContext2D::SetFont(const nsAString& font,
   declaration->GetValue(eCSSProperty_font, CurrentState().font);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozFont(const nsAString& font)
-{
-  ErrorResult rv;
-  SetFont(font, rv);
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozFont(nsAString& font)
-{
-  font = GetFont();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetTextAlign(const nsAString& ta)
 {
@@ -2744,13 +2182,6 @@ CanvasRenderingContext2D::SetTextAlign(const nsAString& ta)
     CurrentState().textAlign = TEXT_ALIGN_CENTER;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozTextAlign(const nsAString& ta)
-{
-  SetTextAlign(ta);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::GetTextAlign(nsAString& ta)
 {
@@ -2774,13 +2205,6 @@ CanvasRenderingContext2D::GetTextAlign(nsAString& ta)
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozTextAlign(nsAString& ta)
-{
-  GetTextAlign(ta);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetTextBaseline(const nsAString& tb)
 {
@@ -2798,13 +2222,6 @@ CanvasRenderingContext2D::SetTextBaseline(const nsAString& tb)
     CurrentState().textBaseline = TEXT_BASELINE_BOTTOM;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozTextBaseline(const nsAString& tb)
-{
-  SetTextBaseline(tb);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::GetTextBaseline(nsAString& tb)
 {
@@ -2831,13 +2248,6 @@ CanvasRenderingContext2D::GetTextBaseline(nsAString& tb)
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozTextBaseline(nsAString& tb)
-{
-  GetTextBaseline(tb);
-  return NS_OK;
-}
-
 /*
  * Helper function that replaces the whitespace characters in a string
  * with U+0020 SPACE. The whitespace characters are defined as U+0020 SPACE,
@@ -2860,17 +2270,6 @@ CanvasRenderingContext2D::FillText(const nsAString& text, double x,
   error = DrawOrMeasureText(text, x, y, maxWidth, TEXT_DRAW_OPERATION_FILL, nullptr);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::FillText(const nsAString& text, float x, float y, float maxWidth)
-{
-  ErrorResult rv;
-  Optional<double> optionalMaxWidth;
-  optionalMaxWidth.Construct();
-  optionalMaxWidth.Value() = maxWidth;
-  FillText(text, x, y, optionalMaxWidth, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::StrokeText(const nsAString& text, double x,
                                      double y,
@@ -2880,17 +2279,6 @@ CanvasRenderingContext2D::StrokeText(const nsAString& text, double x,
   error = DrawOrMeasureText(text, x, y, maxWidth, TEXT_DRAW_OPERATION_STROKE, nullptr);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::StrokeText(const nsAString& text, float x, float y, float maxWidth)
-{
-  ErrorResult rv;
-  Optional<double> optionalMaxWidth;
-  optionalMaxWidth.Construct();
-  optionalMaxWidth.Value() = maxWidth;
-  StrokeText(text, x, y, optionalMaxWidth, rv);
-  return rv.ErrorCode();
-}
-
 already_AddRefed<nsIDOMTextMetrics>
 CanvasRenderingContext2D::MeasureText(const nsAString& rawText,
                                       ErrorResult& error)
@@ -2907,15 +2295,6 @@ CanvasRenderingContext2D::MeasureText(const nsAString& rawText,
   return textMetrics.forget();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MeasureText(const nsAString& rawText,
-                                      nsIDOMTextMetrics** _retval)
-{
-  ErrorResult rv;
-  *_retval = MeasureText(rawText, rv).get();
-  return rv.ErrorCode();
-}
-
 /**
  * Used for nsBidiPresUtils::ProcessText
  */
@@ -3386,27 +2765,13 @@ CanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetTextStyle(const nsAString& textStyle)
-{
-  ErrorResult rv;
-  SetMozTextStyle(textStyle, rv);
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetTextStyle(nsAString& textStyle)
-{
-  GetMozTextStyle(textStyle);
-  return NS_OK;
-}
-
 gfxFontGroup *CanvasRenderingContext2D::GetCurrentFontStyle()
 {
   // use lazy initilization for the font group since it's rather expensive
   if (!CurrentState().fontGroup) {
-    nsresult rv = SetMozFont(kDefaultFontStyle);
-    if (NS_FAILED(rv)) {
+    ErrorResult err;
+    SetFont(kDefaultFontStyle, err);
+    if (err.Failed()) {
       gfxFontStyle style;
       style.size = kDefaultFontSize;
       CurrentState().fontGroup =
@@ -3415,13 +2780,11 @@ gfxFontGroup *CanvasRenderingContext2D::GetCurrentFontStyle()
                                                     nullptr);
       if (CurrentState().fontGroup) {
         CurrentState().font = kDefaultFontStyle;
-        rv = NS_OK;
       } else {
-        rv = NS_ERROR_OUT_OF_MEMORY;
+        NS_ERROR("Default canvas font is invalid");
       }
     }
 
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Default canvas font is invalid");
   }
 
   return CurrentState().fontGroup;
@@ -3431,20 +2794,6 @@ gfxFontGroup *CanvasRenderingContext2D::GetCurrentFontStyle()
 // line caps/joins
 //
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetLineWidth(float width)
-{
-  SetLineWidth((double)width);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetLineWidth(float *width)
-{
-  *width = LineWidth();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetLineCap(const nsAString& capstyle)
 {
@@ -3464,13 +2813,6 @@ CanvasRenderingContext2D::SetLineCap(const nsAString& capstyle)
   CurrentState().lineCap = cap;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozLineCap(const nsAString& capstyle)
-{
-  SetLineCap(capstyle);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::GetLineCap(nsAString& capstyle)
 {
@@ -3487,13 +2829,6 @@ CanvasRenderingContext2D::GetLineCap(nsAString& capstyle)
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozLineCap(nsAString& capstyle)
-{
-  GetLineCap(capstyle);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetLineJoin(const nsAString& joinstyle)
 {
@@ -3513,13 +2848,6 @@ CanvasRenderingContext2D::SetLineJoin(const nsAString& joinstyle)
   CurrentState().lineJoin = j;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozLineJoin(const nsAString& joinstyle)
-{
-  SetLineJoin(joinstyle);
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::GetLineJoin(nsAString& joinstyle, ErrorResult& error)
 {
@@ -3538,32 +2866,6 @@ CanvasRenderingContext2D::GetLineJoin(nsAString& joinstyle, ErrorResult& error)
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozLineJoin(nsAString& joinstyle)
-{
-  ErrorResult rv;
-  nsString linejoin;
-  GetLineJoin(linejoin, rv);
-  if (!rv.Failed()) {
-    joinstyle = linejoin;
-  }
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMiterLimit(float miter)
-{
-  SetMiterLimit((double)miter);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMiterLimit(float *miter)
-{
-  *miter = MiterLimit();
-  return NS_OK;
-}
-
 void
 CanvasRenderingContext2D::SetMozDash(JSContext* cx,
                                      const JS::Value& mozDash,
@@ -3580,14 +2882,6 @@ CanvasRenderingContext2D::SetMozDash(JSContext* cx,
   }
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozDash(JSContext *cx, const jsval& patternArray)
-{
-  ErrorResult rv;
-  SetMozDash(cx, patternArray, rv);
-  return rv.ErrorCode();
-}
-
 JS::Value
 CanvasRenderingContext2D::GetMozDash(JSContext* cx, ErrorResult& error)
 {
@@ -3596,32 +2890,17 @@ CanvasRenderingContext2D::GetMozDash(JSContext* cx, ErrorResult& error)
   return mozDash;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozDash(JSContext* cx, jsval* dashArray)
+void
+CanvasRenderingContext2D::SetMozDashOffset(double mozDashOffset)
 {
-  ErrorResult rv;
-  *dashArray = GetMozDash(cx, rv);
-  return rv.ErrorCode();
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozDashOffset(float offset)
-{
-  if (!FloatValidate(offset)) {
-    return NS_ERROR_ILLEGAL_VALUE;
+  if (!FloatValidate(mozDashOffset)) {
+    return;
   }
+
   ContextState& state = CurrentState();
-  if (!state.dash.IsEmpty()) {
-    state.dashOffset = offset;
+  if (!state.dash.IsEmpty()) {
+    state.dashOffset = mozDashOffset;
   }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozDashOffset(float* offset)
-{
-  *offset = MozDashOffset();
-  return NS_OK;
 }
 
 bool
@@ -3641,13 +2920,6 @@ CanvasRenderingContext2D::IsPointInPath(double x, double y)
   return mPath->ContainsPoint(Point(x, y), mTarget->GetTransform());
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::IsPointInPath(float x, float y, bool *retVal)
-{
-  *retVal = IsPointInPath(x, y);
-  return NS_OK;
-}
-
 bool
 CanvasRenderingContext2D::MozIsPointInStroke(double x, double y)
 {
@@ -3676,13 +2948,6 @@ CanvasRenderingContext2D::MozIsPointInStroke(double x, double y)
   return mPath->StrokeContainsPoint(strokeOptions, Point(x, y), mTarget->GetTransform());
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::MozIsPointInStroke(float x, float y, bool *retVal)
-{
-  *retVal = MozIsPointInStroke(x, y);
-  return NS_OK;
-}
-
 //
 // image
 //
@@ -3851,41 +3116,6 @@ CanvasRenderingContext2D::DrawImage(const HTMLImageOrCanvasOrVideoElement& image
   RedrawUser(gfxRect(dx, dy, dw, dh));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
-                                    float a2, float a3, float a4, float a5,
-                                    float a6, float a7, float a8,
-                                    uint8_t optional_argc)
-{
-  if (!(optional_argc == 0 || optional_argc == 2 || optional_argc == 6)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  HTMLImageOrCanvasOrVideoElement element;
-  if (!ToHTMLImageOrCanvasOrVideoElement(imgElt, element)) {
-    return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
-  }
-
-  ErrorResult rv;
-  if (optional_argc == 0) {
-    if (!FloatValidate(a1, a2)) {
-      return NS_OK;
-    }
-    DrawImage(element, 0, 0, 0, 0, a1, a2, 0, 0, 0, rv);
-  } else if (optional_argc == 2) {
-    if (!FloatValidate(a1, a2, a3, a4)) {
-      return NS_OK;
-    }
-    DrawImage(element, 0, 0, 0, 0, a1, a2, a3, a4, 2, rv);
-  } else if (optional_argc == 6) {
-    if (!FloatValidate(a1, a2, a3, a4) || !FloatValidate(a5, a6, a7, a8)) {
-      return NS_OK;
-    }
-    DrawImage(element, a1, a2, a3, a4, a5, a6, a7, a8, 6, rv);
-  }
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::SetGlobalCompositeOperation(const nsAString& op,
                                                       ErrorResult& error)
@@ -3914,14 +3144,6 @@ CanvasRenderingContext2D::SetGlobalCompositeOperation(const nsAString& op,
   CurrentState().op = comp_op;
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetGlobalCompositeOperation(const nsAString& op)
-{
-  ErrorResult rv;
-  SetGlobalCompositeOperation(op, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::GetGlobalCompositeOperation(nsAString& op,
                                                       ErrorResult& error)
@@ -3950,18 +3172,6 @@ CanvasRenderingContext2D::GetGlobalCompositeOperation(nsAString& op,
 #undef CANVAS_OP_TO_GFX_OP
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetGlobalCompositeOperation(nsAString& op)
-{
-  nsString globalCompositeOperation;
-  ErrorResult rv;
-  GetGlobalCompositeOperation(globalCompositeOperation, rv);
-  if (!rv.Failed()) {
-    op = globalCompositeOperation;
-  }
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::DrawWindow(nsIDOMWindow* window, double x,
                                      double y, double w, double h,
@@ -4057,19 +3267,6 @@ CanvasRenderingContext2D::DrawWindow(nsIDOMWindow* window, double x,
   RedrawUser(gfxRect(0, 0, w, h));
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::DrawWindow(nsIDOMWindow* aWindow, float aX, float aY,
-                                     float aW, float aH,
-                                     const nsAString& aBGColor,
-                                     uint32_t flags)
-{
-  NS_ENSURE_ARG(aWindow);
-
-  ErrorResult rv;
-  DrawWindow(aWindow, aX, aY, aW, aH, aBGColor, flags, rv);
-  return rv.ErrorCode();
-}
-
 void
 CanvasRenderingContext2D::AsyncDrawXULElement(nsIDOMXULElement* elem,
                                               double x, double y,
@@ -4156,20 +3353,6 @@ CanvasRenderingContext2D::AsyncDrawXULElement(nsIDOMXULElement* elem,
 #endif
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::AsyncDrawXULElement(nsIDOMXULElement* aElem,
-                                              float aX, float aY,
-                                              float aW, float aH,
-                                              const nsAString& aBGColor,
-                                              uint32_t flags)
-{
-  NS_ENSURE_ARG(aElem);
-
-  ErrorResult rv;
-  AsyncDrawXULElement(aElem, aX, aY, aW, aH, aBGColor, flags, rv);
-  return rv.ErrorCode();
-}
-
 //
 // device pixel getting/setting
 //
@@ -4278,17 +3461,6 @@ CanvasRenderingContext2D::GetImageData(JSContext* aCx, double aSx,
   return imageData.forget();
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetImageData(double aSx, double aSy,
-                                       double aSw, double aSh,
-                                       JSContext* aCx,
-                                       nsISupports** aRetval)
-{
-  ErrorResult rv;
-  *aRetval = GetImageData(aCx, aSx, aSy, aSw, aSh, rv).get();
-  return rv.ErrorCode();
-}
-
 nsresult
 CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
                                             int32_t aX,
@@ -4466,17 +3638,8 @@ CanvasRenderingContext2D::PutImageData(JSContext* cx,
 
 // void putImageData (in ImageData d, in float x, in float y);
 // void putImageData (in ImageData d, in double x, in double y, in double dirtyX, in double dirtyY, in double dirtyWidth, in double dirtyHeight);
-NS_IMETHODIMP
-CanvasRenderingContext2D::PutImageData(const JS::Value&, double, double,
-                                       double, double, double, double,
-                                       JSContext*, uint8_t)
-{
-  /* Should never be called -- the new binding code handles it, and
-     C++ callers should call PutImageData_explicit */
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
 
-NS_IMETHODIMP
+nsresult
 CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w, uint32_t h,
                                                 unsigned char *aData, uint32_t aDataLen,
                                                 bool hasDirtyRect, int32_t dirtyX, int32_t dirtyY,
@@ -4671,31 +3834,6 @@ CanvasRenderingContext2D::CreateImageData(JSContext* cx,
                                        imagedata.Height(), error);
 }
 
-NS_IMETHODIMP
-CanvasRenderingContext2D::CreateImageData(const JS::Value &arg1,
-                                          const JS::Value &arg2,
-                                          JSContext* cx,
-                                          uint8_t optional_argc,
-                                          nsISupports** retval)
-{
-  /* Should never be called; handled entirely in new bindings */
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::GetMozImageSmoothingEnabled(bool *retVal)
-{
-  *retVal = ImageSmoothingEnabled();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CanvasRenderingContext2D::SetMozImageSmoothingEnabled(bool val)
-{
-  SetImageSmoothingEnabled(val);
-  return NS_OK;
-}
-
 static uint8_t g2DContextLayerUserData;
 
 already_AddRefed<CanvasLayer>
diff --git a/content/canvas/src/CanvasRenderingContext2D.h b/content/canvas/src/CanvasRenderingContext2D.h
index 65f60ba84b5d..c21d6f955472 100644
--- a/content/canvas/src/CanvasRenderingContext2D.h
+++ b/content/canvas/src/CanvasRenderingContext2D.h
@@ -11,9 +11,8 @@
 #include "mozilla/RefPtr.h"
 #include "nsColor.h"
 #include "nsHTMLCanvasElement.h"
-#include "CanvasUtils.h"
-#include "nsHTMLImageElement.h"
 #include "nsHTMLVideoElement.h"
+#include "CanvasUtils.h"
 #include "gfxFont.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/ImageData.h"
@@ -24,6 +23,8 @@
 #define NS_CANVASPATTERNAZURE_PRIVATE_IID \
     {0xc9bacc25, 0x28da, 0x421e, {0x9a, 0x4b, 0xbb, 0xd6, 0x93, 0x05, 0x12, 0xbc}}
 
+class nsIDOMXULElement;
+
 namespace mozilla {
 namespace gfx {
 struct Rect;
@@ -127,7 +128,6 @@ class CanvasRenderingContext2DUserData;
  ** CanvasRenderingContext2D
  **/
 class CanvasRenderingContext2D :
-  public nsIDOMCanvasRenderingContext2D,
   public nsICanvasRenderingContextInternal,
   public nsWrapperCache
 {
@@ -428,8 +428,7 @@ public:
   {
     return CurrentState().dashOffset;
   }
-
-  void SetMozDashOffset(double mozDashOffset, mozilla::ErrorResult& error);
+  void SetMozDashOffset(double mozDashOffset);
 
   void GetMozTextStyle(nsAString& mozTextStyle)
   {
@@ -496,11 +495,13 @@ public:
   // nsISupports interface + CC
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(CanvasRenderingContext2D,
-                                                                   nsIDOMCanvasRenderingContext2D)
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(CanvasRenderingContext2D)
 
-  // nsIDOMCanvasRenderingContext2D interface
-  NS_DECL_NSIDOMCANVASRENDERINGCONTEXT2D
+  enum CanvasMultiGetterType {
+    CMG_STYLE_STRING = 0,
+    CMG_STYLE_PATTERN = 1,
+    CMG_STYLE_GRADIENT = 2
+  };
 
   enum Style {
     STYLE_STROKE = 0,
@@ -543,6 +544,11 @@ protected:
                              uint32_t aWidth, uint32_t aHeight,
                              JSObject** aRetval);
 
+  nsresult PutImageData_explicit(int32_t x, int32_t y, uint32_t w, uint32_t h,
+                                 unsigned char *aData, uint32_t aDataLen,
+                                 bool hasDirtyRect, int32_t dirtyX, int32_t dirtyY,
+                                 int32_t dirtyWidth, int32_t dirtyHeight);
+
   /**
    * Internal method to complete initialisation, expects mTarget to have been set
    */
@@ -583,7 +589,6 @@ protected:
     CurrentState().SetPatternStyle(whichStyle, pattern);
   }
 
-  void SetStyleFromStringOrInterface(const nsAString& aStr, nsISupports *aInterface, Style aWhichStyle);
   nsISupports* GetStyleAsStringOrInterface(nsAString& aStr, CanvasMultiGetterType& aType, Style aWhichStyle);
 
   // Returns whether a color was successfully parsed.
@@ -664,32 +669,6 @@ protected:
     return CurrentState().font;
   }
 
-  static bool
-  ToHTMLImageOrCanvasOrVideoElement(nsIDOMElement* html,
-                                    HTMLImageOrCanvasOrVideoElement& element)
-  {
-    nsCOMPtr<nsIContent> content = do_QueryInterface(html);
-    if (content) {
-      if (content->IsHTML(nsGkAtoms::canvas)) {
-        element.SetAsHTMLCanvasElement() =
-          static_cast<nsHTMLCanvasElement*>(html);
-        return true;
-      }
-      if (content->IsHTML(nsGkAtoms::img)) {
-        element.SetAsHTMLImageElement() =
-          static_cast<nsHTMLImageElement*>(html);
-        return true;
-      }
-      if (content->IsHTML(nsGkAtoms::video)) {
-        element.SetAsHTMLVideoElement() =
-          static_cast<nsHTMLVideoElement*>(html);
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   // Member vars
   int32_t mWidth, mHeight;
 
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index f4eccf7c806a..20791bfc9e1c 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -19,6 +19,7 @@ LIBXUL_LIBRARY  = 1
 EXPORTS_NAMESPACES = mozilla/dom
 
 EXPORTS_mozilla/dom = \
+	CanvasUtils.h \
 	CanvasRenderingContext2D.h \
   ImageData.h \
   $(NULL)
diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp
index 966508f78704..d2ea1e219fe4 100644
--- a/content/html/content/src/nsHTMLCanvasElement.cpp
+++ b/content/html/content/src/nsHTMLCanvasElement.cpp
@@ -14,8 +14,7 @@
 #include "nsNetUtil.h"
 #include "nsDOMFile.h"
 
-#include "nsICanvasRenderingContextInternal.h"
-#include "nsIDOMCanvasRenderingContext2D.h"
+#include "mozilla/dom/CanvasRenderingContext2D.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIXPConnect.h"
 #include "jsapi.h"
@@ -43,6 +42,9 @@ using namespace mozilla::layers;
 
 namespace {
 
+typedef mozilla::dom::HTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement
+HTMLImageOrCanvasOrVideoElement;
+
 class ToBlobRunnable : public nsRunnable
 {
 public:
@@ -311,7 +313,6 @@ nsHTMLCanvasElement::GetOriginalCanvas()
   return mOriginalCanvas ? mOriginalCanvas.get() : this;
 }
 
-
 nsresult
 nsHTMLCanvasElement::CopyInnerTo(nsGenericElement* aDest)
 {
@@ -322,12 +323,17 @@ nsHTMLCanvasElement::CopyInnerTo(nsGenericElement* aDest)
     nsHTMLCanvasElement* self = const_cast<nsHTMLCanvasElement*>(this);
     dest->mOriginalCanvas = self;
 
+    HTMLImageOrCanvasOrVideoElement element;
+    element.SetAsHTMLCanvasElement() = this;
     nsCOMPtr<nsISupports> cxt;
     dest->GetContext(NS_LITERAL_STRING("2d"), JSVAL_VOID, getter_AddRefs(cxt));
-    nsCOMPtr<nsIDOMCanvasRenderingContext2D> context2d = do_QueryInterface(cxt);
+    nsRefPtr<CanvasRenderingContext2D> context2d =
+      static_cast<CanvasRenderingContext2D*>(cxt.get());
     if (context2d && !self->mPrintCallback) {
-      context2d->DrawImage(self,
-                           0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0);
+      ErrorResult err;
+      context2d->DrawImage(element,
+                           0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, err);
+      rv = err.ErrorCode();
     }
   }
   return rv;
@@ -691,6 +697,16 @@ nsHTMLCanvasElement::GetContextHelper(const nsAString& aContextId,
 {
   NS_ENSURE_ARG(aContext);
 
+  if (aContextId.EqualsLiteral("2d")) {
+    Telemetry::Accumulate(Telemetry::CANVAS_2D_USED, 1);
+    nsRefPtr<CanvasRenderingContext2D> ctx =
+      new CanvasRenderingContext2D();
+
+    ctx->SetCanvasElement(this);
+    ctx.forget(aContext);
+    return NS_OK;
+  }
+
   NS_ConvertUTF16toUTF8 ctxId(aContextId);
 
   // check that ctxId is clamped to A-Za-z0-9_-
diff --git a/dom/interfaces/canvas/nsIDOMCanvasRenderingContext2D.idl b/dom/interfaces/canvas/nsIDOMCanvasRenderingContext2D.idl
index 5e99c13739cd..610c5aaf4f20 100644
--- a/dom/interfaces/canvas/nsIDOMCanvasRenderingContext2D.idl
+++ b/dom/interfaces/canvas/nsIDOMCanvasRenderingContext2D.idl
@@ -4,14 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIVariant.idl"
-
-interface nsIDOMWindow;
-interface nsIDOMElement;
-interface nsIDOMHTMLElement;
-interface nsIDOMHTMLImageElement;
-interface nsIDOMHTMLCanvasElement;
-interface nsIDOMXULElement;
 
 [scriptable, uuid(bbb20a59-524e-4662-981e-5e142814b20c)]
 interface nsIDOMCanvasGradient : nsISupports
@@ -30,178 +22,17 @@ interface nsIDOMTextMetrics : nsISupports
   readonly attribute float width;
 };
 
-[scriptable, uuid(438fe14d-6501-40ab-b6c2-130fa38bd2c9)]
+/**
+ * This interface remains only for the constants, for a context, use the
+ * WebIDL/Paris bindings instead (CanvasRenderingContext2D.webidl).
+ * The constants are used by CanvasRenderingContext2D::DrawWindow and are
+ * used in WindowsPreviewPerTab.jsm and some extensions. The constants can
+ * be referenced directly via a canvas context 2d rather than this interface,
+ * and that should be preferred in new code. 
+ */
+[scriptable, uuid(4417cab7-c7eb-4e0c-b00a-c43842f0cba8)]
 interface nsIDOMCanvasRenderingContext2D : nsISupports
 {
-  // back-reference to the canvas element for which
-  // this context was created
-  readonly attribute nsIDOMHTMLCanvasElement canvas;
-
-  // state
-  [binaryname(MozSave)]
-  void save();
-  [binaryname(MozRestore)]
-  void restore();
-
-  // transformations
-  void scale(in float x, in float y);
-  void rotate(in float angle);
-  void translate(in float x, in float y);
-  void transform(in float m11, in float m12, in float m21, in float m22, in float dx, in float dy);
-  void setTransform(in float m11, in float m12, in float m21, in float m22, in float dx, in float dy);
-  [implicit_jscontext]
-  attribute jsval mozCurrentTransform; // [ m11, m12, m21, m22, dx, dy ], i.e. row major
-  [implicit_jscontext]
-  attribute jsval mozCurrentTransformInverse;
-
-  // compositing
-  attribute float globalAlpha; /* default 1.0 -- opaque */
-  attribute DOMString globalCompositeOperation; /* default "over" */
-
-  // Colors and Styles
-
-  // These attributes work, but are quickstubbed for JS code.  Native
-  // code should use the _multi variants below.
-  attribute nsIVariant strokeStyle;
-  attribute nsIVariant fillStyle;
-
-  // These do the actual work.  Use these from c++ -- only one of str or iface
-  // should be specified; the one that's not null/void is used.  For the getter,
-  // ifaceType is 0 if it's a string, 1 if it's a pattern, or 2 if it's a gradient
-%{C++
-enum CanvasMultiGetterType {
-      CMG_STYLE_STRING = 0,
-      CMG_STYLE_PATTERN = 1,
-      CMG_STYLE_GRADIENT = 2
-};
-%}
-  [noscript] void setStrokeStyle_multi(in DOMString str, in nsISupports iface);
-  [noscript] void getStrokeStyle_multi(out DOMString str, out nsISupports iface, out long type);
-  [noscript] void setFillStyle_multi(in DOMString str, in nsISupports iface);
-  [noscript] void getFillStyle_multi(out DOMString str, out nsISupports iface, out long type);
-
-  //attribute DOMString fillRule;
-  attribute DOMString mozFillRule; /* "evenodd", "nonzero" (default) */
-
-  nsIDOMCanvasGradient createLinearGradient (in float x0, in float y0, in float x1, in float y1);
-  nsIDOMCanvasGradient createRadialGradient(in float x0, in float y0, in float r0, in float x1, in float y1, in float r1);
-  nsIDOMCanvasPattern createPattern(in nsIDOMHTMLElement image, in DOMString repetition);
-  attribute float lineWidth; /* default 1 */
-  [binaryname(MozLineCap)]
-  attribute DOMString lineCap; /* "butt", "round", "square" (default) */
-  [binaryname(MozLineJoin)]
-  attribute DOMString lineJoin; /* "round", "bevel", "miter" (default) */
-  attribute float miterLimit; /* default 10 */
-
-  [implicit_jscontext]
-  attribute jsval mozDash; /* default |null| */
-  attribute float mozDashOffset; /* default 0.0 */
-
-  // shadows
-  attribute float shadowOffsetX;
-  attribute float shadowOffsetY;
-  attribute float shadowBlur;
-  [binaryname(MozShadowColor)]
-  attribute DOMString shadowColor;
-
-  // rects
-  void clearRect(in float x, in float y, in float w, in float h);
-  void fillRect(in float x, in float y, in float w, in float h);
-  void strokeRect(in float x, in float y, in float w, in float h);
-
-  // path API
-  [binaryname(MozBeginPath)]
-  void beginPath();
-  [binaryname(MozClosePath)]
-  void closePath();
-
-  void moveTo(in float x, in float y);
-  void lineTo(in float x, in float y);
-  void quadraticCurveTo(in float cpx, in float cpy, in float x, in float y);
-  void bezierCurveTo(in float cp1x, in float cp1y, in float cp2x, in float cp2y, in float x, in float y);
-  void arcTo(in float x1, in float y1, in float x2, in float y2, in float radius);
-  void arc(in float x, in float y, in float r, in float startAngle, in float endAngle, [optional] in boolean anticlockwise);
-  void rect(in float x, in float y, in float w, in float h);
-
-  [binaryname(MozFill)]
-  void fill();
-  [binaryname(MozStroke)]
-  void stroke();
-  [binaryname(MozClip)]
-  void clip();
-
-  // text api
-  [binaryname(MozFont)]
-  attribute DOMString font; /* default "10px sans-serif" */
-  [binaryname(MozTextAlign)]
-  attribute DOMString textAlign; /* "start" (default), "end", "left", "right",
-                                 "center" */
-  [binaryname(MozTextBaseline)]
-  attribute DOMString textBaseline; /* "alphabetic" (default), "top", "hanging",
-                                    "middle", "ideographic", "bottom" */
-
-  void fillText(in DOMString text, in float x, in float y, [optional] in float maxWidth);
-  void strokeText(in DOMString text, in float x, in float y, [optional] in float maxWidth);
-  nsIDOMTextMetrics measureText(in DOMString text);
-
-  [binaryname(TextStyle)]
-  attribute DOMString mozTextStyle;
-
-  // image api
-
-  [optional_argc] void drawImage(in nsIDOMElement image,
-                                 in float a1, in float a2,
-                                 [optional] in float a3,
-                                 [optional] in float a4,
-                                 [optional] in float a5,
-                                 [optional] in float a6,
-                                 [optional] in float a7,
-                                 [optional] in float a8);
-
-/*
-  void drawImage(in HTMLImageElement image, in float dx, in float dy);
-  void drawImage(in HTMLImageElement image, in float dx, in float dy, in float sw, in float sh);
-  void drawImage(in HTMLImageElement image, in float sx, in float sy, in float sw, in float sh, in float dx, in float dy, in float dw, in float dh);
-*/
-
-  // point-membership test
-  boolean isPointInPath(in float x, in float y);
-  boolean mozIsPointInStroke(in float x, in float y);
-
-  // pixel manipulation
-  // ImageData getImageData (in float x, in float y, in float width, in float height);
-  // void putImageData (in ImageData d, in float x, in float y);
-  // ImageData = { width: #, height: #, data: [r, g, b, a, ...] }
-
-  // nsISupports is OK, because the binding code will deal correctly
-  [implicit_jscontext]
-  nsISupports getImageData(in double sx, in double sy, in double sw, in double sh);
-
-
-  // void putImageData(ImageData imagedata, double dx, double dy);
-  // void putImageDataHD(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
-  // We use jsval for the imageData because that's what our C++ code wants
-  [implicit_jscontext, optional_argc]
-  void putImageData(in jsval imageData, in double dx, in double dy,
-                    [optional] in double dirtyX, [optional] in double dirtyY,
-                    [optional] in double dirtyWidth,
-                    [optional] in double dirtyHeight);
-
-  // dataLen must be == width*height*4 in this call
-  [noscript] void putImageData_explicit(in long x, in long y, in unsigned long width, in unsigned long height,
-                                        [array, size_is(dataLen)] in octet dataPtr, in unsigned long dataLen, in boolean hasDirtyRect,
-                                        in long dirtyX, in long dirtyY, in long dirtyWidth, in long dirtyHeight);
-
-  // ImageData createImageData(double w, double h);
-  // ImageData createImageData(ImageData data);
-  // nsISupports is OK, because the binding code will deal correctly
-  [implicit_jscontext, optional_argc]
-  nsISupports createImageData(in jsval arg1, [optional] in jsval arg2);
-
-  // image smoothing mode -- if disabled, images won't be smoothed
-  // if scaled.
-  attribute boolean mozImageSmoothingEnabled;
-
   // Show the caret if appropriate when drawing
   const unsigned long DRAWWINDOW_DRAW_CARET   = 0x01;
   // Don't flush pending layout notifications that could otherwise
@@ -216,46 +47,4 @@ enum CanvasMultiGetterType {
   const unsigned long DRAWWINDOW_USE_WIDGET_LAYERS = 0x08;
   // Don't synchronously decode images - draw what we have
   const unsigned long DRAWWINDOW_ASYNC_DECODE_IMAGES = 0x10;
-
-  /**
-   * Renders a region of a window into the canvas.  The contents of
-   * the window's viewport are rendered, ignoring viewport clipping
-   * and scrolling.
-   *
-   * @param x
-   * @param y
-   * @param w
-   * @param h specify the area of the window to render, in CSS
-   * pixels.
-   *
-   * @param backgroundColor the canvas is filled with this color
-   * before we render the window into it. This color may be
-   * transparent/translucent. It is given as a CSS color string
-   * (e.g., rgb() or rgba()).
-   *
-   * @param flags Used to better control the drawWindow call.
-   * Flags can be ORed together.
-   *
-   * Of course, the rendering obeys the current scale, transform and
-   * globalAlpha values.
-   *
-   * Hints:
-   * -- If 'rgba(0,0,0,0)' is used for the background color, the
-   * drawing will be transparent wherever the window is transparent.
-   * -- Top-level browsed documents are usually not transparent
-   * because the user's background-color preference is applied,
-   * but IFRAMEs are transparent if the page doesn't set a background.
-   * -- If an opaque color is used for the background color, rendering
-   * will be faster because we won't have to compute the window's
-   * transparency.
-   *
-   * This API cannot currently be used by Web content. It is chrome
-   * only.
-   */
-  void drawWindow(in nsIDOMWindow window, in float x, in float y,
-                  in float w, in float h, in DOMString bgColor,
-                  [optional] in unsigned long flags);
-  void asyncDrawXULElement(in nsIDOMXULElement elem, in float x, in float y,
-                  in float w, in float h, in DOMString bgColor,
-                  [optional] in unsigned long flags);
 };
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index c3b4f42d48f9..21eb8416a34c 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -175,7 +175,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditor)
 
 #include "nsHTMLCanvasFrame.h"
 
-#include "nsIDOMCanvasRenderingContext2D.h"
 #include "nsIDOMWebGLRenderingContext.h"
 
 class nsIDocumentLoaderFactory;
@@ -442,7 +441,6 @@ nsresult NS_NewContainerBoxObject(nsIBoxObject** aResult);
 nsresult NS_NewTreeBoxObject(nsIBoxObject** aResult);
 #endif
 
-nsresult NS_NewCanvasRenderingContext2D(nsIDOMCanvasRenderingContext2D** aResult);
 nsresult NS_NewCanvasRenderingContextWebGL(nsIDOMWebGLRenderingContext** aResult);
 
 nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
@@ -566,7 +564,6 @@ MAKE_CTOR(CreateVideoDocument,            nsIDocument,                 NS_NewVid
 #endif
 MAKE_CTOR(CreateFocusManager,             nsIFocusManager,      NS_NewFocusManager)
 
-MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
 MAKE_CTOR(CreateCanvasRenderingContextWebGL, nsIDOMWebGLRenderingContext, NS_NewCanvasRenderingContextWebGL)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStyleSheetService, Init)
@@ -729,7 +726,6 @@ NS_DEFINE_NAMED_CID(NS_HTMLOPTIONELEMENT_CID);
 #ifdef MOZ_MEDIA
 NS_DEFINE_NAMED_CID(NS_HTMLAUDIOELEMENT_CID);
 #endif
-NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2D_CID);
 NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXTWEBGL_CID);
 NS_DEFINE_NAMED_CID(NS_TEXT_ENCODER_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLCOPY_TEXT_ENCODER_CID);
@@ -1015,7 +1011,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
 #ifdef MOZ_MEDIA
   { &kNS_HTMLAUDIOELEMENT_CID, false, NULL, CreateHTMLAudioElement },
 #endif
-  { &kNS_CANVASRENDERINGCONTEXT2D_CID, false, NULL, CreateCanvasRenderingContext2D },
   { &kNS_CANVASRENDERINGCONTEXTWEBGL_CID, false, NULL, CreateCanvasRenderingContextWebGL },
   { &kNS_TEXT_ENCODER_CID, false, NULL, CreateTextEncoder },
   { &kNS_HTMLCOPY_TEXT_ENCODER_CID, false, NULL, CreateHTMLCopyTextEncoder },
@@ -1162,7 +1157,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
 #ifdef MOZ_MEDIA
   { NS_HTMLAUDIOELEMENT_CONTRACTID, &kNS_HTMLAUDIOELEMENT_CID },
 #endif
-  { "@mozilla.org/content/canvas-rendering-context;1?id=2d", &kNS_CANVASRENDERINGCONTEXT2D_CID },
   { "@mozilla.org/content/canvas-rendering-context;1?id=moz-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
   { "@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID },
diff --git a/widget/nsITaskbarPreviewController.idl b/widget/nsITaskbarPreviewController.idl
index 44624c000021..693d306e1048 100644
--- a/widget/nsITaskbarPreviewController.idl
+++ b/widget/nsITaskbarPreviewController.idl
@@ -8,7 +8,6 @@
 #include "nsISupports.idl"
 
 interface nsIDocShell;
-interface nsIDOMCanvasRenderingContext2D;
 interface nsITaskbarPreview;
 interface nsITaskbarPreviewButton;
 
@@ -52,7 +51,7 @@ interface nsITaskbarPreviewController : nsISupports
    *
    * @param ctx Canvas drawing context
    */
-  boolean drawPreview(in nsIDOMCanvasRenderingContext2D ctx);
+  boolean drawPreview(in nsISupports ctx);
 
   /**
    * Invoked by the taskbar preview when it needs to draw the thumbnail in the
@@ -67,7 +66,7 @@ interface nsITaskbarPreviewController : nsISupports
    * @param width The width of the surface backing the drawing context
    * @param height The height of the surface backing the drawing context
    */
-  boolean drawThumbnail(in nsIDOMCanvasRenderingContext2D ctx, in unsigned long width, in unsigned long height);
+  boolean drawThumbnail(in nsISupports ctx, in unsigned long width, in unsigned long height);
 
   /**
    * Invoked when the user presses the close button on the tab preview.
diff --git a/widget/windows/TaskbarPreview.cpp b/widget/windows/TaskbarPreview.cpp
index 70fe7b317cf6..4759a2ebf170 100644
--- a/widget/windows/TaskbarPreview.cpp
+++ b/widget/windows/TaskbarPreview.cpp
@@ -24,10 +24,12 @@
 
 #include <nsIBaseWindow.h>
 #include <nsICanvasRenderingContextInternal.h>
-#include <nsIDOMCanvasRenderingContext2D.h>
+#include "mozilla/dom/CanvasRenderingContext2D.h"
 #include <imgIContainer.h>
 #include <nsIDocShell.h>
 
+#include "mozilla/Telemetry.h"
+
 // Defined in dwmapi in a header that needs a higher numbered _WINNT #define
 #define DWM_SIT_DISPLAYFRAME 0x1
 
@@ -39,7 +41,7 @@ namespace {
 // Shared by all TaskbarPreviews to avoid the expensive creation process.
 // Manually refcounted (see gInstCount) by the ctor and dtor of TaskbarPreview.
 // This is done because static constructors aren't allowed for perf reasons.
-nsIDOMCanvasRenderingContext2D* gCtx = NULL;
+dom::CanvasRenderingContext2D* gCtx = NULL;
 // Used in tracking the number of previews. Used in freeing
 // the static 2d rendering context on shutdown.
 uint32_t gInstCount = 0;
@@ -56,26 +58,15 @@ uint32_t gInstCount = 0;
 nsresult
 GetRenderingContext(nsIDocShell *shell, gfxASurface *surface,
                     uint32_t width, uint32_t height) {
-  nsresult rv;
-  nsCOMPtr<nsIDOMCanvasRenderingContext2D> ctx = gCtx;
-
-  if (!ctx) {
+  if (!gCtx) {
     // create the canvas rendering context
-    ctx = do_CreateInstance("@mozilla.org/content/canvas-rendering-context;1?id=2d", &rv);
-    if (NS_FAILED(rv)) {
-      NS_WARNING("Could not create nsICanvasRenderingContext2D for tab previews!");
-      return rv;
-    }
-    gCtx = ctx;
+    Telemetry::Accumulate(Telemetry::CANVAS_2D_USED, 1);
+    gCtx = new mozilla::dom::CanvasRenderingContext2D();
     NS_ADDREF(gCtx);
   }
 
-  nsCOMPtr<nsICanvasRenderingContextInternal> ctxI = do_QueryInterface(ctx, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
   // Set the surface we'll use to render.
-  return ctxI->InitializeWithSurface(shell, surface, width, height);
+  return gCtx->InitializeWithSurface(shell, surface, width, height);
 }
 
 /* Helper method for freeing surface resources associated with the rendering context.
@@ -85,11 +76,7 @@ ResetRenderingContext() {
   if (!gCtx)
     return;
 
-  nsresult rv;
-  nsCOMPtr<nsICanvasRenderingContextInternal> ctxI = do_QueryInterface(gCtx, &rv);
-  if (NS_FAILED(rv))
-    return;
-  if (NS_FAILED(ctxI->Reset())) {
+  if (NS_FAILED(gCtx->Reset())) {
     NS_RELEASE(gCtx);
     gCtx = nullptr;
   }
diff --git a/widget/windows/WinTaskbar.cpp b/widget/windows/WinTaskbar.cpp
index c70b24239303..c42972b1296c 100644
--- a/widget/windows/WinTaskbar.cpp
+++ b/widget/windows/WinTaskbar.cpp
@@ -163,13 +163,13 @@ DefaultController::GetThumbnailAspectRatio(float *aThumbnailAspectRatio) {
 }
 
 NS_IMETHODIMP
-DefaultController::DrawPreview(nsIDOMCanvasRenderingContext2D *ctx, bool *rDrawFrame) {
+DefaultController::DrawPreview(nsISupports *ctx, bool *rDrawFrame) {
   *rDrawFrame = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-DefaultController::DrawThumbnail(nsIDOMCanvasRenderingContext2D *ctx, uint32_t width, uint32_t height, bool *rDrawFrame) {
+DefaultController::DrawThumbnail(nsISupports *ctx, uint32_t width, uint32_t height, bool *rDrawFrame) {
   *rDrawFrame = false;
   return NS_OK;
 }

From b3a448668af9750d36490147595eea0be933dada Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Tue, 13 Nov 2012 21:39:37 -0800
Subject: [PATCH 57/76] Bug 800556; test for mozDashOffset errors; r=Ms2ger

--HG--
extra : rebase_source : 834c2d1c426a8f33b66ee60e3fef912d652d5f59
---
 content/canvas/test/Makefile.in             |  1 +
 content/canvas/test/test_mozDashOffset.html | 39 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 content/canvas/test/test_mozDashOffset.html

diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 50eee735cc22..02ccd4bdd9aa 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -60,6 +60,7 @@ MOCHITEST_FILES = \
 	test_bug764125.html \
 	test_drawImage_edge_cases.html \
 	test_drawImage_document_domain.html \
+  test_mozDashOffset.html \
 	file_drawImage_document_domain.html \
 	$(NULL)
 
diff --git a/content/canvas/test/test_mozDashOffset.html b/content/canvas/test/test_mozDashOffset.html
new file mode 100644
index 000000000000..af658f4c750b
--- /dev/null
+++ b/content/canvas/test/test_mozDashOffset.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for mozDashOffset</title>
+  <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">
+<canvas id="c" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script>
+try {
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  ctx.mozDash = [1, 1];
+  
+  ctx.mozDashOffset = 1;
+  ctx.mozDashOffset = Infinity;
+  ok(ctx.mozDashOffset === 1, "ctx.mozDashOffset === 1");
+
+  ctx.mozDashOffset = 1;
+  ctx.mozDashOffset = -Infinity;
+  ok(ctx.mozDashOffset === 1, "ctx.mozDashOffset === 1");
+
+  ctx.mozDashOffset = 1;
+  ctx.mozDashOffset = NaN;
+  ok(ctx.mozDashOffset === 1, "ctx.mozDashOffset === 1");
+} catch(e) {
+  ok(false, "unexpected exception thrown in: test_mozDashOffset.html");
+}
+</script>
+</pre>
+</body>
+</html>

From 3c564bbf3e5ea672b2877b1bfdf3c017a8da132d Mon Sep 17 00:00:00 2001
From: "Bellindira Castillo [:bellindira]" <bellindira@appcoast.com>
Date: Tue, 13 Nov 2012 19:00:14 -0600
Subject: [PATCH 58/76] Bug 806690 -  Port
 browser_privatebrowsing_openlocation.js to the new per-window PB APIs;
 r=ehsan

--HG--
rename : browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_openlocation.js => browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js
extra : rebase_source : e1d0ba59cbcfe2af4a2d2053c7cca53bec63c9e8
---
 .../test/browser/perwindow/Makefile.in        |  1 +
 .../browser_privatebrowsing_openlocation.js   | 97 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js

diff --git a/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in b/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
index 45ce56e8e6a1..363dd7593a7c 100644
--- a/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
@@ -28,6 +28,7 @@ MOCHITEST_BROWSER_FILES =  \
 		browser_privatebrowsing_localStorage_page1.html \
 		browser_privatebrowsing_localStorage_page2.html \
 		browser_privatebrowsing_opendir.js \
+		browser_privatebrowsing_openlocation.js \
 		browser_privatebrowsing_theming.js \
 		browser_privatebrowsing_zoomrestore.js \
 		$(NULL)
diff --git a/browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js b/browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js
new file mode 100644
index 000000000000..78a00df7fff7
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js
@@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This test makes sure that Open Location dialog is usable inside the private browsing
+// mode without leaving any trace of the URLs visited.
+
+function test() {
+  // initialization
+  waitForExplicitFinish();
+
+  function openLocation(aWindow, url, autofilled, callback) {
+    function observer(aSubject, aTopic, aData) {
+      switch (aTopic) {
+        case "domwindowopened":
+          let dialog = aSubject.QueryInterface(Ci.nsIDOMWindow);
+          dialog.addEventListener("load", function () {
+            dialog.removeEventListener("load", arguments.callee, false);
+
+            let browser = aWindow.gBrowser.selectedBrowser;
+            browser.addEventListener("load", function() {
+              browser.removeEventListener("load", arguments.callee, true);
+
+              is(browser.currentURI.spec, url,
+                 "The correct URL should be loaded via the open location dialog");
+              executeSoon(callback);
+            }, true);
+
+            SimpleTest.waitForFocus(function() {
+              let input = dialog.document.getElementById("dialog.input");
+              is(input.value, autofilled, "The input field should be correctly auto-filled");
+              input.focus();
+              for (let i = 0; i < url.length; ++i)
+                EventUtils.synthesizeKey(url[i], {}, dialog);
+              EventUtils.synthesizeKey("VK_RETURN", {}, dialog);
+            }, dialog);
+          }, false);
+          break;
+
+        case "domwindowclosed":
+          Services.ww.unregisterNotification(arguments.callee);
+          break;
+      }
+    }
+
+    executeSoon(function() {
+      Services.ww.registerNotification(observer);
+      gPrefService.setIntPref("general.open_location.last_window_choice", 0);
+      aWindow.openDialog("chrome://browser/content/openLocation.xul", "_blank",
+                         "chrome,titlebar", aWindow);
+    });
+  }
+
+  let windowsToClose = [];
+  function testOnWindow(options, callback) {
+    let win = OpenBrowserWindow(options);
+    win.addEventListener("load", function onLoad() {
+      win.removeEventListener("load", onLoad, false);
+      windowsToClose.push(win);
+      callback(win);
+    }, false);
+  };
+
+  registerCleanupFunction(function() {
+    windowsToClose.forEach(function(win) {
+      win.close();
+    });
+  });
+
+  if (gPrefService.prefHasUserValue("general.open_location.last_url"))
+    gPrefService.clearUserPref("general.open_location.last_url");
+
+  testOnWindow({private: false}, function(win) {
+    openLocation(win, "http://example.com/", "", function() {
+      testOnWindow({private: false}, function(win) {
+        openLocation(win, "http://example.org/", "http://example.com/", function() {
+          testOnWindow({private: true}, function(win) {
+            openLocation(win, "about:logo", "", function() {
+                testOnWindow({private: true}, function(win) {
+                  openLocation(win, "about:buildconfig", "about:logo", function() {
+                    testOnWindow({private: false}, function(win) {
+                      openLocation(win, "about:blank", "http://example.org/", function() {
+                        gPrefService.clearUserPref("general.open_location.last_url");
+                        if (gPrefService.prefHasUserValue("general.open_location.last_window_choice"))
+                          gPrefService.clearUserPref("general.open_location.last_window_choice");
+                        finish();
+                       });
+                     });
+                  });
+               });
+            });
+          });
+        });
+      });
+    });
+  });
+}

From 2732b3ebdd0255d6c4e0bd4dc2c3695ccf267d31 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 7 Nov 2012 09:38:11 +1300
Subject: [PATCH 59/76] Bug 804606. On Mac, call ApplyPluginGeometryUpdates
 immediately when we've computed geometry, instead of waiting until the paint
 event. r=smichaud

--HG--
rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_geoprompt.js => browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_geoprompt.js
rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_geoprompt_page.html => browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_geoprompt_page.html
rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js => browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_openlocation.js
rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_zoomrestore.js => browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_zoomrestore.js
rename : toolkit/system/androidproxy/Makefile.in => toolkit/system/windowsproxy/Makefile.in
rename : toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp => toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
extra : rebase_source : 006071633b23f5ab34a27e46100fe32fbff9f735
---
 layout/base/nsPresContext.cpp | 6 ++++++
 layout/base/nsPresShell.cpp   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index f2a3be1d17a9..18eb6e238dba 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -2617,7 +2617,13 @@ nsRootPresContext::ComputePluginGeometryUpdates(nsIFrame* aFrame,
     aList->ComputeVisibilityForRoot(aBuilder, &region);
   }
 
+#ifdef XP_MACOSX
+  // We control painting of Mac plugins, so just apply geometry updates now.
+  // This is not happening during a paint event.
+  ApplyPluginGeometryUpdates();
+#else
   InitApplyPluginGeometryTimer();
+#endif
 }
 
 static void
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index c92b3d8f0eaf..262123d0b9f5 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -7127,7 +7127,9 @@ PresShell::WillPaintWindow(bool aWillSendDidPaint)
     return;
   }
 
+#ifndef XP_MACOSX
   rootPresContext->ApplyPluginGeometryUpdates();
+#endif
 }
 
 void

From 88fcfa236d6bf6ed92b99c19db0b029d36986c2e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 13 Nov 2012 11:55:52 -0800
Subject: [PATCH 60/76] Bug 788322. Don't crash when we drawWindow on a page
 containing a remote <iframe>. r=mattwoodrow The test is actually a test for
 bug 792351. It doesn't pass yet, since we're not drawing remote iframes
 properly, but the test should at least not cause a crash.

--HG--
extra : rebase_source : c25305bf872525d9b918950a3f9d77479a78a1e4
---
 layout/base/tests/Makefile.in            |  1 +
 layout/base/tests/test_remote_frame.html | 65 ++++++++++++++++++++++++
 layout/ipc/RenderFrameParent.cpp         |  4 +-
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 layout/base/tests/test_remote_frame.html

diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 6d178c6ac24b..20e011daffdf 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -149,6 +149,7 @@ MOCHITEST_FILES =	\
 		test_bug761572.html \
 		test_bug770106.html \
 		test_maxLineBoxWidth.html \
+		test_remote_frame.html \
 		$(NULL)
 
 # Tests for bugs 441782, 467672 and 570378 don't pass reliably on Windows, because of bug 469208
diff --git a/layout/base/tests/test_remote_frame.html b/layout/base/tests/test_remote_frame.html
new file mode 100644
index 000000000000..1fba68248566
--- /dev/null
+++ b/layout/base/tests/test_remote_frame.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style>
+  div, iframe {
+    position:absolute;
+    left:0; top:50px;
+    width:400px; height:400px;
+    transform: translateY(50px);
+    border:5px solid black;
+  }
+  </style>
+</head>
+  <body>
+    <div id="d" style="background:blue"></div>
+
+  <script type="application/javascript;version=1.7">
+    "use strict";
+
+    var referenceSnapshot;
+    var iterations = 0;
+
+    SimpleTest.waitForExplicitFinish();
+
+    function pollForTestPass() {
+      var snapshot = snapshotWindow(window);
+      if (compareSnapshots(referenceSnapshot, snapshot, true)[0]) {
+        ok(true, "Test passed after " + iterations + " iterations");
+        SimpleTest.finish();
+        return;
+      }
+
+      ++iterations;
+      if (iterations == 20) {
+        todo(false, "We couldn't draw the frame, but at least we didn't crash");
+        SimpleTest.finish();
+        return;
+      }
+      setTimeout(pollForTestPass, 10);
+    }
+    function addRemoteFrame() {
+      let iframe = document.createElement("iframe");
+      iframe.mozbrowser = true;
+      iframe.src = "data:text/html,<html style='background:blue;'>";
+
+      document.body.appendChild(iframe);
+
+      pollForTestPass();
+    }
+    addEventListener("load", function() {
+      referenceSnapshot = snapshotWindow(window);
+      document.getElementById("d").style.display = 'none';
+      SpecialPowers.addPermission("browser", true, document);
+      SpecialPowers.pushPrefEnv({
+        "set": [
+          ["dom.ipc.browser_frames.oop_by_default", true],
+          ["dom.mozBrowserFramesEnabled", true]
+        ]
+      }, addRemoteFrame);      
+    });
+  </script>
+</body>
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 539f88084441..84beb7cc7b12 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -658,13 +658,15 @@ RenderFrameParent::BuildLayer(nsDisplayListBuilder* aBuilder,
                     mContainer->Manager() == aManager,
                     "retaining manager changed out from under us ... HELP!");
 
-  if (mContainer && mContainer->Manager() != aManager) {
+  if (IsTempLayerManager(aManager) ||
+      (mContainer && mContainer->Manager() != aManager)) {
     // This can happen if aManager is a "temporary" manager, or if the
     // widget's layer manager changed out from under us.  We need to
     // FIXME handle the former case somehow, probably with an API to
     // draw a manager's subtree.  The latter is bad bad bad, but the
     // the NS_ABORT_IF_FALSE() above will flag it.  Returning NULL
     // here will just cause the shadow subtree not to be rendered.
+    NS_WARNING("Remote iframe not rendered");
     return nullptr;
   }
 

From 7b6e12bdcda6da59610c739ca29fe3c5c7b6176e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 13 Nov 2012 11:56:47 -0800
Subject: [PATCH 61/76] Bug 811173. Part 2: Add other cases for nsDisplayItems
 that snap their bounds. r=mattwoodrow

--HG--
extra : rebase_source : 716ea707140907ccbed6d739ef81db1256a7b51b
---
 layout/generic/nsHTMLCanvasFrame.cpp  | 2 +-
 layout/generic/nsImageFrame.h         | 5 +++++
 layout/generic/nsObjectFrame.cpp      | 2 +-
 layout/generic/nsVideoFrame.cpp       | 2 +-
 layout/xul/base/src/nsImageBoxFrame.h | 5 +++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp
index 67b243a6e1b3..1f8dbde07447 100644
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -52,7 +52,7 @@ public:
   }
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
-    *aSnap = false;
+    *aSnap = true;
     nsHTMLCanvasFrame* f = static_cast<nsHTMLCanvasFrame*>(GetUnderlyingFrame());
     return f->GetInnerArea() + ToReferenceFrame();
   }
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index 4af3ca7a4a69..e0088c52c1f4 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -377,6 +377,11 @@ public:
   virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
                                    LayerManager* aManager,
                                    const ContainerParameters& aParameters) MOZ_OVERRIDE;
+  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
+  {
+    *aSnap = true;
+    return nsRect(ToReferenceFrame(), GetUnderlyingFrame()->GetSize());
+  }
 
   virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
                                              LayerManager* aManager,
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 09bd7a30151b..4fae8088e9dd 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1033,7 +1033,7 @@ nsDisplayPluginVideo::ComputeVisibility(nsDisplayListBuilder* aBuilder,
 nsRect
 nsDisplayPlugin::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
 {
-  *aSnap = false;
+  *aSnap = true;
   return GetDisplayItemBounds(aBuilder, this, mFrame);
 }
 
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index 29c32a1ac625..e73d11921960 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -330,7 +330,7 @@ public:
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
   {
-    *aSnap = false;
+    *aSnap = true;
     nsIFrame* f = GetUnderlyingFrame();
     return f->GetContentRect() - f->GetPosition() + ToReferenceFrame();
   }
diff --git a/layout/xul/base/src/nsImageBoxFrame.h b/layout/xul/base/src/nsImageBoxFrame.h
index 1dc86efeebc2..2e0ee67c292b 100644
--- a/layout/xul/base/src/nsImageBoxFrame.h
+++ b/layout/xul/base/src/nsImageBoxFrame.h
@@ -132,6 +132,11 @@ public:
 
   virtual already_AddRefed<ImageContainer> GetContainer() MOZ_OVERRIDE;
   virtual void ConfigureLayer(ImageLayer* aLayer, const nsIntPoint& aOffset) MOZ_OVERRIDE;
+  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
+  {
+    *aSnap = true;
+    return nsRect(ToReferenceFrame(), GetUnderlyingFrame()->GetSize());
+  }
 
   // Doesn't handle HitTest because nsLeafBoxFrame already creates an
   // event receiver for us

From 0e0da178a55af7dbd1e1006762c46cdfa7b7240e Mon Sep 17 00:00:00 2001
From: Bas Schouten <bas@basschouten.com>
Date: Tue, 13 Nov 2012 11:57:59 -0800
Subject: [PATCH 62/76] Bug 811173. Part 1: Allow
 nsDisplayBackgroundColor::GetBounds to enable snapping. r=roc

--HG--
extra : rebase_source : 4eb0dadaaf17d7c30a82454c98390fd5c01eb4ec
---
 layout/base/nsDisplayList.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index d9f9b7456e0b..15437d0f1678 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1886,6 +1886,12 @@ public:
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                        HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
 
+  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
+  {
+    *aSnap = true;
+    return nsRect(ToReferenceFrame(), GetUnderlyingFrame()->GetSize());
+  }
+
   NS_DISPLAY_DECL_NAME("BackgroundColor", TYPE_BACKGROUND_COLOR)
 
   nscolor mColor;

From 31f5fe62a97792dbd49f1a6be937244a97bd3272 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 13 Nov 2012 22:26:29 -0800
Subject: [PATCH 63/76] Bug 808491 - Force 3d transformed layers to always be
 active. r=roc

---
 layout/base/nsDisplayList.cpp | 52 ++++++++++++++++++++---------------
 layout/base/nsDisplayList.h   | 10 +++----
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 1ead55289e15..a0007353de98 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2619,30 +2619,36 @@ void nsDisplayWrapList::Paint(nsDisplayListBuilder* aBuilder,
   NS_ERROR("nsDisplayWrapList should have been flattened away for painting");
 }
 
-bool nsDisplayWrapList::ChildrenCanBeInactive(nsDisplayListBuilder* aBuilder,
-                                              LayerManager* aManager,
-                                              const ContainerParameters& aParameters,
-                                              const nsDisplayList& aList,
-                                              nsIFrame* aActiveScrolledRoot) {
+LayerState
+nsDisplayWrapList::RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder,
+                                                 LayerManager* aManager,
+                                                 const ContainerParameters& aParameters,
+                                                 const nsDisplayList& aList,
+                                                 nsIFrame* aActiveScrolledRoot) {
+  LayerState result = LAYER_INACTIVE;
   for (nsDisplayItem* i = aList.GetBottom(); i; i = i->GetAbove()) {
     nsIFrame* f = i->GetUnderlyingFrame();
     if (f) {
       nsIFrame* activeScrolledRoot =
         nsLayoutUtils::GetActiveScrolledRootFor(f, nullptr);
-      if (activeScrolledRoot != aActiveScrolledRoot)
-        return false;
+      if (activeScrolledRoot != aActiveScrolledRoot && result == LAYER_INACTIVE)
+        result = LAYER_ACTIVE;
     }
 
     LayerState state = i->GetLayerState(aBuilder, aManager, aParameters);
-    if (state == LAYER_ACTIVE || state == LAYER_ACTIVE_FORCE)
-      return false;
+    if ((state == LAYER_ACTIVE || state == LAYER_ACTIVE_FORCE) && (state > result))
+      result = state;
     if (state == LAYER_NONE) {
       nsDisplayList* list = i->GetSameCoordinateSystemChildren();
-      if (list && !ChildrenCanBeInactive(aBuilder, aManager, aParameters, *list, aActiveScrolledRoot))
-        return false;
+      if (list) {
+        LayerState childState = RequiredLayerStateForChildren(aBuilder, aManager, aParameters, *list, aActiveScrolledRoot);
+        if (childState > result) {
+          result = childState;
+        }
+      }
     }
   }
-  return true;
+  return result;
 }
 
 nsRect nsDisplayWrapList::GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
@@ -2792,8 +2798,7 @@ nsDisplayOpacity::GetLayerState(nsDisplayListBuilder* aBuilder,
   }
   nsIFrame* activeScrolledRoot =
     nsLayoutUtils::GetActiveScrolledRootFor(mFrame, nullptr);
-  return !ChildrenCanBeInactive(aBuilder, aManager, aParameters, mList, activeScrolledRoot)
-      ? LAYER_ACTIVE : LAYER_INACTIVE;
+  return RequiredLayerStateForChildren(aBuilder, aManager, aParameters, mList, activeScrolledRoot);
 }
 
 bool
@@ -3938,13 +3943,17 @@ nsDisplayItem::LayerState
 nsDisplayTransform::GetLayerState(nsDisplayListBuilder* aBuilder,
                                   LayerManager* aManager,
                                   const ContainerParameters& aParameters) {
+  // If the transform is 3d, or the layer takes part in preserve-3d sorting
+  // then we *always* want this to be an active layer.
+  if (!GetTransform(mFrame->PresContext()->AppUnitsPerDevPixel()).Is2D() || 
+      mFrame->Preserves3D()) {
+    return LAYER_ACTIVE_FORCE;
+  }
   // Here we check if the *post-transform* bounds of this item are big enough
   // to justify an active layer.
   if (mFrame->AreLayersMarkedActive(nsChangeHint_UpdateTransformLayer) &&
       !IsItemTooSmallForActiveLayer(this))
     return LAYER_ACTIVE;
-  if (!GetTransform(mFrame->PresContext()->AppUnitsPerDevPixel()).Is2D() || mFrame->Preserves3D())
-    return LAYER_ACTIVE;
   if (mFrame->GetContent()) {
     if (nsLayoutUtils::HasAnimationsForCompositor(mFrame->GetContent(),
                                                   eCSSProperty_transform)) {
@@ -3953,12 +3962,11 @@ nsDisplayTransform::GetLayerState(nsDisplayListBuilder* aBuilder,
   }
   nsIFrame* activeScrolledRoot =
     nsLayoutUtils::GetActiveScrolledRootFor(mFrame, nullptr);
-  return !mStoredList.ChildrenCanBeInactive(aBuilder,
-                                            aManager,
-                                            aParameters,
-                                            *mStoredList.GetChildren(),
-                                            activeScrolledRoot)
-      ? LAYER_ACTIVE : LAYER_INACTIVE;
+  return mStoredList.RequiredLayerStateForChildren(aBuilder,
+                                                   aManager,
+                                                   aParameters,
+                                                   *mStoredList.GetChildren(),
+                                                   activeScrolledRoot);
 }
 
 bool nsDisplayTransform::ComputeVisibility(nsDisplayListBuilder *aBuilder,
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 15437d0f1678..f482d964d4a9 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -2129,11 +2129,11 @@ public:
    * ThebesLayer --- GetLayerState returns LAYER_INACTIVE or LAYER_NONE,
    * and they all have the given aActiveScrolledRoot.
    */
-  static bool ChildrenCanBeInactive(nsDisplayListBuilder* aBuilder,
-                                    LayerManager* aManager,
-                                    const ContainerParameters& aParameters,
-                                    const nsDisplayList& aList,
-                                    nsIFrame* aActiveScrolledRoot);
+  static LayerState RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder,
+                                                  LayerManager* aManager,
+                                                  const ContainerParameters& aParameters,
+                                                  const nsDisplayList& aList,
+                                                  nsIFrame* aActiveScrolledRoot);
 
 protected:
   nsDisplayWrapList() {}

From f6071f821a3334d994d23f0b6743418a81365c95 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 13 Nov 2012 14:22:21 -0800
Subject: [PATCH 64/76] Bug 810186 - Don't unnecessarily nest inactive layers.
 r=roc

---
 layout/base/FrameLayerBuilder.cpp | 3 ++-
 layout/reftests/bugs/reftest.list | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index eeda339c52ec..7013c2c33024 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2052,6 +2052,7 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
 
     // Assign the item to a layer
     if (layerState == LAYER_ACTIVE_FORCE ||
+        (layerState == LAYER_INACTIVE && !mManager->IsWidgetLayerManager()) ||
         (!forceInactive &&
          (layerState == LAYER_ACTIVE_EMPTY ||
           layerState == LAYER_ACTIVE))) {
@@ -2696,7 +2697,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
   gfxMatrix transform2d;
   bool canDraw2D = transform.CanDraw2D(&transform2d);
   gfxSize scale;
-  bool isRetained = aLayerBuilder->GetRetainingLayerManager() == aLayer->Manager();
+  bool isRetained = aLayer->Manager()->IsWidgetLayerManager();
   // Only fiddle with scale factors for the retaining layer manager, since
   // it only matters for retained layers
   // XXX Should we do something for 3D transforms?
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 2beef257d9fe..3153370a36af 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -681,7 +681,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) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
+fails-if(Android) random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(gtk2Widget,1,191) == 379316-2.html 379316-2-ref.html # bug 379786
 == 379328-1.html 379328-1-ref.html
 # The next set of reftests all fail until bug 724978 has been fixed, and the
 # overflow container ability of nsColumnSetFrame is restored.

From bf9c5a8fc92a8756b9a3be7b1e6d2475a8e8829d Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 13 Nov 2012 22:26:33 -0800
Subject: [PATCH 65/76] Bug 811570 - Make the root content scroll frame
 inactive initially if it is overflow hidden. r=roc

---
 layout/generic/nsGfxScrollFrame.cpp | 29 ++++++++++++++++++++++++-----
 layout/generic/nsGfxScrollFrame.h   |  3 +++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 54f0c0e24df4..b183c3555d3d 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1455,6 +1455,7 @@ nsGfxScrollFrameInner::nsGfxScrollFrameInner(nsContainerFrame* aOuter,
   , mUpdateScrollbarAttributes(false)
   , mCollapsedResizer(false)
   , mShouldBuildLayer(false)
+  , mHasBeenScrolled(false)
 {
   mScrollingActive = IsAlwaysActive();
 
@@ -1740,11 +1741,23 @@ bool nsGfxScrollFrameInner::ShouldClampScrollPosition() const
 
 bool nsGfxScrollFrameInner::IsAlwaysActive() const
 {
-  // The root scrollframe for a non-chrome document which is the direct
-  // child of a chrome document is always treated as "active".
-  // XXX maybe we should extend this so that IFRAMEs which are fill the
-  // entire viewport (like GMail!) are always active
-  return mIsRoot && mOuter->PresContext()->IsRootContentDocument();
+  // Unless this is the root scrollframe for a non-chrome document 
+  // which is the direct child of a chrome document, we default to not
+  // being "active".
+  if (!(mIsRoot && mOuter->PresContext()->IsRootContentDocument())) {
+     return false;
+  }
+
+  // If we have scrolled before, then we should stay active.
+  if (mHasBeenScrolled) {
+   return true;
+  }
+ 
+  // If we're overflow:hidden, then start as inactive until
+  // we get scrolled manually.
+  ScrollbarStyles styles = GetScrollbarStylesFromFrame();
+  return (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN &&
+          styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN);
 }
 
 void nsGfxScrollFrameInner::MarkInactive()
@@ -1774,6 +1787,12 @@ void nsGfxScrollFrameInner::MarkActive()
 
 void nsGfxScrollFrameInner::ScrollVisual(nsPoint aOldScrolledFramePos)
 {
+  // Mark this frame as having been scrolled. If this is the root
+  // scroll frame of a content document, then IsAlwaysActive()
+  // will return true from now on and MarkInactive() won't
+  // have any effect.
+  mHasBeenScrolled = true;
+
   AdjustViews(mScrolledFrame);
   // We need to call this after fixing up the view positions
   // to be consistent with the frame hierarchy.
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 9c6f5a932769..b13e5e3d47ce 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -334,6 +334,9 @@ public:
   // Used for asynchronous scrolling.
   bool mShouldBuildLayer:1;
 
+  // True if this frame has been scrolled at least once
+  bool mHasBeenScrolled:1;
+
 protected:
   void ScrollToWithOrigin(nsPoint aScrollPosition,
                           nsIScrollableFrame::ScrollMode aMode,

From b160bd08730d179a0d47fbfb5a2c0848b5108f34 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Wed, 14 Nov 2012 14:29:11 +0800
Subject: [PATCH 66/76] Bug 809781 - Fixed sending file failure, r=gyeh

---
 dom/bluetooth/BluetoothOppManager.cpp | 159 +++++++++++++++++---------
 dom/bluetooth/BluetoothOppManager.h   |   2 +
 dom/bluetooth/ObexBase.h              |   8 +-
 3 files changed, 111 insertions(+), 58 deletions(-)

diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index e0781d3288b7..ff8b6264592c 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -191,6 +191,14 @@ BluetoothOppManager::Connect(const nsAString& aDeviceObjectPath,
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  if (GetConnectionStatus() == SocketConnectionStatus::SOCKET_CONNECTED ||
+      GetConnectionStatus() == SocketConnectionStatus::SOCKET_CONNECTING) {
+    NS_WARNING("BluetoothOppManager has been already connected");
+    return false;
+  }
+
+  CloseSocket();
+
   BluetoothService* bs = BluetoothService::Get();
   if (!bs) {
     NS_WARNING("BluetoothService not available!");
@@ -200,7 +208,7 @@ BluetoothOppManager::Connect(const nsAString& aDeviceObjectPath,
   nsString serviceUuidStr =
     NS_ConvertUTF8toUTF16(BluetoothServiceUuidStr::ObjectPush);
 
-  nsRefPtr<BluetoothReplyRunnable> runnable = aRunnable;
+  mRunnable = aRunnable;
 
   nsresult rv = bs->GetSocketViaService(aDeviceObjectPath,
                                         serviceUuidStr,
@@ -208,15 +216,19 @@ BluetoothOppManager::Connect(const nsAString& aDeviceObjectPath,
                                         true,
                                         true,
                                         this,
-                                        runnable);
+                                        mRunnable);
 
-  runnable.forget();
   return NS_FAILED(rv) ? false : true;
 }
 
 void
 BluetoothOppManager::Disconnect()
 {
+  if (GetConnectionStatus() == SocketConnectionStatus::SOCKET_DISCONNECTED) {
+    NS_WARNING("BluetoothOppManager has been disconnected!");
+    return;
+  }
+
   CloseSocket();
 }
 
@@ -269,6 +281,15 @@ BluetoothOppManager::SendFile(BlobParent* aActor)
    */
   mBlob = aActor->GetBlob();
 
+  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
+  if (file) {
+    file->GetName(sFileName);
+  }
+
+  if (sFileName.IsEmpty()) {
+    sFileName.AssignLiteral("Unknown");
+  }
+
   SendConnectRequest();
 
   return true;
@@ -463,57 +484,51 @@ BluetoothOppManager::ReceiveSocketData(UnixSocketRawData* aMessage)
       mRemoteMaxPacketLength =
         (((int)(aMessage->mData[5]) << 8) | aMessage->mData[6]);
 
-      if (mBlob) {
-        /*
-         * Before sending content, we have to send a header including
-         * information such as file name, file length and content type.
-         */
-        nsresult rv;
-        nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
-        if (file) {
-          rv = file->GetName(sFileName);
-        }
-
-        if (!file || sFileName.IsEmpty()) {
-          sFileName.AssignLiteral("Unknown");
-        }
-
-        rv = mBlob->GetType(sContentType);
-        if (NS_FAILED(rv)) {
-          NS_WARNING("Can't get content type");
-          return;
-        }
-
-        uint64_t fileLength;
-        rv = mBlob->GetSize(&fileLength);
-        if (NS_FAILED(rv)) {
-          NS_WARNING("Can't get file size");
-          return;
-        }
-
-        // Currently we keep the size of files which were sent/received via
-        // Bluetooth not exceed UINT32_MAX because the Length header in OBEX
-        // is only 4-byte long. Although it is possible to transfer a file
-        // larger than UINT32_MAX, it needs to parse another OBEX Header
-        // and I would like to leave it as a feature.
-        if (fileLength <= UINT32_MAX) {
-          NS_WARNING("The file size is too large for now");
-          SendDisconnectRequest();
-          return;
-        }
-
-        sFileLength = fileLength;
-
-        if (NS_FAILED(NS_NewThread(getter_AddRefs(mReadFileThread)))) {
-          NS_WARNING("Can't create thread");
-          SendDisconnectRequest();
-          return;
-        }
-
-        sInstance->SendPutHeaderRequest(sFileName, sFileLength);
-        StartFileTransfer(mConnectedDeviceAddress, false,
-                          sFileName, sFileLength, sContentType);
+      MOZ_ASSERT(!sFileName.IsEmpty());
+      MOZ_ASSERT(mBlob);
+      /*
+       * Before sending content, we have to send a header including
+       * information such as file name, file length and content type.
+       */
+      nsresult rv = mBlob->GetType(sContentType);
+      if (NS_FAILED(rv)) {
+        NS_WARNING("Can't get content type");
+        SendDisconnectRequest();
+        return;
       }
+
+      uint64_t fileLength;
+      rv = mBlob->GetSize(&fileLength);
+      if (NS_FAILED(rv)) {
+        NS_WARNING("Can't get file size");
+        SendDisconnectRequest();
+        return;
+      }
+
+      // Currently we keep the size of files which were sent/received via
+      // Bluetooth not exceed UINT32_MAX because the Length header in OBEX
+      // is only 4-byte long. Although it is possible to transfer a file
+      // larger than UINT32_MAX, it needs to parse another OBEX Header
+      // and I would like to leave it as a feature.
+      if (fileLength > (uint64_t)UINT32_MAX) {
+        NS_WARNING("The file size is too large for now");
+        SendDisconnectRequest();
+        return;
+      }
+
+      sFileLength = fileLength;
+
+      if (NS_FAILED(NS_NewThread(getter_AddRefs(mReadFileThread)))) {
+        NS_WARNING("Can't create thread");
+        SendDisconnectRequest();
+        return;
+      }
+
+      sInstance->SendPutHeaderRequest(sFileName, sFileLength);
+      StartFileTransfer(mConnectedDeviceAddress, false,
+                        sFileName, sFileLength, sContentType);
+    } else {
+      SendDisconnectRequest();
     }
   } else if (mLastCommand == ObexRequestCode::Disconnect) {
     if (opCode != ObexResponseCode::Success) {
@@ -524,12 +539,14 @@ BluetoothOppManager::ReceiveSocketData(UnixSocketRawData* aMessage)
     AfterOppDisconnected();
   } else if (mLastCommand == ObexRequestCode::Put) {
     if (opCode != ObexResponseCode::Continue) {
-      // FIXME: Needs error handling here
       NS_WARNING("[OPP] Put failed");
+      FileTransferComplete(mConnectedDeviceAddress, false, false, sFileName,
+                           sSentFileLength, sContentType);
+      SendDisconnectRequest();
       return;
     }
 
-    if (mAbortFlag || mReadFileThread) {
+    if (mAbortFlag) {
       SendAbortRequest();
       return;
     }
@@ -540,10 +557,13 @@ BluetoothOppManager::ReceiveSocketData(UnixSocketRawData* aMessage)
       mUpdateProgressCounter = sSentFileLength / kUpdateProgressBase + 1;
     }
 
-    if (mInputStream) {
+    if (!mInputStream) {
       nsresult rv = mBlob->GetInternalStream(getter_AddRefs(mInputStream));
       if (NS_FAILED(rv)) {
         NS_WARNING("Can't get internal stream of blob");
+        FileTransferComplete(mConnectedDeviceAddress, false, false, sFileName,
+                             sSentFileLength, sContentType);
+        SendDisconnectRequest();
         return;
       }
     }
@@ -551,11 +571,16 @@ BluetoothOppManager::ReceiveSocketData(UnixSocketRawData* aMessage)
     nsRefPtr<ReadFileTask> task = new ReadFileTask(mInputStream);
     if (NS_FAILED(mReadFileThread->Dispatch(task, NS_DISPATCH_NORMAL))) {
       NS_WARNING("Cannot dispatch ring task!");
+      FileTransferComplete(mConnectedDeviceAddress, false, false, sFileName,
+                           sSentFileLength, sContentType);
+      SendDisconnectRequest();
     }
   } else if (mLastCommand == ObexRequestCode::PutFinal) {
     if (opCode != ObexResponseCode::Success) {
-      // FIXME: Needs error handling here
       NS_WARNING("[OPP] PutFinal failed");
+      FileTransferComplete(mConnectedDeviceAddress, false, false, sFileName,
+                           sSentFileLength, sContentType);
+      SendDisconnectRequest();
       return;
     }
 
@@ -1041,6 +1066,15 @@ BluetoothOppManager::ReceivingFileConfirmation(const nsString& aAddress,
 void
 BluetoothOppManager::OnConnectSuccess()
 {
+  if (mRunnable) {
+    BluetoothReply* reply = new BluetoothReply(BluetoothReplySuccess(true));
+    mRunnable->SetReply(reply);
+    if (NS_FAILED(NS_DispatchToMainThread(mRunnable))) {
+      NS_WARNING("Failed to dispatch to main thread!");
+    }
+    mRunnable.forget();
+  }
+
   // Cache device address since we can't get socket address when a remote
   // device disconnect with us.
   GetSocketAddr(mConnectedDeviceAddress);
@@ -1051,6 +1085,17 @@ BluetoothOppManager::OnConnectSuccess()
 void
 BluetoothOppManager::OnConnectError()
 {
+  if (mRunnable) {
+    nsString errorStr;
+    errorStr.AssignLiteral("Failed to connect with a bluetooth opp manager!");
+    BluetoothReply* reply = new BluetoothReply(BluetoothReplyError(errorStr));
+    mRunnable->SetReply(reply);
+    if (NS_FAILED(NS_DispatchToMainThread(mRunnable))) {
+      NS_WARNING("Failed to dispatch to main thread!");
+    }
+    mRunnable.forget();
+  }
+
   CloseSocket();
   mSocketStatus = GetConnectionStatus();
   Listen();
diff --git a/dom/bluetooth/BluetoothOppManager.h b/dom/bluetooth/BluetoothOppManager.h
index 2a57e12a14f3..cf368d0a89eb 100644
--- a/dom/bluetooth/BluetoothOppManager.h
+++ b/dom/bluetooth/BluetoothOppManager.h
@@ -118,6 +118,8 @@ private:
   nsCOMPtr<nsIThread> mReadFileThread;
   nsCOMPtr<nsIOutputStream> mOutputStream;
   nsCOMPtr<nsIInputStream> mInputStream;
+
+  nsRefPtr<BluetoothReplyRunnable> mRunnable;
 };
 
 END_BLUETOOTH_NAMESPACE
diff --git a/dom/bluetooth/ObexBase.h b/dom/bluetooth/ObexBase.h
index 6c89b50ccfc1..35a82e36edb2 100644
--- a/dom/bluetooth/ObexBase.h
+++ b/dom/bluetooth/ObexBase.h
@@ -148,8 +148,14 @@ public:
 
     for (int i = 0; i < length; ++i) {
       if (mHeaders[i]->mId == ObexHeaderId::Name) {
+        /*
+         * According to section 2.2.2 [Name] of IrOBEX spec, we know that
+         * the Name header is "a null terminated Unicode text string describing
+         * the name of the object.", and that's the reason why we need to minus
+         * 1 to get the real length of the file name.
+         */
+        int nameLength = mHeaders[i]->mDataLength / 2 - 1;
         uint8_t* ptr = mHeaders[i]->mData.get();
-        int nameLength = mHeaders[i]->mDataLength / 2;
 
         for (int j = 0; j < nameLength; ++j) {
           PRUnichar c = ((((uint32_t)ptr[j * 2]) << 8) | ptr[j * 2 + 1]);

From daa5aaee8b1fd8166634e9e2d9c311990e9afdb1 Mon Sep 17 00:00:00 2001
From: Joey Blacksmith <joey.blacksmith@gmail.com>
Date: Wed, 14 Nov 2012 16:08:45 +0900
Subject: [PATCH 67/76] Bug 801356 - LeafAccessible needs to override
 Append/InsertChild, r=surkov, f=tbsaunde

---
 accessible/src/generic/BaseAccessibles.cpp | 21 +++++++++++++++++++++
 accessible/src/generic/BaseAccessibles.h   |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/accessible/src/generic/BaseAccessibles.cpp b/accessible/src/generic/BaseAccessibles.cpp
index a5b11cb7fd5c..4935dcba04b4 100644
--- a/accessible/src/generic/BaseAccessibles.cpp
+++ b/accessible/src/generic/BaseAccessibles.cpp
@@ -43,6 +43,27 @@ LeafAccessible::ChildAtPoint(int32_t aX, int32_t aY,
   return this;
 }
 
+bool
+LeafAccessible::AppendChild(Accessible* aChild)
+{
+  NS_NOTREACHED("AppendChild called on leaf accessible!");
+  return false;
+}
+
+bool
+LeafAccessible::InsertChildAt(uint32_t aIndex, Accessible* aChild)
+{
+  NS_NOTREACHED("InsertChildAt called on leaf accessible!");
+  return false;
+}
+
+bool
+LeafAccessible::RemoveChild(Accessible* aChild)
+{
+  NS_NOTREACHED("RemoveChild called on leaf accessible!");
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // LeafAccessible: Accessible private
 
diff --git a/accessible/src/generic/BaseAccessibles.h b/accessible/src/generic/BaseAccessibles.h
index af959dc681a1..5288b0e2dd43 100644
--- a/accessible/src/generic/BaseAccessibles.h
+++ b/accessible/src/generic/BaseAccessibles.h
@@ -34,6 +34,10 @@ public:
   // Accessible
   virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
                                    EWhichChildAtPoint aWhichChild);
+  
+  virtual bool AppendChild(Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL;
+  virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL;
+  virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL;
 
 protected:
 

From 18749ba8e02527a7e2ebf03ee082dd6ba777c5f0 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 13 Nov 2012 23:13:35 -0800
Subject: [PATCH 68/76] Fix an initialization order warning in nsDocShell.cpp,
 no bug

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

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 3ff70ea3fa1b..71d41ecf5f2e 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -730,7 +730,6 @@ nsDocShell::nsDocShell():
     mCharsetReloadState(eCharsetReloadInit),
     mChildOffset(0),
     mBusyFlags(BUSY_FLAGS_NONE),
-    mFrameType(eFrameTypeRegular),
     mAppType(nsIDocShell::APP_TYPE_UNKNOWN),
     mLoadType(0),
     mMarginWidth(-1),
@@ -768,6 +767,7 @@ nsDocShell::nsDocShell():
 #ifdef DEBUG
     mInEnsureScriptEnv(false),
 #endif
+    mFrameType(eFrameTypeRegular),
     mOwnOrContainingAppId(nsIScriptSecurityManager::UNKNOWN_APP_ID),
     mParentCharsetSource(0)
 {

From 2dbeb244085cbe26492426c1b3472faf05dedcf8 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Tue, 13 Nov 2012 23:26:27 -0800
Subject: [PATCH 69/76] Back out 3fd41b40e88f (bug 809274) and 22e38380a161
 (Bug 804591) for Win7 browser-chrome timeouts

---
 browser/base/content/browser-social.js        |  6 +-
 browser/base/content/socialchat.xml           |  5 +-
 .../content/test/browser_social_chatwindow.js | 79 -------------------
 3 files changed, 3 insertions(+), 87 deletions(-)

diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 63f820af505e..253fe6c1865f 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -982,11 +982,7 @@ var SocialSidebar = {
 
   setSidebarVisibilityState: function(aEnabled) {
     let sbrowser = document.getElementById("social-sidebar-browser");
-    // it's possible we'll be called twice with aEnabled=false so let's
-    // just assume we may often be called with the same state.
-    if (aEnabled == sbrowser.docShellIsActive)
-      return;
-    sbrowser.docShellIsActive = aEnabled;
+    sbrowser.docShell.isActive = aEnabled;
     let evt = sbrowser.contentDocument.createEvent("CustomEvent");
     evt.initCustomEvent(aEnabled ? "socialFrameShow" : "socialFrameHide", true, true, {});
     sbrowser.contentDocument.documentElement.dispatchEvent(evt);
diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index c21c55b82cf7..4363e713bee5 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -279,9 +279,8 @@
 
       <method name="showChat">
         <parameter name="aChatbox"/>
-        <parameter name="aMode"/>
         <body><![CDATA[
-          if ((aMode != "minimized") && aChatbox.minimized)
+          if (aChatbox.minimized)
             aChatbox.minimized = false;
           if (this.selectedChat != aChatbox)
             this.selectedChat = aChatbox;
@@ -354,7 +353,7 @@
           if (cb) {
             cb = cb.get();
             if (cb.parentNode) {
-              this.showChat(cb, aMode);
+              this.showChat(cb);
               if (aCallback)
                 aCallback(cb.iframe.contentWindow);
               return;
diff --git a/browser/base/content/test/browser_social_chatwindow.js b/browser/base/content/test/browser_social_chatwindow.js
index b7d35169a99d..9a1cbc92f125 100644
--- a/browser/base/content/test/browser_social_chatwindow.js
+++ b/browser/base/content/test/browser_social_chatwindow.js
@@ -60,85 +60,6 @@ var tests = {
     }
     port.postMessage({topic: "test-init", data: { id: 1 }});
   },
-  testOpenMinimized: function(next) {
-    // In this case the sidebar opens a chat (without specifying minimized).
-    // We then minimize it and have the sidebar reopen the chat (again without
-    // minimized).  On that second call the chat should open and no longer
-    // be minimized.
-    let chats = document.getElementById("pinnedchats");
-    let port = Social.provider.getWorkerPort();
-    let seen_opened = false;
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "test-init-done":
-          port.postMessage({topic: "test-chatbox-open"});
-          break;
-        case "chatbox-opened":
-          is(e.data.result, "ok", "the sidebar says it got a chatbox");
-          if (!seen_opened) {
-            // first time we got the opened message, so minimize the chat then
-            // re-request the same chat to be opened - we should get the
-            // message again and the chat should be restored.
-            ok(!chats.selectedChat.minimized, "chat not initially minimized")
-            chats.selectedChat.minimized = true
-            seen_opened = true;
-            port.postMessage({topic: "test-chatbox-open"});
-          } else {
-            // This is the second time we've seen this message - there should
-            // be exactly 1 chat open and it should no longer be minimized.
-            let chats = document.getElementById("pinnedchats");
-            ok(!chats.selectedChat.minimized, "chat no longer minimized")
-            chats.selectedChat.close();
-            is(chats.selectedChat, null, "should only have been one chat open");
-            port.close();
-            next();
-          }
-      }
-    }
-    port.postMessage({topic: "test-init", data: { id: 1 }});
-  },
-  // In this case the *worker* opens a chat (so minimized is specified).
-  // The worker then makes the same call again - as that second call also
-  // specifies "minimized" the chat should *not* be restored.
-  testWorkerChatWindowMinimized: function(next) {
-    const chatUrl = "https://example.com/browser/browser/base/content/test/social_chat.html";
-    let port = Social.provider.getWorkerPort();
-    let seen_opened = false;
-    ok(port, "provider has a port");
-    port.postMessage({topic: "test-init"});
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "got-chatbox-message":
-          ok(true, "got a chat window opened");
-          let chats = document.getElementById("pinnedchats");
-          if (!seen_opened) {
-            // first time we got the opened message, so minimize the chat then
-            // re-request the same chat to be opened - we should get the
-            // message again and the chat should be restored.
-            ok(chats.selectedChat.minimized, "chatbox from worker opened as minimized");
-            seen_opened = true;
-            port.postMessage({topic: "test-worker-chat", data: chatUrl});
-            // Sadly there is no notification we can use to know the chat was
-            // re-opened :(  So we ask the chat window to "ping" us - by then
-            // the second request should have made it.
-            chats.selectedChat.iframe.contentWindow.wrappedJSObject.pingWorker();
-          } else {
-            // This is the second time we've seen this message - there should
-            // be exactly 1 chat open and it should still be minimized.
-            let chats = document.getElementById("pinnedchats");
-            ok(chats.selectedChat.minimized, "chat still minimized")
-            chats.selectedChat.close();
-            is(chats.selectedChat, null, "should only have been one chat open");
-            port.close();
-            next();
-          }
-          break;
-      }
-    }
-    port.postMessage({topic: "test-worker-chat", data: chatUrl});
-  },
   testManyChats: function(next) {
     // open enough chats to overflow the window, then check
     // if the menupopup is visible

From df61ed96bc05ed747792fc2c5da4e09938e9a7ba Mon Sep 17 00:00:00 2001
From: Henrik Skupin <hskupin@mozilla.com>
Date: Wed, 14 Nov 2012 08:46:36 +0100
Subject: [PATCH 70/76] Bug 811185 - Implement Emulator class for screen
 orientation in Marionette. r=jgriffin

---
 .../marionette/client/marionette/emulator.py  |  3 +
 .../client/marionette/emulator_screen.py      | 78 +++++++++++++++++++
 .../marionette/tests/unit/test_emulator.py    |  4 +
 .../tests/unit/test_emulator_screen.py        | 34 ++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 testing/marionette/client/marionette/emulator_screen.py
 create mode 100644 testing/marionette/client/marionette/tests/unit/test_emulator_screen.py

diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py
index d3ad70c4cf23..e2f2527c9d2c 100644
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -19,6 +19,7 @@ import time
 
 from emulator_battery import EmulatorBattery
 from emulator_geo import EmulatorGeo
+from emulator_screen import EmulatorScreen
 
 
 class LogcatProc(ProcessHandlerMixin):
@@ -59,6 +60,7 @@ class Emulator(object):
         self.res = res
         self.battery = EmulatorBattery(self)
         self.geo = EmulatorGeo(self)
+        self.screen = EmulatorScreen(self)
         self.homedir = homedir
         self.sdcard = sdcard
         self.noWindow = noWindow
@@ -359,6 +361,7 @@ waitFor(
         # bug 802877
         time.sleep(10)
         self.geo.set_default_location()
+        self.screen.initialize()
 
         if self.logcat_dir:
             self.save_logcat()
diff --git a/testing/marionette/client/marionette/emulator_screen.py b/testing/marionette/client/marionette/emulator_screen.py
new file mode 100644
index 000000000000..c93b8eaa3d0a
--- /dev/null
+++ b/testing/marionette/client/marionette/emulator_screen.py
@@ -0,0 +1,78 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+class EmulatorScreen(object):
+    """Class for screen related emulator commands."""
+
+    SO_PORTRAIT_PRIMARY = 'portrait-primary'
+    SO_PORTRAIT_SECONDARY = 'portrait-secondary'
+    SO_LANDSCAPE_PRIMARY = 'landscape-primary'
+    SO_LANDSCAPE_SECONDARY = 'landscape-secondary'
+
+    def __init__(self, emulator):
+        self.emulator = emulator
+
+    def initialize(self):
+        self.orientation = self.SO_PORTRAIT_PRIMARY
+
+    def _get_raw_orientation(self):
+        """Get the raw value of the current device orientation."""
+        response = self.emulator._run_telnet('sensor get orientation')
+
+        return response[0].split('=')[1].strip()
+
+    def _set_raw_orientation(self, data):
+        """Set the raw value of the specified device orientation."""
+        self.emulator._run_telnet('sensor set orientation %s' % data)
+
+    def get_orientation(self):
+        """Get the current device orientation.
+
+        Returns;
+            orientation -- Orientation of the device. One of:
+                            SO_PORTRAIT_PRIMARY - system buttons at the bottom
+                            SO_PORTRIAT_SECONDARY - system buttons at the top
+                            SO_LANDSCAPE_PRIMARY - system buttons at the right
+                            SO_LANDSCAPE_SECONDARY - system buttons at the left
+
+        """
+        data = self._get_raw_orientation()
+
+        if data == '0:-90:0':
+            orientation = self.SO_PORTRAIT_PRIMARY
+        elif data == '0:90:0':
+            orientation = self.SO_PORTRAIT_SECONDARY
+        elif data == '0:0:90':
+            orientation = self.SO_LANDSCAPE_PRIMARY
+        elif data == '0:0:-90':
+            orientation = self.SO_LANDSCAPE_SECONDARY
+        else:
+            raise ValueError('Unknown orientation sensor value: %s.' % data)
+
+        return orientation
+
+    def set_orientation(self, orientation):
+        """Set the specified device orientation.
+
+        Args
+            orientation -- Orientation of the device. One of:
+                            SO_PORTRAIT_PRIMARY - system buttons at the bottom
+                            SO_PORTRIAT_SECONDARY - system buttons at the top
+                            SO_LANDSCAPE_PRIMARY - system buttons at the right
+                            SO_LANDSCAPE_SECONDARY - system buttons at the left
+        """
+        if orientation == SO_PORTRAIT_PRIMARY:
+            data = '0:-90:0'
+        elif orientation == SO_PORTRAIT_SECONDARY:
+            data = '0:90:0'
+        elif orientation == SO_LANDSCAPE_PRIMARY:
+            data = '0:0:90'
+        elif orientation == SO_LANDSCAPE_SECONDARY:
+            data = '0:0:-90'
+        else:
+            raise ValueError('Invalid orientation: %s' % orientation)
+
+        self._set_raw_orientation(data)
+
+    orientation = property(get_orientation, set_orientation)
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator.py b/testing/marionette/client/marionette/tests/unit/test_emulator.py
index a5ba9a3d5a89..ed0dc6642a2a 100644
--- a/testing/marionette/client/marionette/tests/unit/test_emulator.py
+++ b/testing/marionette/client/marionette/tests/unit/test_emulator.py
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 from marionette_test import MarionetteTestCase
 from errors import JavascriptException, MarionetteException
 
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py b/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py
new file mode 100644
index 000000000000..b4f1f6c6c0cc
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py
@@ -0,0 +1,34 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from marionette_test import MarionetteTestCase
+
+
+class TestEmulatorScreen(MarionetteTestCase):
+
+    def setUp(self):
+        MarionetteTestCase.setUp(self)
+
+        self.screen = self.marionette.emulator.screen
+        self.screen.initialize()
+
+    def test_emulator_orientation(self):
+        self.assertEqual(self.screen.orientation, self.screen.SO_PORTRAIT_PRIMARY,
+                         'Orientation has been correctly initialized.')
+
+        self.sensor.orientation = self.sensor.SO_PORTRAIT_SECONDARY
+        self.assertEqual(self.sensor.orientation, self.sensor.SO_PORTRAIT_SECONDARY,
+                         'Orientation has been set to portrait-secondary')
+
+        self.sensor.orientation = self.sensor.SO_LANDSCAPE_PRIMARY
+        self.assertEqual(self.sensor.orientation, self.sensor.SO_LANDSCAPE_PRIMARY,
+                         'Orientation has been set to landscape-primary')
+
+        self.sensor.orientation = self.sensor.SO_LANDSCAPE_SECONDARY
+        self.assertEqual(self.sensor.orientation, self.sensor.SO_LANDSCAPE_SECONDARY,
+                         'Orientation has been set to landscape-secondary')
+
+        self.sensor.orientation = self.sensor.SO_PORTRAIT_PRIMARY
+        self.assertEqual(self.sensor.orientation, self.sensor.SO_PORTRAIT_PRIMARY,
+                         'Orientation has been set to portrait-primary')

From 61b784ba3df5cc9a111d82c243b58857840886bc Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 14 Nov 2012 08:46:33 +0100
Subject: [PATCH 71/76] Bug 811214 - Fix build failure in SpdySession3.cpp with
 clang 3.1. r=mcmanus

---
 netwerk/protocol/http/SpdySession3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/protocol/http/SpdySession3.cpp b/netwerk/protocol/http/SpdySession3.cpp
index a933450172b2..5a1cd6aabb37 100644
--- a/netwerk/protocol/http/SpdySession3.cpp
+++ b/netwerk/protocol/http/SpdySession3.cpp
@@ -1870,7 +1870,7 @@ SpdySession3::Close(nsresult aReason)
   mStreamTransactionHash.Clear();
 
   if (NS_SUCCEEDED(aReason))
-    GenerateGoAway(goawayReason::OK);
+    GenerateGoAway(OK);
   mConnection = nullptr;
   mSegmentReader = nullptr;
   mSegmentWriter = nullptr;

From bcdc91e868cfc2f14295ac64f16ea4df1120d4a1 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 14 Nov 2012 08:47:06 +0100
Subject: [PATCH 72/76] Bug 811336 - Only pass --nsscmd to MOZ_SIGN_CMD when
 signing Windows builds. r=catlee

---
 toolkit/mozapps/installer/packager.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index dd63f6de6b9c..b183ce3f506d 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -557,7 +557,10 @@ UNMAKE_PACKAGE	= $(INNER_UNMAKE_PACKAGE)
 endif # def MOZ_OMNIJAR
 
 ifdef MOZ_INTERNAL_SIGNING_FORMAT
-MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x)) --nsscmd "$(SIGN_CMD)"
+MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x))
+ifeq (WINNT,$(OS_ARCH))
+MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd "$(SIGN_CMD)"
+endif
 endif
 
 # For final GPG / authenticode signing / dmg signing if required

From ae7bf451e1983dc630e82989a9d9b0d655ea124e Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 14 Nov 2012 00:34:25 -0800
Subject: [PATCH 73/76] Bug 802510 - Reset position on the thumbnail data
 buffer to the beginning before reading out of it. r=blassey

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

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 88ef97ddcd3e..80a4bcfc54d1 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -729,6 +729,7 @@ abstract public class GeckoApp
     void handleThumbnailData(Tab tab, ByteBuffer data) {
         if (shouldUpdateThumbnail(tab)) {
             Bitmap b = tab.getThumbnailBitmap();
+            data.position(0);
             b.copyPixelsFromBuffer(data);
             processThumbnail(tab, b, null);
         }

From def6cea2cd750bfdb495b0499a0947dc40740f49 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 14 Nov 2012 09:58:23 +0100
Subject: [PATCH 74/76] Bug 809021 - Fix FastInvoke arguments length. r=dvander

---
 js/src/ion/Ion.cpp                     | 12 +++--
 js/src/ion/Ion.h                       |  2 +-
 js/src/jit-test/tests/ion/bug809021.js | 73 ++++++++++++++++++++++++++
 js/src/jsinterpinlines.h               |  2 +-
 4 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug809021.js

diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 02a413b11b9b..c2073bf30a1e 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1375,7 +1375,7 @@ ion::CanEnter(JSContext *cx, HandleScript script, StackFrame *fp, bool newType)
 }
 
 MethodStatus
-ion::CanEnterUsingFastInvoke(JSContext *cx, HandleScript script)
+ion::CanEnterUsingFastInvoke(JSContext *cx, HandleScript script, uint32_t numActualArgs)
 {
     JS_ASSERT(ion::IsEnabled(cx));
 
@@ -1383,6 +1383,11 @@ ion::CanEnterUsingFastInvoke(JSContext *cx, HandleScript script)
     if (!script->hasIonScript() || script->ion->bailoutExpected())
         return Method_Skipped;
 
+    // Don't handle arguments underflow, to make this work we would have to pad
+    // missing arguments with |undefined|.
+    if (numActualArgs < script->function()->nargs)
+        return Method_Skipped;
+
     if (!cx->compartment->ensureIonCompartmentExists(cx))
         return Method_Error;
 
@@ -1583,11 +1588,12 @@ ion::FastInvoke(JSContext *cx, HandleFunction fun, CallArgsList &args)
     EnterIonCode enter = cx->compartment->ionCompartment()->enterJITInfallible();
     void *calleeToken = CalleeToToken(fun);
 
-    Value result = Int32Value(fun->nargs);
+    Value result = Int32Value(args.length());
+    JS_ASSERT(args.length() >= fun->nargs);
 
     JSAutoResolveFlags rf(cx, RESOLVE_INFER);
     args.setActive();
-    enter(jitcode, args.length() + 1, &args[0] - 1, fp, calleeToken, &result);
+    enter(jitcode, args.length() + 1, args.array() - 1, fp, calleeToken, &result);
     args.setInactive();
 
     if (clearCallingIntoIon)
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index 9963d9d82097..39cd9566e253 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -226,7 +226,7 @@ bool SetIonContext(IonContext *ctx);
 MethodStatus CanEnterAtBranch(JSContext *cx, HandleScript script,
                               StackFrame *fp, jsbytecode *pc);
 MethodStatus CanEnter(JSContext *cx, HandleScript script, StackFrame *fp, bool newType);
-MethodStatus CanEnterUsingFastInvoke(JSContext *cx, HandleScript script);
+MethodStatus CanEnterUsingFastInvoke(JSContext *cx, HandleScript script, uint32_t numActualArgs);
 
 enum IonExecStatus
 {
diff --git a/js/src/jit-test/tests/ion/bug809021.js b/js/src/jit-test/tests/ion/bug809021.js
new file mode 100644
index 000000000000..c4c3d436be74
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug809021.js
@@ -0,0 +1,73 @@
+// nactuals > nformals
+function testOverflow() {
+    var called = false;
+    function f(a) {
+        assertEq(a, 173);
+        assertEq(arguments.length, 2);
+        assertEq(arguments[0], a);
+        assertEq(arguments[1], a);
+        called = true;
+    }
+
+    for (var i=0; i<10; i++)
+        [173, 173, 173].sort(f);
+    assertEq(called, true);
+}
+testOverflow();
+
+// nactuals == nformals
+function testEqual() {
+    var called = false;
+    function f(a, b) {
+        assertEq(a, 173);
+        assertEq(arguments.length, 2);
+        assertEq(arguments[0], a);
+        assertEq(arguments[1], b);
+        called = true;
+    }
+
+    for (var i=0; i<10; i++)
+        [173, 173, 173].sort(f);
+    assertEq(called, true);
+}
+testEqual();
+
+// nactuals < nformals
+function testUnderflow() {
+    var called = false;
+    function f(a, b, c) {
+        assertEq(a, 173);
+        assertEq(c, undefined);
+        assertEq(arguments.length, 2);
+        assertEq(arguments[0], a);
+        assertEq(arguments[1], b);
+        called = true;
+    }
+
+    for (var i=0; i<10; i++)
+        [173, 173, 173].sort(f);
+    assertEq(called, true);
+}
+testUnderflow();
+
+function testUnderflowMany() {
+    var called = 0;
+    function f(a, b, c, d, e, f, g, h) {
+        assertEq(a, 173);
+        assertEq(arguments.length, 3);
+        assertEq(arguments[0], a);
+        assertEq(arguments[1] < 3, true);
+        assertEq(c.length, 3);
+        assertEq(d, undefined);
+        assertEq(e, undefined);
+        assertEq(f, undefined);
+        assertEq(g, undefined);
+        assertEq(h, undefined);
+        called += 1;
+    }
+
+    for (var i=0; i<10; i++)
+        [173, 173, 173].map(f);
+    assertEq(called, 30);
+}
+testUnderflowMany();
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 57dbc2dc84dd..2275bcb2157b 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -1036,7 +1036,7 @@ class FastInvokeGuard
         if (useIon_ && fun_) {
             JS_ASSERT(fun_->script() == script_);
 
-            ion::MethodStatus status = ion::CanEnterUsingFastInvoke(cx, script_);
+            ion::MethodStatus status = ion::CanEnterUsingFastInvoke(cx, script_, args_.length());
             if (status == ion::Method_Error)
                 return false;
             if (status == ion::Method_Compiled) {

From 37d4fa3031eaaf2141ed21a09dfc3bea0c3f762d Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Wed, 14 Nov 2012 18:45:46 +0900
Subject: [PATCH 75/76] Bug 810554 - intermittent failure
 accessible/states/test_link.html | Test timed out, r=tbsaunde

---
 accessible/tests/mochitest/states/test_link.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/accessible/tests/mochitest/states/test_link.html b/accessible/tests/mochitest/states/test_link.html
index 82e4ed7a5631..13e48412eb22 100644
--- a/accessible/tests/mochitest/states/test_link.html
+++ b/accessible/tests/mochitest/states/test_link.html
@@ -23,13 +23,14 @@
   <script type="application/javascript">
     //gA11yEventDumpToConsole = true; // debug stuff
 
+    var gLinkWindow = null;
     function closeDocChecker()
     {
       this.__proto__ = new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE);
 
       this.check = function closeDocChecker_check(aEvent)
       {
-        aEvent.accessible.rootDocument.window.close();
+        gLinkWindow = aEvent.accessible.rootDocument.window;
       }
 
       this.match = function closeDocChecker_match(aEvent)
@@ -56,8 +57,6 @@
       }
     }
 
-gA11yEventDumpToConsole = true;
-
     var gQueue = null;
     function doTest()
     {
@@ -89,6 +88,7 @@ gA11yEventDumpToConsole = true;
       // a: traversed state
       gQueue = new eventQueue();
       gQueue.push(new clickLink("link_traversed"));
+      gQueue.onFinish = function() { gLinkWindow.close(); }
       gQueue.invoke(); // will call SimpleTest.finsih();
     }
 

From fa422d5bf91854f0ba1646b1a6cb75b7429898d1 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Wed, 14 Nov 2012 10:05:14 +0000
Subject: [PATCH 76/76] Backout 992f2748681f (bug 811185) for breaking emulator
 tests

---
 .../marionette/client/marionette/emulator.py  |  3 -
 .../client/marionette/emulator_screen.py      | 78 -------------------
 .../marionette/tests/unit/test_emulator.py    |  4 -
 .../tests/unit/test_emulator_screen.py        | 34 --------
 4 files changed, 119 deletions(-)
 delete mode 100644 testing/marionette/client/marionette/emulator_screen.py
 delete mode 100644 testing/marionette/client/marionette/tests/unit/test_emulator_screen.py

diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py
index e2f2527c9d2c..d3ad70c4cf23 100644
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -19,7 +19,6 @@ import time
 
 from emulator_battery import EmulatorBattery
 from emulator_geo import EmulatorGeo
-from emulator_screen import EmulatorScreen
 
 
 class LogcatProc(ProcessHandlerMixin):
@@ -60,7 +59,6 @@ class Emulator(object):
         self.res = res
         self.battery = EmulatorBattery(self)
         self.geo = EmulatorGeo(self)
-        self.screen = EmulatorScreen(self)
         self.homedir = homedir
         self.sdcard = sdcard
         self.noWindow = noWindow
@@ -361,7 +359,6 @@ waitFor(
         # bug 802877
         time.sleep(10)
         self.geo.set_default_location()
-        self.screen.initialize()
 
         if self.logcat_dir:
             self.save_logcat()
diff --git a/testing/marionette/client/marionette/emulator_screen.py b/testing/marionette/client/marionette/emulator_screen.py
deleted file mode 100644
index c93b8eaa3d0a..000000000000
--- a/testing/marionette/client/marionette/emulator_screen.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class EmulatorScreen(object):
-    """Class for screen related emulator commands."""
-
-    SO_PORTRAIT_PRIMARY = 'portrait-primary'
-    SO_PORTRAIT_SECONDARY = 'portrait-secondary'
-    SO_LANDSCAPE_PRIMARY = 'landscape-primary'
-    SO_LANDSCAPE_SECONDARY = 'landscape-secondary'
-
-    def __init__(self, emulator):
-        self.emulator = emulator
-
-    def initialize(self):
-        self.orientation = self.SO_PORTRAIT_PRIMARY
-
-    def _get_raw_orientation(self):
-        """Get the raw value of the current device orientation."""
-        response = self.emulator._run_telnet('sensor get orientation')
-
-        return response[0].split('=')[1].strip()
-
-    def _set_raw_orientation(self, data):
-        """Set the raw value of the specified device orientation."""
-        self.emulator._run_telnet('sensor set orientation %s' % data)
-
-    def get_orientation(self):
-        """Get the current device orientation.
-
-        Returns;
-            orientation -- Orientation of the device. One of:
-                            SO_PORTRAIT_PRIMARY - system buttons at the bottom
-                            SO_PORTRIAT_SECONDARY - system buttons at the top
-                            SO_LANDSCAPE_PRIMARY - system buttons at the right
-                            SO_LANDSCAPE_SECONDARY - system buttons at the left
-
-        """
-        data = self._get_raw_orientation()
-
-        if data == '0:-90:0':
-            orientation = self.SO_PORTRAIT_PRIMARY
-        elif data == '0:90:0':
-            orientation = self.SO_PORTRAIT_SECONDARY
-        elif data == '0:0:90':
-            orientation = self.SO_LANDSCAPE_PRIMARY
-        elif data == '0:0:-90':
-            orientation = self.SO_LANDSCAPE_SECONDARY
-        else:
-            raise ValueError('Unknown orientation sensor value: %s.' % data)
-
-        return orientation
-
-    def set_orientation(self, orientation):
-        """Set the specified device orientation.
-
-        Args
-            orientation -- Orientation of the device. One of:
-                            SO_PORTRAIT_PRIMARY - system buttons at the bottom
-                            SO_PORTRIAT_SECONDARY - system buttons at the top
-                            SO_LANDSCAPE_PRIMARY - system buttons at the right
-                            SO_LANDSCAPE_SECONDARY - system buttons at the left
-        """
-        if orientation == SO_PORTRAIT_PRIMARY:
-            data = '0:-90:0'
-        elif orientation == SO_PORTRAIT_SECONDARY:
-            data = '0:90:0'
-        elif orientation == SO_LANDSCAPE_PRIMARY:
-            data = '0:0:90'
-        elif orientation == SO_LANDSCAPE_SECONDARY:
-            data = '0:0:-90'
-        else:
-            raise ValueError('Invalid orientation: %s' % orientation)
-
-        self._set_raw_orientation(data)
-
-    orientation = property(get_orientation, set_orientation)
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator.py b/testing/marionette/client/marionette/tests/unit/test_emulator.py
index ed0dc6642a2a..a5ba9a3d5a89 100644
--- a/testing/marionette/client/marionette/tests/unit/test_emulator.py
+++ b/testing/marionette/client/marionette/tests/unit/test_emulator.py
@@ -1,7 +1,3 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 from marionette_test import MarionetteTestCase
 from errors import JavascriptException, MarionetteException
 
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py b/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py
deleted file mode 100644
index b4f1f6c6c0cc..000000000000
--- a/testing/marionette/client/marionette/tests/unit/test_emulator_screen.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from marionette_test import MarionetteTestCase
-
-
-class TestEmulatorScreen(MarionetteTestCase):
-
-    def setUp(self):
-        MarionetteTestCase.setUp(self)
-
-        self.screen = self.marionette.emulator.screen
-        self.screen.initialize()
-
-    def test_emulator_orientation(self):
-        self.assertEqual(self.screen.orientation, self.screen.SO_PORTRAIT_PRIMARY,
-                         'Orientation has been correctly initialized.')
-
-        self.sensor.orientation = self.sensor.SO_PORTRAIT_SECONDARY
-        self.assertEqual(self.sensor.orientation, self.sensor.SO_PORTRAIT_SECONDARY,
-                         'Orientation has been set to portrait-secondary')
-
-        self.sensor.orientation = self.sensor.SO_LANDSCAPE_PRIMARY
-        self.assertEqual(self.sensor.orientation, self.sensor.SO_LANDSCAPE_PRIMARY,
-                         'Orientation has been set to landscape-primary')
-
-        self.sensor.orientation = self.sensor.SO_LANDSCAPE_SECONDARY
-        self.assertEqual(self.sensor.orientation, self.sensor.SO_LANDSCAPE_SECONDARY,
-                         'Orientation has been set to landscape-secondary')
-
-        self.sensor.orientation = self.sensor.SO_PORTRAIT_PRIMARY
-        self.assertEqual(self.sensor.orientation, self.sensor.SO_PORTRAIT_PRIMARY,
-                         'Orientation has been set to portrait-primary')