From 3c24e4af43282fa666f5dee908604b746cfbc47f Mon Sep 17 00:00:00 2001
From: Monica Chew <mmc@mozilla.com>
Date: Tue, 12 Aug 2014 10:29:17 -0700
Subject: [PATCH 01/89] Bug 1047568: fix typo in one of the addresses (r=me)

---
 toolkit/components/telemetry/Histograms.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index a995758c5ebe..2649a391438f 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6530,7 +6530,7 @@
     "description": "Certificate pinning results by host for Mozilla operational sites"
   },
   "CERT_PINNING_MOZ_TEST_RESULTS_BY_HOST": {
-    "alert_emails": ["pinning@mozilla.com"],
+    "alert_emails": ["pinning@mozilla.org"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 512,

From 45b4b043050b95f9967d8be930446026c375f91f Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Tue, 12 Aug 2014 10:55:29 -0700
Subject: [PATCH 02/89] Backout bug 1038243 for not actually helping.

---
 content/base/public/Element.h          | 15 +++------------
 content/base/src/Attr.h                |  8 --------
 content/base/src/nsDOMAttributeMap.cpp |  8 ++++----
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/content/base/public/Element.h b/content/base/public/Element.h
index e09717136311..93256938b088 100644
--- a/content/base/public/Element.h
+++ b/content/base/public/Element.h
@@ -1488,11 +1488,8 @@ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr,                              \
   if (!newAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
   }                                                                           \
-  mozilla::dom::Attr* attr = mozilla::dom::Attr::FromDOMAttr(newAttr);        \
-  if (!attr) {                                                                \
-    return NS_ERROR_INVALID_POINTER;                                          \
-  }                                                                           \
   mozilla::ErrorResult rv;                                                    \
+  mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr);       \
   *_retval = Element::SetAttributeNode(*attr, rv).take();                     \
   return rv.ErrorCode();                                                      \
 }                                                                             \
@@ -1502,11 +1499,8 @@ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr,                           \
   if (!oldAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
   }                                                                           \
-  mozilla::dom::Attr* attr = mozilla::dom::Attr::FromDOMAttr(oldAttr);        \
-  if (!attr) {                                                                \
-    return NS_ERROR_INVALID_POINTER;                                          \
-  }                                                                           \
   mozilla::ErrorResult rv;                                                    \
+  mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(oldAttr);       \
   *_retval = Element::RemoveAttributeNode(*attr, rv).take();                  \
   return rv.ErrorCode();                                                      \
 }                                                                             \
@@ -1521,11 +1515,8 @@ NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI,                  \
 NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr,                            \
                               nsIDOMAttr** _retval) MOZ_FINAL                 \
 {                                                                             \
-  mozilla::dom::Attr* attr = mozilla::dom::Attr::FromDOMAttr(newAttr);        \
-  if (!attr) {                                                                \
-    return NS_ERROR_INVALID_POINTER;                                          \
-  }                                                                           \
   mozilla::ErrorResult rv;                                                    \
+  mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr);       \
   *_retval = Element::SetAttributeNodeNS(*attr, rv).take();                   \
   return rv.ErrorCode();                                                      \
 }                                                                             \
diff --git a/content/base/src/Attr.h b/content/base/src/Attr.h
index f5606ead6b5f..42e02b26bc1a 100644
--- a/content/base/src/Attr.h
+++ b/content/base/src/Attr.h
@@ -80,14 +80,6 @@ public:
 
   virtual nsIDOMNode* AsDOMNode() { return this; }
 
-  // This method should not do anything interesting, except possibly in the case of
-  // external binary components.
-  static Attr* FromDOMAttr(nsIDOMAttr* aDOMAttr)
-  {
-    nsCOMPtr<nsIAttribute> iattr = do_QueryInterface(aDOMAttr);
-    return static_cast<mozilla::dom::Attr*>(iattr.get());
-  }
-
   // WebIDL
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp
index 79a9997fd5d0..2bf023c056d8 100644
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -242,9 +242,9 @@ nsDOMAttributeMap::GetNamedItem(const nsAString& aAttrName,
 }
 
 NS_IMETHODIMP
-nsDOMAttributeMap::SetNamedItem(nsIDOMAttr* aDOMAttr, nsIDOMAttr** aReturn)
+nsDOMAttributeMap::SetNamedItem(nsIDOMAttr* aAttr, nsIDOMAttr** aReturn)
 {
-  Attr* attribute = Attr::FromDOMAttr(aDOMAttr);
+  Attr* attribute = static_cast<Attr*>(aAttr);
   NS_ENSURE_ARG(attribute);
 
   ErrorResult rv;
@@ -253,9 +253,9 @@ nsDOMAttributeMap::SetNamedItem(nsIDOMAttr* aDOMAttr, nsIDOMAttr** aReturn)
 }
 
 NS_IMETHODIMP
-nsDOMAttributeMap::SetNamedItemNS(nsIDOMAttr* aDOMAttr, nsIDOMAttr** aReturn)
+nsDOMAttributeMap::SetNamedItemNS(nsIDOMAttr* aAttr, nsIDOMAttr** aReturn)
 {
-  Attr* attribute = Attr::FromDOMAttr(aDOMAttr);
+  Attr* attribute = static_cast<Attr*>(aAttr);
   NS_ENSURE_ARG(attribute);
 
   ErrorResult rv;

From dd8aa72b474bb1a5da3aeafd8615f87f63d56196 Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Tue, 12 Aug 2014 09:31:26 +0900
Subject: [PATCH 03/89] Bug 1051982 - fix integer prefix to encode Header Table
 Size Update r=hurley

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

diff --git a/netwerk/protocol/http/Http2Compression.cpp b/netwerk/protocol/http/Http2Compression.cpp
index b3ea1c0dae7e..d768a280544a 100644
--- a/netwerk/protocol/http/Http2Compression.cpp
+++ b/netwerk/protocol/http/Http2Compression.cpp
@@ -1194,7 +1194,7 @@ void
 Http2Compressor::EncodeTableSizeChange(uint32_t newMaxSize)
 {
   uint32_t offset = mOutput->Length();
-  EncodeInteger(4, newMaxSize);
+  EncodeInteger(5, newMaxSize);
   uint8_t *startByte = reinterpret_cast<uint8_t *>(mOutput->BeginWriting()) + offset;
   *startByte = *startByte | 0x20;
 }

From c1d4da74d7fefecb26db2787a2bcf96de2cfd1c1 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Tue, 12 Aug 2014 12:29:50 -0700
Subject: [PATCH 04/89] Bug 1052090 - Don't try to compute main-thread-ness
 until after we're done with cancel shenanigans. r=bkelly

---
 dom/workers/WorkerRunnable.cpp | 36 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dom/workers/WorkerRunnable.cpp b/dom/workers/WorkerRunnable.cpp
index acf87b47c7f8..4bc70194263c 100644
--- a/dom/workers/WorkerRunnable.cpp
+++ b/dom/workers/WorkerRunnable.cpp
@@ -262,29 +262,29 @@ WorkerRunnable::Run()
     return NS_OK;
   }
 
+  if (targetIsWorkerThread &&
+      mWorkerPrivate->AllPendingRunnablesShouldBeCanceled() &&
+      !IsCanceled() && !mCallingCancelWithinRun) {
+
+    // Prevent recursion.
+    mCallingCancelWithinRun = true;
+
+    Cancel();
+
+    MOZ_ASSERT(mCallingCancelWithinRun);
+    mCallingCancelWithinRun = false;
+
+    MOZ_ASSERT(IsCanceled(), "Subclass Cancel() didn't set IsCanceled()!");
+
+    return NS_OK;
+ }
+
+  // Track down the appropriate global to use for the AutoJSAPI/AutoEntryScript.
   nsCOMPtr<nsIGlobalObject> globalObject;
   bool isMainThread = !targetIsWorkerThread && !mWorkerPrivate->GetParent();
   MOZ_ASSERT(isMainThread == NS_IsMainThread());
   nsRefPtr<WorkerPrivate> kungFuDeathGrip;
-
   if (targetIsWorkerThread) {
-    if (mWorkerPrivate->AllPendingRunnablesShouldBeCanceled() &&
-        !IsCanceled() &&
-        !mCallingCancelWithinRun) {
-
-      // Prevent recursion.
-      mCallingCancelWithinRun = true;
-
-      Cancel();
-
-      MOZ_ASSERT(mCallingCancelWithinRun);
-      mCallingCancelWithinRun = false;
-
-      MOZ_ASSERT(IsCanceled(), "Subclass Cancel() didn't set IsCanceled()!");
-
-      return NS_OK;
-    }
-
     globalObject = mWorkerPrivate->GlobalScope();
   }
   else {

From 04cc732c28482b1bfdf5432dfbe8aa5a0278c2ab Mon Sep 17 00:00:00 2001
From: Walter Litwinczyk <wlitwinczyk@mozilla.com>
Date: Mon, 11 Aug 2014 09:35:17 -0700
Subject: [PATCH 05/89] Bug 1047755 - Add copy constructor to ZoomConstraints
 in gfx/layers/FrameMetrics.h. r=botond

---
 gfx/layers/FrameMetrics.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h
index f71d21d841f0..6ca390bd2a66 100644
--- a/gfx/layers/FrameMetrics.h
+++ b/gfx/layers/FrameMetrics.h
@@ -587,6 +587,15 @@ struct ZoomConstraints {
     MOZ_COUNT_CTOR(ZoomConstraints);
   }
 
+  ZoomConstraints(const ZoomConstraints& other)
+    : mAllowZoom(other.mAllowZoom)
+    , mAllowDoubleTapZoom(other.mAllowDoubleTapZoom)
+    , mMinZoom(other.mMinZoom)
+    , mMaxZoom(other.mMaxZoom)
+  {
+    MOZ_COUNT_CTOR(ZoomConstraints);
+  }
+
   ~ZoomConstraints()
   {
     MOZ_COUNT_DTOR(ZoomConstraints);

From 85036e65fab4ee2509c5c2e23f6cded3b8449954 Mon Sep 17 00:00:00 2001
From: Walter Litwinczyk <wlitwinczyk@mozilla.com>
Date: Mon, 11 Aug 2014 10:32:51 -0700
Subject: [PATCH 06/89] Bug 1047755 - Add copy constructor to
 ScrollableLayerguid in gfx/layers/FrameMetrics.h. r=botond

---
 gfx/layers/FrameMetrics.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h
index 6ca390bd2a66..dec598332083 100644
--- a/gfx/layers/FrameMetrics.h
+++ b/gfx/layers/FrameMetrics.h
@@ -402,8 +402,8 @@ public:
   {
     return mScrollId;
   }
-  
-  void SetScrollId(ViewID scrollId) 
+
+  void SetScrollId(ViewID scrollId)
   {
     mScrollId = scrollId;
   }
@@ -539,6 +539,14 @@ struct ScrollableLayerGuid {
     MOZ_COUNT_CTOR(ScrollableLayerGuid);
   }
 
+  ScrollableLayerGuid(const ScrollableLayerGuid& other)
+    : mLayersId(other.mLayersId)
+    , mPresShellId(other.mPresShellId)
+    , mScrollId(other.mScrollId)
+  {
+    MOZ_COUNT_CTOR(ScrollableLayerGuid);
+  }
+
   ~ScrollableLayerGuid()
   {
     MOZ_COUNT_DTOR(ScrollableLayerGuid);

From d733f0c69561938fd2278fc1d425e55a13c177ac Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:42:10 -0700
Subject: [PATCH 07/89] Bug 1049051 - Part 1: Remove ResourceAcquisition.
 r=froydnj

--HG--
extra : rebase_source : 86bc896f9c2833996c4c5eebcc034acbadedbd4a
---
 xpcom/glue/BlockingResourceBase.cpp | 12 ++++-----
 xpcom/glue/BlockingResourceBase.h   |  2 +-
 xpcom/glue/DeadlockDetector.h       | 39 ++++++-----------------------
 3 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/glue/BlockingResourceBase.cpp
index 0a5c81dd9680..15012381d094 100644
--- a/xpcom/glue/BlockingResourceBase.cpp
+++ b/xpcom/glue/BlockingResourceBase.cpp
@@ -39,7 +39,7 @@ BlockingResourceBase::DDT* BlockingResourceBase::sDeadlockDetector;
 
 bool
 BlockingResourceBase::DeadlockDetectorEntry::Print(
-    const DDT::ResourceAcquisition& aFirstSeen,
+    const DeadlockDetectorEntry* aFirstSeen,
     nsACString& aOut) const
 {
   fprintf(stderr, "--- %s : %s",
@@ -193,22 +193,22 @@ BlockingResourceBase::PrintCycle(const DDT::ResourceAcquisitionArray* aCycle,
   fputs("=== Cyclical dependency starts at\n", stderr);
   aOut += "Cyclical dependency starts at\n";
 
-  const DDT::ResourceAcquisition res = aCycle->ElementAt(0);
-  maybeImminent &= res.mResource->Print(res, aOut);
+  const DeadlockDetectorEntry* res = aCycle->ElementAt(0);
+  maybeImminent &= res->Print(res, aOut);
 
   DDT::ResourceAcquisitionArray::index_type i;
   DDT::ResourceAcquisitionArray::size_type len = aCycle->Length();
-  const DDT::ResourceAcquisition* it = 1 + aCycle->Elements();
+  const DDT::ResourceAcquisitionArray::elem_type* it = 1 + aCycle->Elements();
   for (i = 1; i < len - 1; ++i, ++it) {
     fputs("\n--- Next dependency:\n", stderr);
     aOut += "\nNext dependency:\n";
 
-    maybeImminent &= it->mResource->Print(*it, aOut);
+    maybeImminent &= (*it)->Print(*it, aOut);
   }
 
   fputs("\n=== Cycle completed at\n", stderr);
   aOut += "Cycle completed at\n";
-  it->mResource->Print(*it, aOut);
+  (*it)->Print(*it, aOut);
 
   return maybeImminent;
 }
diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/glue/BlockingResourceBase.h
index 4217f5f984bf..e5c08e0acaa5 100644
--- a/xpcom/glue/BlockingResourceBase.h
+++ b/xpcom/glue/BlockingResourceBase.h
@@ -113,7 +113,7 @@ private:
      * contexts into strings, all info is written to stderr, but
      * only some info is written into |aOut|
      */
-    bool Print(const DDT::ResourceAcquisition& aFirstSeen,
+    bool Print(const DeadlockDetectorEntry* aFirstSeen,
                nsACString& aOut) const;
 
     /**
diff --git a/xpcom/glue/DeadlockDetector.h b/xpcom/glue/DeadlockDetector.h
index 355f535eff4d..1bbd8e6d91ab 100644
--- a/xpcom/glue/DeadlockDetector.h
+++ b/xpcom/glue/DeadlockDetector.h
@@ -65,32 +65,7 @@ template<typename T>
 class DeadlockDetector
 {
 public:
-  /**
-   * ResourceAcquisition
-   * Consists simply of a resource and the calling context from
-   * which it was acquired.  We pack this information together so
-   * that it can be returned back to the caller when a potential
-   * deadlock has been found.
-   */
-  struct ResourceAcquisition
-  {
-    const T* mResource;
-
-    explicit ResourceAcquisition(const T* aResource)
-      : mResource(aResource)
-    {
-    }
-    ResourceAcquisition(const ResourceAcquisition& aFrom)
-      : mResource(aFrom.mResource)
-    {
-    }
-    ResourceAcquisition& operator=(const ResourceAcquisition& aFrom)
-    {
-      mResource = aFrom.mResource;
-      return *this;
-    }
-  };
-  typedef nsTArray<ResourceAcquisition> ResourceAcquisitionArray;
+  typedef nsTArray<const T*> ResourceAcquisitionArray;
 
 private:
   struct OrderingEntry;
@@ -278,8 +253,8 @@ public:
       if (!cycle) {
         NS_RUNTIMEABORT("can't allocate dep. cycle array");
       }
-      cycle->AppendElement(ResourceAcquisition(current->mResource));
-      cycle->AppendElement(ResourceAcquisition(aProposed));
+      cycle->AppendElement(current->mResource);
+      cycle->AppendElement(aProposed);
       return cycle;
     }
     if (InTransitiveClosure(current, proposed)) {
@@ -294,7 +269,7 @@ public:
       // right conditions.
       ResourceAcquisitionArray* cycle = GetDeductionChain(proposed, current);
       // show how acquiring |aProposed| would complete the cycle
-      cycle->AppendElement(ResourceAcquisition(aProposed));
+      cycle->AppendElement(aProposed);
       return cycle;
     }
     // |aLast|, |aProposed| are unordered according to our
@@ -354,7 +329,7 @@ public:
     if (!chain) {
       NS_RUNTIMEABORT("can't allocate dep. cycle array");
     }
-    chain->AppendElement(ResourceAcquisition(aStart->mResource));
+    chain->AppendElement(aStart->mResource);
 
     NS_ASSERTION(GetDeductionChain_Helper(aStart, aTarget, chain),
                  "GetDeductionChain called when there's no deadlock");
@@ -368,14 +343,14 @@ public:
                                 ResourceAcquisitionArray* aChain)
   {
     if (aStart->mOrderedLT.BinaryIndexOf(aTarget) != NoIndex) {
-      aChain->AppendElement(ResourceAcquisition(aTarget->mResource));
+      aChain->AppendElement(aTarget->mResource);
       return true;
     }
 
     index_type i = 0;
     size_type len = aStart->mOrderedLT.Length();
     for (const OrderingEntry* const* it = aStart->mOrderedLT.Elements(); i < len; ++i, ++it) {
-      aChain->AppendElement(ResourceAcquisition((*it)->mResource));
+      aChain->AppendElement((*it)->mResource);
       if (GetDeductionChain_Helper(*it, aTarget, aChain)) {
         return true;
       }

From 834c32b5bb26ebc1bda0dd248eead0821e82f1b9 Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:42:28 -0700
Subject: [PATCH 08/89] Bug 1049051 - Part 2: Remove DeadlockDetectorEntry.
 r=froydnj

--HG--
extra : rebase_source : e87b5b20130508953360b367c76b4d00338f2cdc
---
 xpcom/glue/BlockingResourceBase.cpp |  38 ++++-----
 xpcom/glue/BlockingResourceBase.h   | 121 +++++++++++-----------------
 xpcom/glue/DeadlockDetector.h       |   2 -
 3 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/glue/BlockingResourceBase.cpp
index 15012381d094..b3005f18bc40 100644
--- a/xpcom/glue/BlockingResourceBase.cpp
+++ b/xpcom/glue/BlockingResourceBase.cpp
@@ -38,9 +38,7 @@ unsigned BlockingResourceBase::sResourceAcqnChainFrontTPI = (unsigned)-1;
 BlockingResourceBase::DDT* BlockingResourceBase::sDeadlockDetector;
 
 bool
-BlockingResourceBase::DeadlockDetectorEntry::Print(
-    const DeadlockDetectorEntry* aFirstSeen,
-    nsACString& aOut) const
+BlockingResourceBase::Print(nsACString& aOut) const
 {
   fprintf(stderr, "--- %s : %s",
           kResourceTypeName[mType], mName);
@@ -63,16 +61,19 @@ BlockingResourceBase::DeadlockDetectorEntry::Print(
 BlockingResourceBase::BlockingResourceBase(
     const char* aName,
     BlockingResourceBase::BlockingResourceType aType)
+  : mName(aName)
+  , mType(aType)
+  , mAcquired(false)
 {
+  NS_ABORT_IF_FALSE(mName, "Name must be nonnull");
   // PR_CallOnce guaranatees that InitStatics is called in a
   // thread-safe way
   if (PR_SUCCESS != PR_CallOnce(&sCallOnce, InitStatics)) {
     NS_RUNTIMEABORT("can't initialize blocking resource static members");
   }
 
-  mDDEntry = new BlockingResourceBase::DeadlockDetectorEntry(aName, aType);
   mChainPrev = 0;
-  sDeadlockDetector->Add(mDDEntry);
+  sDeadlockDetector->Add(this);
 }
 
 
@@ -83,15 +84,14 @@ BlockingResourceBase::~BlockingResourceBase()
   // base class, or its underlying primitive, will check for such
   // stupid mistakes.
   mChainPrev = 0;             // racy only for stupidly buggy client code
-  sDeadlockDetector->Remove(mDDEntry);
-  mDDEntry = 0;               // owned by deadlock detector
+  sDeadlockDetector->Remove(this);
 }
 
 
 void
 BlockingResourceBase::CheckAcquire()
 {
-  if (mDDEntry->mType == eCondVar) {
+  if (mType == eCondVar) {
     NS_NOTYETIMPLEMENTED(
       "FIXME bug 456272: annots. to allow CheckAcquire()ing condvars");
     return;
@@ -100,7 +100,7 @@ BlockingResourceBase::CheckAcquire()
   BlockingResourceBase* chainFront = ResourceChainFront();
   nsAutoPtr<DDT::ResourceAcquisitionArray> cycle(
     sDeadlockDetector->CheckAcquisition(
-      chainFront ? chainFront->mDDEntry : 0, mDDEntry));
+      chainFront ? chainFront : 0, this));
   if (!cycle) {
     return;
   }
@@ -129,30 +129,30 @@ BlockingResourceBase::CheckAcquire()
 void
 BlockingResourceBase::Acquire()
 {
-  if (mDDEntry->mType == eCondVar) {
+  if (mType == eCondVar) {
     NS_NOTYETIMPLEMENTED(
       "FIXME bug 456272: annots. to allow Acquire()ing condvars");
     return;
   }
-  NS_ASSERTION(!mDDEntry->mAcquired,
+  NS_ASSERTION(!mAcquired,
                "reacquiring already acquired resource");
 
   ResourceChainAppend(ResourceChainFront());
-  mDDEntry->mAcquired = true;
+  mAcquired = true;
 }
 
 
 void
 BlockingResourceBase::Release()
 {
-  if (mDDEntry->mType == eCondVar) {
+  if (mType == eCondVar) {
     NS_NOTYETIMPLEMENTED(
       "FIXME bug 456272: annots. to allow Release()ing condvars");
     return;
   }
 
   BlockingResourceBase* chainFront = ResourceChainFront();
-  NS_ASSERTION(chainFront && mDDEntry->mAcquired,
+  NS_ASSERTION(chainFront && mAcquired,
                "Release()ing something that hasn't been Acquire()ed");
 
   if (chainFront == this) {
@@ -178,7 +178,7 @@ BlockingResourceBase::Release()
     }
   }
 
-  mDDEntry->mAcquired = false;
+  mAcquired = false;
 }
 
 
@@ -193,8 +193,8 @@ BlockingResourceBase::PrintCycle(const DDT::ResourceAcquisitionArray* aCycle,
   fputs("=== Cyclical dependency starts at\n", stderr);
   aOut += "Cyclical dependency starts at\n";
 
-  const DeadlockDetectorEntry* res = aCycle->ElementAt(0);
-  maybeImminent &= res->Print(res, aOut);
+  const DDT::ResourceAcquisitionArray::elem_type res = aCycle->ElementAt(0);
+  maybeImminent &= res->Print(aOut);
 
   DDT::ResourceAcquisitionArray::index_type i;
   DDT::ResourceAcquisitionArray::size_type len = aCycle->Length();
@@ -203,12 +203,12 @@ BlockingResourceBase::PrintCycle(const DDT::ResourceAcquisitionArray* aCycle,
     fputs("\n--- Next dependency:\n", stderr);
     aOut += "\nNext dependency:\n";
 
-    maybeImminent &= (*it)->Print(*it, aOut);
+    maybeImminent &= (*it)->Print(aOut);
   }
 
   fputs("\n=== Cycle completed at\n", stderr);
   aOut += "Cycle completed at\n";
-  (*it)->Print(*it, aOut);
+  (*it)->Print(aOut);
 
   return maybeImminent;
 }
diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/glue/BlockingResourceBase.h
index e5c08e0acaa5..1d44fe87a251 100644
--- a/xpcom/glue/BlockingResourceBase.h
+++ b/xpcom/glue/BlockingResourceBase.h
@@ -59,81 +59,38 @@ public:
         sDeadlockDetector->SizeOfIncludingThis(aMallocSizeOf) : 0;
   }
 
-private:
-  // forward declaration for the following typedef
-  struct DeadlockDetectorEntry;
-
-  // ``DDT'' = ``Deadlock Detector Type''
-  typedef DeadlockDetector<DeadlockDetectorEntry> DDT;
-
   /**
-   * DeadlockDetectorEntry
-   * We free BlockingResources, but we never free entries in the
-   * deadlock detector.  This struct outlives its BlockingResource
-   * and preserves all the state needed to print subsequent
-   * error messages.
+   * Print
+   * Write a description of this blocking resource to |aOut|.  If
+   * the resource appears to be currently acquired, the current
+   * acquisition context is printed and true is returned.
+   * Otherwise, we print the context from |aFirstSeen|, the
+   * first acquisition from which the code calling |Print()|
+   * became interested in us, and return false.
    *
-   * These objects are owned by the deadlock detector.
+   * *NOT* thread safe.  Reads |mAcquisitionContext| without
+   * synchronization, but this will not cause correctness
+   * problems.
+   *
+   * FIXME bug 456272: hack alert: because we can't write call
+   * contexts into strings, all info is written to stderr, but
+   * only some info is written into |aOut|
    */
-  struct DeadlockDetectorEntry
+  bool Print(nsACString& aOut) const;
+
+  size_t
+  SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   {
-    DeadlockDetectorEntry(const char* aName,
-                          BlockingResourceType aType)
-      : mName(aName)
-      , mType(aType)
-      , mAcquired(false)
-    {
-      NS_ABORT_IF_FALSE(mName, "Name must be nonnull");
-    }
+    // NB: |mName| is not reported as it's expected to be a static string.
+    //     If we switch to a nsString it should be added to the tally.
+    //     |mChainPrev| is not reported because its memory is not owned.
+    size_t n = aMallocSizeOf(this);
+    return n;
+  }
 
-    size_t
-    SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
-    {
-      // NB: |mName| is not reported as it's expected to be a static string.
-      //     If we switch to a nsString it should be added to the tally.
-      //     |mAcquisitionContext| has no measurable heap allocations in it.
-      size_t n = aMallocSizeOf(this);
-      return n;
-    }
-
-    /**
-     * Print
-     * Write a description of this blocking resource to |aOut|.  If
-     * the resource appears to be currently acquired, the current
-     * acquisition context is printed and true is returned.
-     * Otherwise, we print the context from |aFirstSeen|, the
-     * first acquisition from which the code calling |Print()|
-     * became interested in us, and return false.
-     *
-     * *NOT* thread safe.  Reads |mAcquisitionContext| without
-     * synchronization, but this will not cause correctness
-     * problems.
-     *
-     * FIXME bug 456272: hack alert: because we can't write call
-     * contexts into strings, all info is written to stderr, but
-     * only some info is written into |aOut|
-     */
-    bool Print(const DeadlockDetectorEntry* aFirstSeen,
-               nsACString& aOut) const;
-
-    /**
-     * mName
-     * A descriptive name for this resource.  Used in error
-     * messages etc.
-     */
-    const char* mName;
-    /**
-     * mType
-     * The more specific type of this resource.  Used to implement
-     * special semantics (e.g., reentrancy of monitors).
-     **/
-    BlockingResourceType mType;
-    /**
-     * mAcquired
-     * Indicates if this resource is currently acquired.
-     */
-    bool mAcquired;
-  };
+private:
+  // ``DDT'' = ``Deadlock Detector Type''
+  typedef DeadlockDetector<BlockingResourceBase> DDT;
 
 protected:
   /**
@@ -251,7 +208,7 @@ protected:
    */
   bool GetAcquisitionState()
   {
-    return mDDEntry->mAcquired;
+    return mAcquired;
   }
 
   /**
@@ -262,7 +219,7 @@ protected:
    */
   void SetAcquisitionState(bool aAcquisitionState)
   {
-    mDDEntry->mAcquired = aAcquisitionState;
+    mAcquired = aAcquisitionState;
   }
 
   /**
@@ -275,10 +232,24 @@ protected:
 
 private:
   /**
-   * mDDEntry
-   * The key for this BlockingResourceBase in the deadlock detector.
+   * mName
+   * A descriptive name for this resource.  Used in error
+   * messages etc.
    */
-  DeadlockDetectorEntry* mDDEntry;
+  const char* mName;
+
+  /**
+   * mType
+   * The more specific type of this resource.  Used to implement
+   * special semantics (e.g., reentrancy of monitors).
+   **/
+  BlockingResourceType mType;
+
+  /**
+   * mAcquired
+   * Indicates if this resource is currently acquired.
+   */
+  bool mAcquired;
 
   /**
    * sCallOnce
diff --git a/xpcom/glue/DeadlockDetector.h b/xpcom/glue/DeadlockDetector.h
index 1bbd8e6d91ab..1ac1b2479ee6 100644
--- a/xpcom/glue/DeadlockDetector.h
+++ b/xpcom/glue/DeadlockDetector.h
@@ -99,7 +99,6 @@ private:
       size_t n = aMallocSizeOf(this);
       n += mOrderedLT.SizeOfExcludingThis(aMallocSizeOf);
       n += mExternalRefs.SizeOfExcludingThis(aMallocSizeOf);
-      n += mResource->SizeOfIncludingThis(aMallocSizeOf);
       return n;
     }
 
@@ -203,7 +202,6 @@ public:
 
     // Now the entry can be safely removed.
     mOrdering.Remove(aResource);
-    delete aResource;
   }
 
   /**

From ac663bd332769d7b1107097148aad61639dc2d02 Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:42:55 -0700
Subject: [PATCH 09/89] Bug 1049051 - Part 3: DeadlockDetector Add/Remove can
 take a const param. r=froydnj

--HG--
extra : rebase_source : 0ea5e3d9337982c1282a74961f62bc0b4345d7bf
---
 xpcom/glue/DeadlockDetector.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xpcom/glue/DeadlockDetector.h b/xpcom/glue/DeadlockDetector.h
index 1ac1b2479ee6..3763b34a73a0 100644
--- a/xpcom/glue/DeadlockDetector.h
+++ b/xpcom/glue/DeadlockDetector.h
@@ -176,13 +176,13 @@ public:
    *
    * @param aResource Resource to make deadlock detector aware of.
    */
-  void Add(T* aResource)
+  void Add(const T* aResource)
   {
     PRAutoLock _(mLock);
     mOrdering.Put(aResource, new OrderingEntry(aResource));
   }
 
-  void Remove(T* aResource)
+  void Remove(const T* aResource)
   {
     PRAutoLock _(mLock);
 

From 9e9c81074a2972ac09a7715665f61485bc65bc19 Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:43:27 -0700
Subject: [PATCH 10/89] Bug 1049051 - Part 4: Make PrintCycle internal.
 r=froydnj

--HG--
extra : rebase_source : 594237c0e3e738078a9e571d9515c6feb0fd7bed
---
 xpcom/glue/BlockingResourceBase.cpp | 78 +++++++++++++++++------------
 xpcom/glue/BlockingResourceBase.h   | 18 -------
 2 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/glue/BlockingResourceBase.cpp
index b3005f18bc40..382fb590a117 100644
--- a/xpcom/glue/BlockingResourceBase.cpp
+++ b/xpcom/glue/BlockingResourceBase.cpp
@@ -37,6 +37,52 @@ PRCallOnceType BlockingResourceBase::sCallOnce;
 unsigned BlockingResourceBase::sResourceAcqnChainFrontTPI = (unsigned)-1;
 BlockingResourceBase::DDT* BlockingResourceBase::sDeadlockDetector;
 
+
+/**
+ * PrintCycle
+ * Append to |aOut| detailed information about the circular
+ * dependency in |aCycle|.  Returns true if it *appears* that this
+ * cycle may represent an imminent deadlock, but this is merely a
+ * heuristic; the value returned may be a false positive or false
+ * negative.
+ *
+ * *NOT* thread safe.  Calls |Print()|.
+ *
+ * FIXME bug 456272 hack alert: because we can't write call
+ * contexts into strings, all info is written to stderr, but only
+ * some info is written into |aOut|
+ */
+bool
+PrintCycle(const BlockingResourceBase::DDT::ResourceAcquisitionArray* aCycle, nsACString& aOut)
+{
+  NS_ASSERTION(aCycle->Length() > 1, "need > 1 element for cycle!");
+
+  bool maybeImminent = true;
+
+  fputs("=== Cyclical dependency starts at\n", stderr);
+  aOut += "Cyclical dependency starts at\n";
+
+  const BlockingResourceBase::DDT::ResourceAcquisitionArray::elem_type res = aCycle->ElementAt(0);
+  maybeImminent &= res->Print(aOut);
+
+  BlockingResourceBase::DDT::ResourceAcquisitionArray::index_type i;
+  BlockingResourceBase::DDT::ResourceAcquisitionArray::size_type len = aCycle->Length();
+  const BlockingResourceBase::DDT::ResourceAcquisitionArray::elem_type* it = 1 + aCycle->Elements();
+  for (i = 1; i < len - 1; ++i, ++it) {
+    fputs("\n--- Next dependency:\n", stderr);
+    aOut += "\nNext dependency:\n";
+
+    maybeImminent &= (*it)->Print(aOut);
+  }
+
+  fputs("\n=== Cycle completed at\n", stderr);
+  aOut += "Cycle completed at\n";
+  (*it)->Print(aOut);
+
+  return maybeImminent;
+}
+
+
 bool
 BlockingResourceBase::Print(nsACString& aOut) const
 {
@@ -182,38 +228,6 @@ BlockingResourceBase::Release()
 }
 
 
-bool
-BlockingResourceBase::PrintCycle(const DDT::ResourceAcquisitionArray* aCycle,
-                                 nsACString& aOut)
-{
-  NS_ASSERTION(aCycle->Length() > 1, "need > 1 element for cycle!");
-
-  bool maybeImminent = true;
-
-  fputs("=== Cyclical dependency starts at\n", stderr);
-  aOut += "Cyclical dependency starts at\n";
-
-  const DDT::ResourceAcquisitionArray::elem_type res = aCycle->ElementAt(0);
-  maybeImminent &= res->Print(aOut);
-
-  DDT::ResourceAcquisitionArray::index_type i;
-  DDT::ResourceAcquisitionArray::size_type len = aCycle->Length();
-  const DDT::ResourceAcquisitionArray::elem_type* it = 1 + aCycle->Elements();
-  for (i = 1; i < len - 1; ++i, ++it) {
-    fputs("\n--- Next dependency:\n", stderr);
-    aOut += "\nNext dependency:\n";
-
-    maybeImminent &= (*it)->Print(aOut);
-  }
-
-  fputs("\n=== Cycle completed at\n", stderr);
-  aOut += "Cycle completed at\n";
-  (*it)->Print(aOut);
-
-  return maybeImminent;
-}
-
-
 //
 // Debug implementation of (OffTheBooks)Mutex
 void
diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/glue/BlockingResourceBase.h
index 1d44fe87a251..41702659b46a 100644
--- a/xpcom/glue/BlockingResourceBase.h
+++ b/xpcom/glue/BlockingResourceBase.h
@@ -88,7 +88,6 @@ public:
     return n;
   }
 
-private:
   // ``DDT'' = ``Deadlock Detector Type''
   typedef DeadlockDetector<BlockingResourceBase> DDT;
 
@@ -133,23 +132,6 @@ protected:
    **/
   void Release();             //NS_NEEDS_RESOURCE(this)
 
-  /**
-   * PrintCycle
-   * Append to |aOut| detailed information about the circular
-   * dependency in |aCycle|.  Returns true if it *appears* that this
-   * cycle may represent an imminent deadlock, but this is merely a
-   * heuristic; the value returned may be a false positive or false
-   * negative.
-   *
-   * *NOT* thread safe.  Calls |Print()|.
-   *
-   * FIXME bug 456272 hack alert: because we can't write call
-   * contexts into strings, all info is written to stderr, but only
-   * some info is written into |aOut|
-   */
-  static bool PrintCycle(const DDT::ResourceAcquisitionArray* aCycle,
-                         nsACString& aOut);
-
   /**
    * ResourceChainFront
    *

From 939cad05872220d245c628b3838d36ed548364dc Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:44:04 -0700
Subject: [PATCH 11/89] Bug 1049051 - Part 5: Make sDeadlockDetector access
 internal. r=froydnj

--HG--
extra : rebase_source : ea7ee17679ca9d616c56376d7360852c37a19249
---
 xpcom/glue/BlockingResourceBase.cpp | 31 +++++++++++++++++++++++++++++
 xpcom/glue/BlockingResourceBase.h   | 28 ++++++--------------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/glue/BlockingResourceBase.cpp
index 382fb590a117..428e61ccdf6f 100644
--- a/xpcom/glue/BlockingResourceBase.cpp
+++ b/xpcom/glue/BlockingResourceBase.cpp
@@ -7,9 +7,12 @@
 #include "mozilla/BlockingResourceBase.h"
 
 #ifdef DEBUG
+#include "prthread.h"
+
 #include "nsAutoPtr.h"
 
 #include "mozilla/CondVar.h"
+#include "mozilla/DeadlockDetector.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/Mutex.h"
 
@@ -134,6 +137,34 @@ BlockingResourceBase::~BlockingResourceBase()
 }
 
 
+size_t
+BlockingResourceBase::SizeOfDeadlockDetector(MallocSizeOf aMallocSizeOf)
+{
+  return sDeadlockDetector ?
+      sDeadlockDetector->SizeOfIncludingThis(aMallocSizeOf) : 0;
+}
+
+
+PRStatus
+BlockingResourceBase::InitStatics()
+{
+  PR_NewThreadPrivateIndex(&sResourceAcqnChainFrontTPI, 0);
+  sDeadlockDetector = new DDT();
+  if (!sDeadlockDetector) {
+    NS_RUNTIMEABORT("can't allocate deadlock detector");
+  }
+  return PR_SUCCESS;
+}
+
+
+void
+BlockingResourceBase::Shutdown()
+{
+  delete sDeadlockDetector;
+  sDeadlockDetector = 0;
+}
+
+
 void
 BlockingResourceBase::CheckAcquire()
 {
diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/glue/BlockingResourceBase.h
index 41702659b46a..adb8797fdfc3 100644
--- a/xpcom/glue/BlockingResourceBase.h
+++ b/xpcom/glue/BlockingResourceBase.h
@@ -17,11 +17,8 @@
 
 #ifdef DEBUG
 #include "prinit.h"
-#include "prthread.h"
 
 #include "nsStringGlue.h"
-
-#include "mozilla/DeadlockDetector.h"
 #include "nsXPCOM.h"
 #endif
 
@@ -31,6 +28,9 @@
 
 namespace mozilla {
 
+#ifdef DEBUG
+template <class T> class DeadlockDetector;
+#endif
 
 /**
  * BlockingResourceBase
@@ -53,11 +53,7 @@ public:
 #ifdef DEBUG
 
   static size_t
-  SizeOfDeadlockDetector(MallocSizeOf aMallocSizeOf)
-  {
-    return sDeadlockDetector ?
-        sDeadlockDetector->SizeOfIncludingThis(aMallocSizeOf) : 0;
-  }
+  SizeOfDeadlockDetector(MallocSizeOf aMallocSizeOf);
 
   /**
    * Print
@@ -260,15 +256,7 @@ private:
    *
    * *NOT* thread safe.
    */
-  static PRStatus InitStatics()
-  {
-    PR_NewThreadPrivateIndex(&sResourceAcqnChainFrontTPI, 0);
-    sDeadlockDetector = new DDT();
-    if (!sDeadlockDetector) {
-      NS_RUNTIMEABORT("can't allocate deadlock detector");
-    }
-    return PR_SUCCESS;
-  }
+  static PRStatus InitStatics();
 
   /**
    * Shutdown
@@ -276,11 +264,7 @@ private:
    *
    * *NOT* thread safe.
    */
-  static void Shutdown()
-  {
-    delete sDeadlockDetector;
-    sDeadlockDetector = 0;
-  }
+  static void Shutdown();
 
 #  ifdef MOZILLA_INTERNAL_API
   // so it can call BlockingResourceBase::Shutdown()

From 0537257d45623b4106db122a7df9a9da8ee213a8 Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 12 Aug 2014 11:44:25 -0700
Subject: [PATCH 12/89] Bug 1049051 - Part 6: Adjust leak threshold. r=khuey

--HG--
extra : rebase_source : a57e3fa89c2aa84ac0017b4975efc83bd440df9d
---
 testing/mochitest/mochitest_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py
index da1d99f7881c..64922175130e 100644
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -756,7 +756,7 @@ class B2GOptions(MochitestOptions):
         defaults["testPath"] = ""
         defaults["extensionsToExclude"] = ["specialpowers"]
         # See dependencies of bug 1038943.
-        defaults["leakThreshold"] = 4727
+        defaults["leakThreshold"] = 4964
         self.set_defaults(**defaults)
 
     def verifyRemoteOptions(self, options):

From 84de446bfdffbf205221c6d28e34142b2cc08c82 Mon Sep 17 00:00:00 2001
From: Georgios Kontaxis <gkontaxis@mozilla.com>
Date: Tue, 12 Aug 2014 13:53:15 -0700
Subject: [PATCH 13/89] Bug 1050348: nsChannelClassifier will update the
 security state of the document and fire a security state change event to
 include the nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT or
 STATE_LOADED_TRACKING_CONTENT flag depending on whether it is about to cancel
 a channel or skip tracking protection classification respectively. r=mcmanus

---
 netwerk/base/src/nsChannelClassifier.cpp | 94 +++++++++++++++++++++++-
 netwerk/base/src/nsChannelClassifier.h   |  3 +
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/netwerk/base/src/nsChannelClassifier.cpp b/netwerk/base/src/nsChannelClassifier.cpp
index 4a3babf8d783..e0dfd4319804 100644
--- a/netwerk/base/src/nsChannelClassifier.cpp
+++ b/netwerk/base/src/nsChannelClassifier.cpp
@@ -9,12 +9,18 @@
 #include "nsICacheEntryDescriptor.h"
 #include "nsICachingChannel.h"
 #include "nsIChannel.h"
+#include "nsIDocShell.h"
+#include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMWindow.h"
 #include "nsIIOService.h"
 #include "nsIPermissionManager.h"
 #include "nsIProtocolHandler.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsISecureBrowserUI.h"
+#include "nsISecurityEventSink.h"
+#include "nsIWebProgressListener.h"
+#include "nsPIDOMWindow.h"
 
 #include "mozilla/Preferences.h"
 
@@ -43,12 +49,16 @@ nsChannelClassifier::nsChannelClassifier()
 }
 
 nsresult
-nsChannelClassifier::ShouldEnableTrackingProtection(nsIChannel* aChannel,
+nsChannelClassifier::ShouldEnableTrackingProtection(nsIChannel *aChannel,
                                                     bool *result)
 {
     NS_ENSURE_ARG(result);
     *result = false;
 
+    if (!Preferences::GetBool("privacy.trackingprotection.enabled", false)) {
+      return NS_OK;
+    }
+
     nsresult rv;
     nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil =
         do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv);
@@ -113,6 +123,40 @@ nsChannelClassifier::ShouldEnableTrackingProtection(nsIChannel* aChannel,
 #endif
 
     *result = permissions != nsIPermissionManager::ALLOW_ACTION;
+
+    // Tracking protection will be enabled so return without updating
+    // the security state. If any channels are subsequently cancelled
+    // (page elements blocked) the state will be then updated.
+    if (*result) {
+      return NS_OK;
+    }
+
+    // Tracking protection will be disabled so update the security state
+    // of the document and fire a secure change event.
+    nsCOMPtr<nsPIDOMWindow> pwin = do_QueryInterface(win, &rv);
+    NS_ENSURE_SUCCESS(rv, NS_OK);
+    nsCOMPtr<nsIDocShell> docShell = pwin->GetDocShell();
+    if (!docShell) {
+      return NS_OK;
+    }
+    nsCOMPtr<nsIDocument> doc = do_GetInterface(docShell, &rv);
+    NS_ENSURE_SUCCESS(rv, NS_OK);
+
+    // Notify nsIWebProgressListeners of this security event.
+    // Can be used to change the UI state.
+    nsCOMPtr<nsISecurityEventSink> eventSink = do_QueryInterface(docShell, &rv);
+    NS_ENSURE_SUCCESS(rv, NS_OK);
+    uint32_t state = 0;
+    nsCOMPtr<nsISecureBrowserUI> securityUI;
+    docShell->GetSecurityUI(getter_AddRefs(securityUI));
+    if (!securityUI) {
+      return NS_OK;
+    }
+    doc->SetHasTrackingContentLoaded(true);
+    securityUI->GetState(&state);
+    state |= nsIWebProgressListener::STATE_LOADED_TRACKING_CONTENT;
+    eventSink->OnSecurityChange(nullptr, state);
+
     return NS_OK;
 }
 
@@ -274,6 +318,44 @@ nsChannelClassifier::HasBeenClassified(nsIChannel *aChannel)
     return tag.EqualsLiteral("1");
 }
 
+nsresult
+nsChannelClassifier::SetBlockedTrackingContent(nsIChannel *channel)
+{
+  nsresult rv;
+  nsCOMPtr<nsIDOMWindow> win;
+  nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil =
+    do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+  rv = thirdPartyUtil->GetTopWindowForChannel(
+    mSuspendedChannel, getter_AddRefs(win));
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+  nsCOMPtr<nsPIDOMWindow> pwin = do_QueryInterface(win, &rv);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+  nsCOMPtr<nsIDocShell> docShell = pwin->GetDocShell();
+  if (!docShell) {
+    return NS_OK;
+  }
+  nsCOMPtr<nsIDocument> doc = do_GetInterface(docShell, &rv);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+
+  // Notify nsIWebProgressListeners of this security event.
+  // Can be used to change the UI state.
+  nsCOMPtr<nsISecurityEventSink> eventSink = do_QueryInterface(docShell, &rv);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+  uint32_t state = 0;
+  nsCOMPtr<nsISecureBrowserUI> securityUI;
+  docShell->GetSecurityUI(getter_AddRefs(securityUI));
+  if (!securityUI) {
+    return NS_OK;
+  }
+  doc->SetHasTrackingContentBlocked(true);
+  securityUI->GetState(&state);
+  state |= nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT;
+  eventSink->OnSecurityChange(nullptr, state);
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsChannelClassifier::OnClassifyComplete(nsresult aErrorCode)
 {
@@ -290,8 +372,16 @@ nsChannelClassifier::OnClassifyComplete(nsresult aErrorCode)
                  "with error code: %x", this, mSuspendedChannel.get(),
                  spec.get(), aErrorCode));
 #endif
+
+            // Channel will be cancelled (page element blocked) due to tracking.
+            // Do update the security state of the document and fire a security
+            // change event.
+            if (aErrorCode == NS_ERROR_TRACKING_URI) {
+              SetBlockedTrackingContent(mSuspendedChannel);
+            }
+
             mSuspendedChannel->Cancel(aErrorCode);
-        }
+          }
 #ifdef DEBUG
         LOG(("nsChannelClassifier[%p]: resuming channel %p from "
              "OnClassifyComplete", this, mSuspendedChannel.get()));
diff --git a/netwerk/base/src/nsChannelClassifier.h b/netwerk/base/src/nsChannelClassifier.h
index 8ae252673975..02766b3a9cf9 100644
--- a/netwerk/base/src/nsChannelClassifier.h
+++ b/netwerk/base/src/nsChannelClassifier.h
@@ -30,6 +30,9 @@ private:
     bool HasBeenClassified(nsIChannel *aChannel);
     // Whether or not tracking protection should be enabled on this channel.
     nsresult ShouldEnableTrackingProtection(nsIChannel *aChannel, bool *result);
+    // If we are blocking tracking content, update the corresponding flag in
+    // the respective docshell and call nsISecurityEventSink::onSecurityChange.
+    nsresult SetBlockedTrackingContent(nsIChannel *channel);
 };
 
 #endif

From 7ebf3952978e97f569083eaccc261bcbe52e98c5 Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Tue, 12 Aug 2014 14:05:27 -0700
Subject: [PATCH 14/89] Bug 925611 - Add reftests. r=tn

---
 .../downscaling/black-border-bottom.png       | Bin 0 -> 4094 bytes
 .../reftest/downscaling/black-border-left.png | Bin 0 -> 4176 bytes
 .../downscaling/black-border-right.png        | Bin 0 -> 4097 bytes
 .../reftest/downscaling/black-border-top.png  | Bin 0 -> 4144 bytes
 .../reftest/downscaling/downscale-2a.html     |  31 +++++
 .../reftest/downscaling/downscale-2b.html     |  31 +++++
 .../reftest/downscaling/downscale-2c.html     |  31 +++++
 .../reftest/downscaling/downscale-2d.html     |  31 +++++
 .../reftest/downscaling/downscale-2e.html     |  31 +++++
 .../reftest/downscaling/downscale-2f.html     |  31 +++++
 image/test/reftest/downscaling/reftest.list   | 119 ++++++++++++++++++
 11 files changed, 305 insertions(+)
 create mode 100644 image/test/reftest/downscaling/black-border-bottom.png
 create mode 100644 image/test/reftest/downscaling/black-border-left.png
 create mode 100644 image/test/reftest/downscaling/black-border-right.png
 create mode 100644 image/test/reftest/downscaling/black-border-top.png
 create mode 100644 image/test/reftest/downscaling/downscale-2a.html
 create mode 100644 image/test/reftest/downscaling/downscale-2b.html
 create mode 100644 image/test/reftest/downscaling/downscale-2c.html
 create mode 100644 image/test/reftest/downscaling/downscale-2d.html
 create mode 100644 image/test/reftest/downscaling/downscale-2e.html
 create mode 100644 image/test/reftest/downscaling/downscale-2f.html

diff --git a/image/test/reftest/downscaling/black-border-bottom.png b/image/test/reftest/downscaling/black-border-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa7ce2dce18eea85e40da68845205b199fc79f2
GIT binary patch
literal 4094
zcmds3i93|<8Xip9m&%f*nq;XkV@<?Z24hN=P&2a4Fc^%{7=~oc^0Q@M3t6%xOHo8)
zkECOgEftz<*;BI18S4CgPFLq2ICEX!eDC)>_x;|_{k-q{U0;N;A)J#<hz$S$a3b_|
zF46DP^h=F}k^Vm!|4<45VAI0EV8#d-3}j3sIN)5d0DwMcW(wKNbdW!sN>Qe~J}3$j
zUlO{`3VL%+pATpffe18a3=5I)(%GlSd*IY%d$UFcc(|yYE-(AdV9WsPS03ZGCKDaq
z@u6rJ)`e1~Z^Ic|?WmE#$?AbY#|6KET7dCpFtC|~WC&EuLGsSeG+7=z)Y-bic$kNQ
z3(3$(b8rB{S9KVBH!14r=|%c&mCN(sK>ND)(hbHE9{t+^@uJEwvHbux-M%ww{t^P?
zj7g@I&jsbTfiIVmPsxYL$@Ay1<~|S|Z7p|QE}W36>qtwL7|RhtbqPLG%!;lv9?lS_
z<wXN?EYrk4I_BMA#!}1>8G!MXlRZ7FcMJfsyy-TtCM9xQBjj~?1?MBaG6GnVT2-DA
zxuVuooU#Dk1&(8pzz77U;J`o{Zv68LhxNru(>08oR8q@D+F#xV)TJtpTe1Ry<%ASn
z25}TV-6?*qRAg=r)j#31)-X77)ZcVV{l)bS^F@hSYL-@X7HY(G_5p;#4_FqnxP7Fu
zKG_^lh2O6^PJ3Xq00Mm72dEmp^X+Jut93%_Ck{#WsM%Rp4~A?Pu+(SejqG5;%Z4zO
zmGsW}jmzf>1T=z9Aovupy5j|f1s8N)z2e|XrP^<;@NADZs^I?B(IR~(yHQ{<^s~9i
z=OosU2&cMGwIF01*q$vUppO=C_>3g8pns+dual<@z%NwAxCX)ef}jq7onR7k)40y)
zH*=Loj_pPLGpEw{a*tT~>pv#fkFi@uy3q`@L`^4_Ib!XJ;<?g-c_SgNO^gTQm`Qip
z6obIBjMBE8B7q9-Ov4~RNT5CsQwkGUpAn}Ce53_^OW%TWZyCI9I=cgUgRZ{@8U~+n
z-){-L(#Yw~&JhULWD9G$Aj>cugkuT*!o!!Vbw7?jpF3T<pGVk&#RsNke3qB#IV>WM
zCqZ-VwM5b3(>L$uz>L+GPLPCZS*&iZ-(`LcQry4A;1_Zrjj;#K`4;dbaIoT>2n)Qq
z^P`S8-yLRw#`m=IHT+Pn>Sh6&@E3q|s7-Ssi{=X!rfxkXi}0e3b{tZS;lOd1c+q^u
zV%>~5u6*IAG5Yb>#+dep=b+OL^S23(hNGfsn9JyX%z4?qG`qCR1_Bdj9C#Fh)`IV0
z`W_Y_B_C*bv7R|_J4UAUvTdyG)r!=IOmES%=R~;L8wEd!xck=}wv=~MDg#z?4@B1m
z&a`mSBo@7&ogU_02<C3`_=34{yq+yUB;e>s?6I~6$v9REpi40K@f47ltC$&&5X&UX
zR>*;7MU$W+Ba&zsk58*5=G4PmZ?&EwL?jFoc@be^0++;2rB?-+A)H06B-AA+#}hkL
z?cv13C{1glGO=usjW~CLhH=tK30|Y~BD&gxhAQWuYWisU!0uh*EOP5b-cPH|v@oLR
z_?`EIz!Mcxzom|LlqQzMyClz~`idJR4WyD&ZNS-*Hpc_b|0vk3VKiydY%&eXtGJw_
zN2_X94@Kx^<R)YO!en3~FgHIbJvR}5mJpOsebA^_bE@Kv_`Tyo+CBGt-qciGtWtf4
zeJ6VauAINolQ{K!>DXt=5-V05dv*NexX8HBc;(AW`<rELR~0S^-iuC*u8WTSra1AG
zI!b+irW|Lz{p?io+G)4bH<Cq@9g-Q6WA7W76Z&}jGVkN>8}-UMOE{yQ2c0+iz$G!%
zLMl0nnrWlBJ+>J>T~Qlxy=L9{d&{)?bfQp(P`!|#khxH*Vw;j+hFeBQ#(2i0VtbX7
z1^Z*5#kj@fV{6&u^!Zn24&s$jDmkTPbA>Y9(EOni^-{Z{N~B|+VP)4Ls|4^>Wvyz<
zYE!bd(FF(+VpDFikOMWzF3rwwfHzzXc-i<G^v*U)>vmI7PGn94It!ggvpaD=zNGtf
zo<-idwzGCmu0<|FN3Tj$L}Vfo5HTGWP2ctoo7vV<tEe0<6HXF}B}#SexfLH!s0Vue
zcU4-{Ufjs@xxFUEt{#Pq%H$v7w~?NcHkFx?K88Al+K0qfO;@b9ylc&Hv9j}P4|5*1
ztL!Qmns{7VEHmQOFz0tJ!>VG4zs|6Zy3DmKx*@S4$E+Ui9Zum|c}wy-Sr_8hcVOl-
zt)^=+dX!nxSMp&GqHrV=)pe?ivn!9CL*R=*ugqa$_cdCL2r(XP5019+cF*ZGf1f;R
zF|+>a;y}!#S1Z1C=&kzTR?UVK_XX~FcvO2*VdA6^mEHQU)bcCwSIVmsRxk_B3x!Zs
zXaqC{dZ^y3zQhl*ir!+}@>(DIHt=O~ePF`~coz78^)p*OP!D*S8OkotdT^g7u%(Hi
zsV?{!<c*D(WiLOY_9o0LRE<@M!-{X+<1koS@qxswPmQ^^zc(2ugVEK2wbtp!zIgKj
z9u>oXfuF3`0e`OB2fwK6tDCBOAr&c&svOgcwulB5sPi8a=JOTvA{MW_8M+WYI{S%j
zbRMi=nNm6Xj`(=IxRY8IXVZkbcKWFBu_Gfq+YyJFi^mPhmTaDq$AJThb>SNclWkIy
zF^g8K*v)ugYRIFIZk^Ots|Y(p8G;Wn%4nqZ_@n0|o3BA*#Yu5Vd8ZVLyNmyY3#nSI
z>d_WQM^;E#DX2?QAT5e{vas5hxW0MwL%EvW@dhV7P!4rzw|*FW*N+yvEq)WlUg`X3
z*b$D+erfXRz{Jv6#+X~@k&bU28~#cTN@P#Rdaoa0n@vjdE?lLd{biQ#pBj>_nrdm^
z>t|x|AiVzImrlLT7_9J!TjX%B$z79*dRwQ;g^4!pr`jeoicHs4F4yO-e6Djt4wa?O
z?^8vsyT4;PKSh2r6914eGlKHFvNrT;Ib@D<Z~5K^`J)#L`NPmu?KfmP24y|?y6mG>
z>G-R!xnHa6uFTe7Mqj;V%Z-b*kFAm~dPF&2?hNlMoX(#P5{k{3piKK#&t<-Ae?QPL
zf)D6nh+%rp3_Z##@+{!Rim^+n7XCT<1MNWzbtZSZw!tyLCO~ISe=(j44~5@rZ;tis
zJJ&m)T%??Ira2~|?cwOPcEZ-j?=as(B~!)<c~4h?XOF8aerjJmwvff4Hs}-ScYjK9
zD|`9LYl}#Woc<5}5l`~Z;Cu~yN2UUMGLLi}k<qxlePbzlIX$EDrQ-!^d>7xH+bY>)
z|F7C@p^H%w0^zDxNYL7<u{W7z6=lPnL8;}|i%*Hg?<pIb=BXu)Whz$Z{4)J0b75OC
z{YUGvQfy}ZaZ`^M@RTX{%B_^q(p&ZW{3h3}HXy^xwSMEbwljs9qV})PgX?{_tv{$w
z`3-M%GZ%APYrMLCcFSqYZgw<RlFjIJ)_slAt-jR(hhoao?A-xdYUN*!v0*hZ$aeBt
zxlzkLYB5zxuS#zkUJ9p1uSE}Cf4KDgOJ{Uy&uD1FsUJ^PlDkW?{mB~?M@&cS7nkmt
zbdB@FMfED{{mb}C`_E%NWZXhQVdQX0y~c9TR?ddqQhWT=tkJ4ba(0Xc`3CFeS8oZt
z!^Fr+$hQr7Rg^#do08RCALRi6upipF7yub}4g&zd6F4&@33<^#)sBD%qwNV8EZ7_G
zPDj(fM7>q%Lp+v*26^LM-8@vi)kSv^s`T+r7$OSVg^*m-MUfYcK`;Ul3sM3rf@MXa
zY#<OwjcD(ndPzs`7oGm3F6u-gxvN4TWHK2{Rsa)-ju1H&6%~lAJVahzhK`W&@Npxd
zy=B}yPW+tYKlA8dJ?w}$cM^`^2HKeyjUjlF)I~*ig#P~htdoRu_(#dj<CiVELC8)9
zA_ta*{E3G3#{Cc4PUe5o?Ct(`<?cyz-SuQ|2f?~x@mM#K2c0MPM>%?L|0e!dk=|(c
zpJKaB{OL_?r*hRxSPz1$=S~aE-EbtRoZ7CT-^2fO<R=S8z`GN%9v*ZWROuIGZ|rwG
z@*f$fvivW?-r(;9BO;FO6unc|-!<)x{f<ZdNnmeq4`HYEs>V2PtSeFnM{nq^3wZ@a
zHOL<`zcXP3R|3)09c_o*sce_BC-ggdR|oZv&KcRgGJ6txi1v1>9-bIytQ~33a?uxU
zck^qb9U*(dYLGvo)#zJ6^&-I@=isA*CSjrSvT};5vdXFovLLy$JA<<-YLMSBdn(w;
zz=&8hi9j?X5L}_VF7P{#AO$de{eI8?qN+i5j?tcD_4CZ`M(KwZ%0_4Y=LG;|OVOmp
z0{{$)2pugmZ-%)yL974}2T;y)J5$Q=IP(;cs^sgCVtN<#QPJ^gX`@sigqg;;8kX&-
zTF()}{!!RJYid=V2OLOP^(h$b)T{y2(<akzL74u(L2M`QHpVgvRB<wS44KG3+IguW
MbPaXNv~7d`4g572%m4rY

literal 0
HcmV?d00001

diff --git a/image/test/reftest/downscaling/black-border-left.png b/image/test/reftest/downscaling/black-border-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..11bc67e983422eb065d05feb97c1b18a5ac07c3d
GIT binary patch
literal 4176
zcmd^>i93{S`^N`UcBw3pGKtZ`%-AC{mcf`(2sI<y41>WKjbTQzW_fJcvlJ33$x;;2
z*dy_nWJ`r)%a%me<Q?jL9>0#>zu-5=anF6-=lT6y=W<=wecTZyXHon-;yeHVfFEtB
zcaC+RWL=tE?5zLs_=m><03ID85@~`)B0(k;vLn%r000>BXI!V5oArr=GZ|`(S9_#D
zG7I9Dxk0Z_8VUnVBhY~+>|r5bZ@nD`Lc5QicQCJILxoG(>kIK-4aWC!e-$)osx#Ho
zAMKBJ<(@56nIA}BZ^jPxjhFZKInDa@Rsu}E2LtP=7`8y=Y>d$7sXD7Yds`cq*!Kyt
z31HZ2ha4S&sAWC&uI~(ZTG~CsrqadFkU)p3cXBl*V9%b7fOsi2r1VYzkAAnRraxG8
zls(C;^tqVg2Jq!V@=?Vw1x1l;?%NNfh8v6B7VnN7uWCt60gq&hW81}^DQ8AknGB@M
z4CO=vv#nBPJ~-uE;UqB3(dmHEr6Zl4%QuYxFrhTtwsCN_TZE#%kl5#luj~M>q(=2;
z6oIG}b>~a~J<n+*5*UHT=k4xIC60c2;kY_iYPNz`IG)sSX6P@v5p$u8?;1=ru$X*Z
zpG^i!N^_2%DU_I*!S;+fuhjGn9`rX`hrhVIW-$kzW@hR{XJQB4rXN5VB7j9{%Nqwu
ztCKANWu%?jqeBmjXF-6kI{;+^H|GzAx!EK%e&mzojhdcz^JL3%g&hB+ww4u4epwTy
zzLeJbdF}kkJW;Kn!)Re8g8pdU-MrI!ZEbu4DNKj;CBcp1T6N;zEe&!vvuZ`>LO)rU
zeoEpFiEyq8)eOSKK^%BO0=kC+_NmHpiuq@_3ORe(0{lYNO)AiwFUW8J@-T<AyVhlP
zzp0CY3Op~WpE(!C7kkDkUj8w@D#>dV={{tnBV{(W$QSECk-04=mNOXQR>!_4j+1(e
zM>z-rW0$kzmk3ny;1~b_LIMp1Ij(a+4B3g=z(+cWH>@qF@P^I%s*4ApE9mko;MrhR
zkDXS)3$^?nynKNuZJw~Y(=fJyAR<@r7eV3MI``v5a(AWa_6Y8`<nlr4n4A#ec#e#S
z6HL%vc?G_=@7UG**+>)k!eOd-C71Qp)mxmeK*~GU+5AFwr?PkA_}>7Y1ooAjl;A?u
zw|>y03*Y1vt$jCiszL-IP+l)OwEqi0F4VR@kxTmp7e|KyhHL+vo^BjQnr-(X*LbO1
z_I&;HIDy>#Ph$+@FO6{Q49~`;?h|Pe8xF@t58=<_dhn-U-KqAe=Z!?iR2>DCf>wg>
z;JY8@VPqd@d2_4oz7Zqec-}77?qW&GLykAN>5~!y&9!15B|Q8q_E{;qs}uptclAbB
z1x_{a4}s_C&yEcU%?9tP^ZbIpa;TaoKqBDaV60?QjcgpZCD1i^*P-hmX*X$eL2<5e
zuJw@J^~$C}_l&7hVS+x5R`{b2uf5TEhL!-IO%y_hNsFG7KAKh*WR7-`vIfJ!j6;bn
z8V)GRKCHHlaglTu$W~@of|g0r5wMW)DG7buzO(A5o@)DO`ylU}<G<(Lg}I+vnPF+n
z(DOUx2Sp_+rOc-cw-hE8#JeU>rTEGiC-tV#QfwhvvbKi;PW{OHUcqi!r(I_jlv8p(
z+hC}y9v+I;Prsdv{|ldvkHBC3sPf!Y=2=2eLirx!eC>&n*D`kwiR*UW@p)ZQcBV|@
zE#WQf07@-)tut}r`GVvp#sW7%hH!E8$f(4q_-N_Nb35x{cFRiV#O_2VMps40&MS{S
zWezjnsTLD$Hl7_#UODD|>`Jm!vSTt^a_oI03v#zmcgB6ved8{e3)ltc(&w_)4Jn9W
z-euA<nHjdq8zbMtCrc_LE?2C&d~2A5PbP||i&u+_iCc)LC^xByrMsuMq>rYLD>s)p
zTk<{zT8>(dKemA-r+scSca$lOQqL|dnz<|AfynJIfEU`|E5$hFoGoqNYn=eOsHRhH
zRc=PpH9if+Ky8anXR{HeS%q1-HK>}40WWJ`f!^9h>D;KhmmQg1gUiI_4A~#PA79XM
zEXOkEWYY=zCzm4U5W^S2B@r3u1awTx8M8NC1Lk&>%rYjQ>zFfGxj?0=`F6>BEcSsx
z&n@)^%@<d4d~U29=Y>aMqB2DKMQr6}<jmx!<Rr02u{$uNvdNOwhPRFBuGaQ`&0#LX
z_NDE4{bP>{^W_J<Yi9gTrdyZvi&UMhVlE0SO09v{6gc7G^l*m2(i^Jxk*W~C?%h+L
zhAP_UqK7$UePthZqVEo7VB3$j^S9^l@`-*C?ULU|>9{mhAwh|UI6$Ip=^oi#7VnaW
zEvHu7&h*BNdpD9A``^I()+^SI?>fCJ9u?J`bT@HaoXKnRS4#1P_zT752}}4{m)W}r
z4MYSY2C=u=ySl&+x{O<AU-w?^pYQ!LzS_HH3_JmR!2O9Q7ia)H&xznw<leKx3)oP{
zR#z1)34LuVZPg{huKOM79jeK#!e=eK>bVahr~Cjs?Nebv_ovf<@_2ncWMh?K?2Feg
zP*E`=r$uN6EvV=E-KaDAzWOQpr&BO;*wPV$Xv=6&9$Z9nzp$^gHzj}Rb^qz`;pvY&
z!=E8aR@Y0X-%=ir=C?A7;%w`%myR9WFL_{4a3f-Geg3FX(Sq$$+9<F$u_}BmVZ7=1
zc+8yjGU0nXFeT(sNQYiZqjiKmx(F?d9%eVzdHliak?q%@k^H2%q@1Hl`5pOx6GO_D
z%Q|&saFHd)t(D-i3}}OL4h&iOlGy#(V()G3j(DRZo><4K)N4PCz8OYK-;lYA<t=r2
zG~k3HWW6+P+dZ~0l0M?zdZ1;#WzAp3QHAE^RPFsE?0cQcXIFv3(4HczcTdmKtm`U=
zzEw}fl0YQGzAvo?tuciCgYJ<7U8c88ORDXhOJ~QLbf4;)4l(50FABIlcN2D->31wG
zba|H|Wz+Eu-}*7~qp{5UgsDNS--VU_w#ASc#+}7GYqSsET(tN76P5FrG(6U(?^V$U
z>%!5tueZOJS6!H{K99S2$!-@h)*-e`@!liGsbUvY_ua|d$sqCA^fAVyZ~08d+vaz@
zHG`ypPPQ11=bVUxLK4pcUM!io7V40m<K7QFXkbp=o~*2K3a|~(n=zb=XQDz;cbe;C
zy}D0!^{U-dOH!?mNoaaFe5skd{^1+acW=RjiBitfW#EZJ>T@5PmnCO2`84}{BK_`9
z$gXECK6zysX_?*gz9-^It}4;j$aioeuruR8`vG~a8yi;^q8HQBOJ6#jX2!P*-@Kuo
zMf3lv+Y~w%6(Jg~ae<1cEE{>9QB+bi&>ECdY%}+ilK+me_T3_-z^O>x`lMfmA7dtL
zJ*MYiRpxcuX@BCx<5?18!lQKk`f%a3>K%ULtJZ7KfyGL{(Q6wS`#GX^u6~A8`)=60
zhfnwotaotc@3PTqyL@8ZdEI_`__i#M@v+SNT7~P~%e{{IjD_i2y>`sfzno&jDv;2P
z<dtIMh8@g&=5d2EgGp2&iW$8U-GBMv!t*b!(J7t7p*2T;JXuQaD9G}studVNEsbAX
zJEqdKP7U0vR$uK|B#k?K8tJ4FXY=kx4ir>tEe5S;uh}m&$4^WfFB>Ok#c0v4aDV?w
z2a_Df2A4wS*Az9d{;Y3GZVyAOCjh{^ck^Ncq~F{J000jY%`sHW86ypQG6{lnAma%T
zI?02jW_^j$HCRIufr<msNp9|*8g#hSmO_Iy-ZVp{KwA>3D_jb5#sq{UQwSgxh%y8w
zh2Q~!K$;W>M~!oO2ETCD6I{xfO7+lyLTNM_gr)=`Q=Fg*>gwuHm?BhBQJ$rc_w;e6
z;^^}3o`-)<^51#%2%h#7q6d{ob_Z?Fi^G$>sBkH%%|QSBe&$IfI{q8U-SbyjtOB8%
z9;gBY2K^I8pcDTGw(0qwn1lU4Re5+(+_q|Ru!j=d2qc0#)sw|3{4pG>xBr0uCrLWa
z<7cp~CjP8Vb2D>|a|BPao7ZLwEZm7ygo5T)LBE^-?Z{6GNhWzv2%erS459K1*>3w?
zkNGzYLQU}(u-*7OU`!#hD#dN)^-oUQZNKZWe+sbOxDD8By@m;qPH@BM5m^o0szOmo
zSrht4&+jCX>_(=TdEo2`o0)AP+f2W!x8h*`jiU<N9%h?k8|YxK;pv5UA=p#5Ef;Ii
zwl=>m&I!8BtO@<2T9dUEG|rG6h>kvbI4S|52vbnjfT?LH!9WTpHV10zn$X`g+cMbn
zASnbKl}s@wlid(oRgg9xK}rzT`u*<zg=#`KkI}Yc_4CYbSy_h`!NVf|`vO4l)S?T+
z0RXlzw4RPRoo(jzL;hNrAcunN+U#`hYXQzzq1op?OsS8*_uUvg9JiP586ymavCSU{
zeYF=hIPkY}X5h*--A~-9<XJ~?<Jv2zLkqyRa+*?%tX*}E;AQr)cU5UkETt(IoNa!l
z-)NXSb@oUI3tDu~n*+AdgmhVuuUaRaee5JpHVb0hAZq^qo&HKm5{Fksgd}A1HI3Fk
Kt5>9J7yKW&ra{aA

literal 0
HcmV?d00001

diff --git a/image/test/reftest/downscaling/black-border-right.png b/image/test/reftest/downscaling/black-border-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..081c52d5bca78ab697a399ba5d604a81bc7f655c
GIT binary patch
literal 4097
zcmd^B2|JW+8y-yAmrAx&)5NGSV;7mR491i~s2SO27!1Z}3^OWgmTbwEC?usMOHql2
zELq|+$(9ODwrrtfmv5-|eSIChzu=qWc;>mE>pIW-yw2;s@8@`;%uk>M`K0&&0DvIc
z#PB5hKE}RucsSYrBMA@X0RTRIA`)qiMj}Dx6tWA^lK=pi2xeTRSy}doMKT$hjMv-2
zAlX@|bG)E8M@)7CEuzrD=A02>5I@5$#-iH}o^rN&!GVedI~j@cUkt@}^L`aEudlW+
zG#cuS_28W<Q2*AKzS@B8?-_a8-QzkH&|MBNUkL@)P%#|AYS|dkFXPp=+jlhA&2vhK
za0p>IUa(wTfT#sS&W;rZJT2{>Nqx!O7ih3^#e0P+bBIsZT2KO56DhM5z-QE{p%VxZ
zAL2~5EO{xZvIcxLn{rSkLRm#DoA=fO@IYOW=iJ?4`HH4%sgS{JDQv6cbG6La3iG~n
zSyoOgFx&Q;>_^v}3)}>T6*?U-G=HGIec^^FKuI*sp=AV;?HQ$FBr5qO>MJLJC%I1R
zIYlUDQOhk8K+km@j0Q%b@wwZ&uMvknH@Ym%lvpm}mF1IbkFze(O_{T$0+*G<gNw*l
zjW}enq%^mL$pY!gNo?1!+hSEu|DHh0Re0mMW$PKp1T#}VHWS<LIq?9-5ChD~*j(RT
zQkh~6C?##x8)7{$n*ss8ZUL0`-T1aA!qYyn?vsEVf6T;$rw>P#2UPyE=5kgj`Bhbf
z)_hv?m*rDOa>aE+_M>;I5{!m&@8%veY-te?N@Y5)&Wo%KywD>4r>R!qM%D}Qnefln
z7N3)O!=l_O!gWG0SD?;(VL_d&APEgQZppw54^cN?2S7l$mU$VPyO9hBAop|0c<G+w
z3>ZHnqRiJ=`P{7_p~xp*<=l^vrM>*N(OxW5eX!;5oIt!YMfR40WKMsWXEo>cE8NtZ
zd}<+3B~ArLLFr&sZ>~NNAS~EKgzG97)P$3$2YjTDc+1{`%5ORRF1mXIIzrC92A&Aj
z@ZM?*JpDq@n_nOprN<XheN2g?FNDYwIxVvEmj3-KVz-6U47x;i+3@%y_0129a=k=G
zT@gvtTYL?<CvoWF{cNN;e0D!os+`B};?hm-*C4g6s~iDg+pcl8;{@LVo&@(4ACcxk
z)ii%Jr0=}JE&k#?>u8x6Lg;CYIBVB5Kq1_rCW%L{k%z0z7{jw`#?asjMuubCK92<O
zZO%NS^eaNQcRh<UNjN*mwKXyucTGa9UUDE38_U9<!gb+~Ds^6Sx^~J`d|1OpL^WhF
z^bWrBVJ=4Qfvz8~#<uHmigl+P;~mcwr#|F*i<>wiE!6Nr@{_c8V3~xiikEsJ@TqWj
zY(?;Rtso0BLw|m#Pjo6&xY}nLe_>xGUyyXrp8oi~^;L3Lcx`|lp~CyFf@C~ptVE=E
zMtD}kw$-RvgxoWuf+Ixy>um7{A6|Z|{~Rq1Iguoaj*t;QDRVHbG{g$+4z`29A&h-V
zP1?>ViUd~A-mFk23*;axoTzJ_d;lV9c2wHPpy!0v(Pw)8dj7~eCk5|$bztsaE6=bo
zV;BY;4S=DNR8zmD4m1@c<tKQgjHjNLHB0VJrKLJRv*aB11s(m7yHdt!QLR^P8In_c
zD%+S<S_2P98>Qb$!C%6s<D>8wKdHa8kbRyQlK6DHS)Sf#@f+DY`=kuo@A$tdD?MJS
z{f_WXX*Wvq_HujD=*!u?pBb~f1X;qFp#wwGLsCN}uTE~QQF2^RJt=u7HYv6uHvXI1
z@H6HB^Swq9(SGgu!IZ^AUWYEEfKyyjI8x&8n_81QMLRR@lkS^!D7i!2aqd0t%bn2t
zIObg@Et8qyptd%+5;;~}9(As4$^Con7<?>ADqX5lN>a*NDpjpsT{7J(y(xVteMGIH
z)Xj$fG0<knX5_KGQcBvF7AqIok{GS*g2KtWifxG7z4`D0r+XzB*PIh2tvl=zp=UJp
zpV~gPq#2kUgJEC}MHW-p2#c(OtlL$nsxv{aUc3gqbBxiyUVSe+I=c#&iOXR*?Z2Op
z-*za+Cg(`~VW%f&qh}BUXCTE<8R$fGT+?yOw;g>}j^)f!rhvz=8$>N%y`te(@dqsS
zfpOPOty-PN3pxJR7v=fkF_@SPv0gC;g-HcV#c_qb*n`+D7*gq2@lx%(x^xdar+|hC
z_W`Gp*4*CV#|3$c{eD%G0Y}p9ihIQ>PE;`Ggyz7@kY#0VcqBcNAvFJ%>UW?bETD7S
z_-9sG>rCtbx7>NThwbRQ{TbNSgRO$CIs5|R)8ZY95|p;HtTJgz0@N8A>p=I;?y!EJ
zGGH^l)N;H#Zp5#SRM-0!-m_Y^EH8XaH~|&YkbF03M2g98e<`)-bi(PPr-}3UDfg+n
z2yH|ZA`Y>m(yuZ<0JeZz<y`e!>iyO|J+jojYz90Ge8Bse?>5jFc#0drufn^1i!ZRY
znxncRbT90UgN$v57^lGs(l1<xS6#qv=aP>ER6*?lWWvA9njT1}0TuB^hRC`KllaCr
zji{J7v14L1<0jNgqfXRuqw_|oM#oYy3fPiC<5-(mP%d0-@2;KaW&9|4^KW{OMGj1S
z;v4t^RkgiZGVzY`cqp%#S$M^v8hiH8o?Ux)_lvAW?WoBcGA*2Sct#rnb|+OtE+>xE
z%a6p(*ewuN5`d{;kHXpvQ|s)aoX~~no#+8hGyTUOeIGe|4H?W!zLK1CP&KbD??1$_
z(uLA?16f>jvAmrsT#f;&Rm)LAmcJr)ezD$hORp`#^nef6rQ+J<AEw_;Vr8z&Uc~a3
zxIgN1MG>-IS+r~$o*hgd^lIMS^sQ+*P~AnH=IdJN_akDZTK$WMP(gTCq3!!;Cunxn
z<*e_O<MAXA$)snx*|<55u&duIy063HrbTh3qg%<;aJ|7Z0}B>IvGt6Q=S$C>o|C;U
zB?a#9Q^EFa-|@|#qCc6*en=ee#|E5U>}{C~n`GRXyR%ID=*L6*&^ucG4U>k)+V{LJ
z{AgD&)bjP#*QXVyCn`_j&YX1=CdNC*m#W-*#5h{yj_SNSc6%&DDn5OfF?RmxWX8LO
z_uW<fq@Z?=IIfr6h&`gx&x0E0%{>bANiT69SPyEM<G04jt6YN|f($23W)hgFaMYcK
znt0#NBOTqE_cW6=YT^>>9}b*tAg_M>jy%63f7Dzx=h*`A@II}XPYnxur!oa}di<jU
z?vKi?X3af$Z4+&i-Swd>>d9>l;(62a{iDI{8M|9|E9zcfyD%F&mzG}g%JmpCp>^kt
z>snc~z^?}N;WIH&;*r{?sfhB@!8aL&#f5#%A*n_7GtVe_?-|Q0)~Wffg<5t;0x|*^
zlM$<NU3)4ruR2Tw5=S3Tkr<=iC978l3NBY}2^d+jTZZ+`l?M!6Ud!0U6|;5e3$*h5
zn*9g(Xh7d;8+V?ty>837!>ewqP7?#S<oL`EW!~2<SnXWscFAMRPTcHvWR_fVjgKfp
z!q!q2i_B`bF!Px5#-+w%r~(u-b}_d1+{4+I)6KD|?E~Re2Y)=7Pif1~3ZyMFT=7kH
z(;jW(X}U-I?p10nb<L4RoIek?(}+{Kccc6AD|P2WR<oC#W*ZVlC(IViQnKQ7X%~1`
zzS1Eim*M{Tuy4yM+Sow$HzlvP3DySy;NP)+aRAb9NB{u9{X{Da6?5EF+lfqq;+)BN
z0+dejW~13(qI7NckVK&3Ky;F)myb3b4&Fd$v&ZXU7#Oqxp?bi<nB(RkB$+}0sYBJE
zN?-&Z2n5ohIJ;<{G&KH2XFtKgZd9tbHVj6i(V#R{D4F64Q`XYbf+?xMR8$n%2t^-%
zFDj0%=;gEj=Olm4V@U9Eq7c2QM6wrXeO?@%>`R4%!RtbQ|9;j<CA$2h<mL0r7TX|f
zJp)sQD#89lBhZQeLR-)LE6v&IZ&%*F6weJ$&Q36bCxJxpqWZ9T%72t&_x5k%{}f5b
zdH)pKXyQ+AI_s5dpCtH@J$=_(VC_YuB9wJD4E-Mdrz1aENHWQrLh$in(-7*vD4S!y
z<1zopAT(8e5jF>ZCzw%)Y^S*Oy8f<dbL@9K_D=$vgPREJt=Bdu(g~gzLn6DO8!l8-
z)pTHg%>2$ol0C^3OK+SLVZE{q%BIlo=nWn0KROypn`Jg7HW8hjw0(T>?gS_5rsZNU
z+Q#NLz`4RUg>_(mMC-7(g7$H;GttH05Jx2-RFss}w3RfqRh2->ht~({nmVxGFq<k^
z&mbuT9F<J5B9lE48!kxek04bjd;NaT|Dx)^){oJqWA*dQZbaFK7Qx46{`CSt@I|D@
zOalNMnrK6PD>}#I8+}25l0aRt?}`>JE8)^0`0$;~UigU+$B?vV)jbgTY5tEf24#Rs
z)=1iA7#E9kAtK9FyHX&G|KqN}%+UoE5oj=Z!9RDPS?~V=^aGGp$wePCZg5(EucD1k
K7#12hhW-~<2_Z!Q

literal 0
HcmV?d00001

diff --git a/image/test/reftest/downscaling/black-border-top.png b/image/test/reftest/downscaling/black-border-top.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc6e69e02aa1b6d51fb34db1d2720452d336024d
GIT binary patch
literal 4144
zcmeHJc{r49`yNc$rLsh-NsJa|tQDED491iiLe1D`7z{H;W0+A{v%I!s%TkghYnGyj
zhU`h7Nw!o-_AMz{liyI^`}%eC{qg<(&2c<4_j6v?d7syL-S_>>6J~r4Daa?u2LJ#B
zQHFZw*}s$QOOuC_{XG`*;1~eFr$a;_j8O;#$e2oTB$5aKfT3XOO}d$BuUIIHd4l<B
zmo!LrUh*<8==CW>QJ_f}%HNnXBna%Kx6MFg=aCBzX3sc~q0;vHBK+3^@jbj>gpHeO
zP4x6f`XXI<XA9N7_NS~hV+VT2%6od9W_@}p0mk10fps(thren%M&#2}t<|pGtqqHu
zdxSZJFdWYY9UXzlB|Xm0?@U;7a;{-h>B1+7zeCkK`5I%eNB6p4jPwbF%ys~ue%EnL
zU$FQHXS``?qlEH0@Wp(>5#<miWwCVLjQi3<4aKB|oY7-dElG*s;dDuCo5WMqJCRk!
z{VB48nUTPBt0dVEPMKG^2~0Co3SeaMa7V||Z6ko9NV4tAF>pF5Oj%z<;#1fcP5@7Q
zgZfjdP{gvj^Bn*q+i5r)7>2@U@9aq;j*LHdT$w91UB)XNi?2UB_!q;7HD4xhT~XY>
zm~vB}Ll#R;c8-}Tl$x2rc8@wQ*YpnT_cdLEJ-@taJ_nv=-O-7>gB>7E--j~A01Gk}
zxAv7*Czu1u$lJ9?2JfS1L4YsY0A>BRzwQqq*~B({6p-VOn4TtiaHP3Hj*XvKO$(&F
zs0mSDOm6+Odf`;IxK_X+l&A_pe<V96`;6YpmjXhGEQhs4;q{?s>coGw)XU#adnP^?
zJZ^3>9?u&T=3Eu58GyL~ao`K`>l*aib6k#F!Z+1b#M#pp;1jHFT!G?#PJsashqz?i
zv@Ub{Oj!ym@jb78>RcF8>=CVe`N!DG0e-7+w?QKvY17dKfoKP+Y=*o<=0FgsmUGt)
zZrWWw)c}Yhr@Wn@l)s8QS3d|4<Zmd<b(0HX$Vt=&KGcD~VQ)dDHymEqT-*Vj0heC^
z&jlWL-);rG_)O59U%(%!%@<O8Mv<dGfXEa0Sy(hfC;x_6){bP|ZsENaJl+T$<C7v>
zjfk)t!m--RufVx`j$X@8M;OEA578tmd91Ik+~s}+Qr*7B;S;noiL(PI_y+LUzqjO+
z6c4hl^@AQm^ftHnvv-51E5zVJ<#pnNdp`r@gKg{Lc(kAMaJ3s?c=pce>E6J|aO^zj
z8Y7*>nWvv}Lnv$SlPJTOOT%2-L(_3dd&HU~hC;ECgZK-$Zv1J*t|a@U3r6Cj#~p=L
z0+s{s;kzDWW905@dGQ|Kc`Hhx;euVXon=Yl1Fko?=~Gfd&Ceu0O1b-1?6FdIQ!4_N
z@92rF@}H^~90boXo*wNNnGM`g>+u<X^<XuhpOoMJf#?HGHF7t2Er70pI}Y9i$&h5s
zge7^#c-De;)~T8V<f3WPA;R7bR`??iuD{WFijo4KixWYG$cUepIg(r!V1{y$wg$t%
z%!6?)8V*S69;~(vx=1DsWGlNPR?9g4FjxeAT1sEH_ni9aC)(cH-iUkW1#{gxG5JZA
zsTOFap3i9?C^AkZ@oVBxOJQ6=jBCPF;uTqRd`}`h(H4>>XM51^^pEWC6`Uru+O?(u
znI#v}4F=2VV8JN;l#B%YU-%S!82;KvwMG-!r?COC<-5>%+7l(OW$zu7)a|(E{ko#;
zY?;Pe!du0C$P-zs9dQ$l^9RP6^SlIEg5}8J5vdW$k<u6Ex7R7!EvcNBxEC20Srr-m
zRdw_UYl!vkcrnpt{ppc}<)dy#uO>(*I3{o;MCTisQ@TXDQuE3A=uSl!unW$m*JZT}
zQV_+;VbSlfQf*b&hrfqTmQ;pau2^yTRzC@wjFU`}td^9JG?z?NZBmm+aZ71Q8A%ya
zZ7y@R;C}?P7_k_8WTTjn{OP5cqikt}dU|2eOpZc3Jgct&R%oAFigC(3SK7AQIu>Gi
zLZ{rS+?1}1J_E%-ZHrB2)8Qs*g=twe$Qnz(7tdaS-r7az+^Wq@4^OYb-N9uJ+8@e~
zDQG{MX_0xV>7@PROW||yAxm&cSSl(O71eUq^i5~KnO!BTj3wYY>I_ybP^)UrD0z>?
z-Z$vJt6s19{A#B6t>t6<un0^<s#u?xt^AC<slt@}0qha%HVnCJvSg+HZ9|HywY^Vs
zh|7?DX<K&R=%d0sg#oXc8J|-r)+K#nRp+W$3qlLhtKd~7ZdfQIlqt0MhURs+D#)j6
z=hXOMMcZ8D5VzbFxd$DnoPktq+mSZGwoHBj@z3I&3VW#Smj)}Os4)-+NTe;pJ-yTX
zUBZyX)XK}VJyBy`4djNtH?ZEdiq&H~&g_UmMl{Fg#EnU^_-+15EWQ|XvA8^T5kKoP
zn*-N?hry%ZyQ{sb3w)qUxHZl-ua&;9J)g%`dREcElfe7D<9t~_1K<U2IKMLQu5F&c
z`dW_Ks=x!#*S0cNonoB2-w|HHn!IWP)}kvOdm!?v_rcTN73K_I1|6t?*VjWdR2fD;
zfBhU85hZp;jBe0^Y}D^Up4GpipQwK(5hIT+9X5!xhy-QB#18Bgy&~g9&0BokcP4ab
z`Xk@aCy0vG&C=<&)JG$Et*oLOwzb$xNB8eNux~(kJ#2Sf-iT4ryzLYE2(TxvDs(k=
ztm)WT)SUGa;d=})G3a4XyIx|0b(lS>2qlUd;za8_`r!G{_DjHUUi^*t%p)p!?Rozq
z29+(9b?D0C!b^@>tH9)#(0bKOMMUKbV%I10-5J{LF-C_yu#Qzp*MAs&GmMnEC3_9a
zU+VI(-w8=bdtvf&=ji-!%CKAOzLu{otG;TEYIIMhYOfz5-)q%Axe65qcNbZ`dvcC$
zU0XT$t$He&3?du$er`2rjUwzFa0~D6G`VY1Qf=p4Iy>5=`$X4dkg3pSDMV@{iIQge
z97_vb-X%)gw1305ehmMJmVF;PHGuWGxZL-0A!vqqZ{gl5{eu?|{e9m=<yTBH9&6M4
zs_27t;mFG`8DGk)E>2fpz*%0h+d+(Wh%QskeaJjr?1Jpdnar9Dkc>_lWlmlxpGke&
z{H~{Ffb7@75yjQW4c{*!_0;eAqOohC4!IHce(-)hYbs;1vc}2J)=zK7a4v?03`X8-
zu8a2UI@Q^8BKJi6@w%wkrUyfpnkj1^z9FvcE|@S@$$YW|Jb6%k?ql=Pf!R9(n!VoP
zKKT=JYiSFQUs;4(q<6pX4ttz+oOs3P%D{wwN9w+|eF|E)*00V-E+nUvzHmCjifI$Q
zeM>!!?)yczDR?d-OgvQMA`M<yHvBrZsHCXBH6XFrX6^|!?;UgXyLn=PQ<1v$DW6my
z=1j<1RQLX>J2!2oeTfr~X35M6_tLeSLxtC?xA}~%Sg%6+7b<;5uCJ%=<%-z8@(EIX
zW!>gIY{I91t(`k>hmF?D%O}^I*X*Z<GUWKsNAKio6|QwH^*H7+=cn)X*s)6ga*7VA
zKtR_MmW$E#+gN$5V+LgglgL6OD{?uq@A8BB#?P&hi5)}1HAj9tUQB2&Nb{wyGM(@(
z4WC`xr;@c!_vcotuXHbv#~j9oJLtsO?40oaf@-aWfVK2h`}yXWiD~o_Iw37ei++{&
z`xge7>^M5G81!{jSp)0Key8MhH^h1X0Q|c*E)GD-?L7bh@DR}qL&Kak(y*tHAvgyL
zo&aHx-PzgfH&KQLdq^hGa3BVm<mRElfJtv=Xt2i{FjN|}nL=}gNn_3$gAf!d0i*^|
zg(ynH`9L6$Ce^`F<Gh~1FFN}UChbh4xobe7bUGbESAkHdPEaLvb#<tsGE`Yvft{h?
z;q6AlF%;Z94*i_u-}C4ZJnX4NcN&r62HKbxho^YbVA9eXLVtgL)=48e{-fmP@yiz5
zAao-FRe~r&|3o7&i2s4M5&4fa2m8NWxqDJco1Pr(p#&0vOmL%luz5;<lw<eyZ{q(e
zl7VyoDYn_fpWZY#D%Utq@Su=9H(FrsMx?=&G&c?X4*%1UpDYB0>`o<kc(7@3wO^F2
z*zft6e`Me%lz$Png1-~cR3h6cZlkWhYubwao{#;Lz*cYzVWagL#zY2zgwZ3i8@lO2
zSw&S7`p3xcOaz5Qp_;nm><Jr{ZBn*Czh`giVE@rMuDDfZOJEDp!Cu3|6YoN>r)^m-
z_M&ZWeqEdsbPKEr{bRN!dn;(1r8p2Bz4dT30$f>9NmWDfgocVDNa^IpK%Kn`zvXPH
zU?YN{5^yvM)r>+R!8cuyH*P^HkYCKL@n2L;=*BVHa;$!y*-eyvXyJTp&3``t;C#7X
zB`pB}4o8%pjv0ev<~4^X03;Cfinz}H)7hW&!ND*4A_pm;yz0%IV7d6x0$?r83RFEj
mHBsJt5$!Mazu|w?hXXJMm&g2gOu)ut7^QzsuSnM}@c#fdyG-E#

literal 0
HcmV?d00001

diff --git a/image/test/reftest/downscaling/downscale-2a.html b/image/test/reftest/downscaling/downscale-2a.html
new file mode 100644
index 000000000000..fac11ccee53a
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2a.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="1.0" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-2b.html b/image/test/reftest/downscaling/downscale-2b.html
new file mode 100644
index 000000000000..af7ecbff3302
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2b.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.9" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-2c.html b/image/test/reftest/downscaling/downscale-2c.html
new file mode 100644
index 000000000000..18f70456b1d4
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2c.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.8" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-2d.html b/image/test/reftest/downscaling/downscale-2d.html
new file mode 100644
index 000000000000..8d9547b73eb6
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2d.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.67" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-2e.html b/image/test/reftest/downscaling/downscale-2e.html
new file mode 100644
index 000000000000..c3d0d771f3a5
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2e.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.5" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-2f.html b/image/test/reftest/downscaling/downscale-2f.html
new file mode 100644
index 000000000000..42cfad1f5752
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-2f.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.3" class="reftest-wait">
+<head>
+  <script>
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<!-- NOTE: Using setTimeout to wait for high-quality downscaled version of
+     image to be ready, because there's nothing better we can do. If we fix
+     Bug 1006883, we can do away with this setTimeout.
+
+     For now, the setTimeout is just here to increase the likelihood that we
+     actually test the high-quality downscaled version of the image. If the
+     setTimeout happens to fire before the high-quality downscaled rendering is
+     ready, then this the test will pass without testing what it's trying to
+     test, which is fine as long as that's rare.  -->
+<body style="margin: 0px" onload="setTimeout(snapshot, 50)">
+  <script>
+    var args = location.search.substring(1).split(',');
+    var image = document.createElement('img');
+    image.width = args[0];
+    image.height = args[1];
+    image.src = 'black-border-' + args[2] + '.png';
+    document.body.appendChild(image);
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/reftest.list b/image/test/reftest/downscaling/reftest.list
index 53f5988b0a21..340782ee5bf3 100644
--- a/image/test/reftest/downscaling/reftest.list
+++ b/image/test/reftest/downscaling/reftest.list
@@ -4,6 +4,14 @@
 # as long as it's barely noticable visually. When necessary, this can be
 # explicitly allowed via 'fuzzy'/'fuzzy-if' annotations.
 #
+# Many of these tests check primarily that we don't lose rows or columns of
+# pixels when downscaling by making sure that the result isn't too similar to
+# about:blank. A small amount of fuzziness is used to ensure that the tests
+# don't pass because of very slight deviations; passing tests should be
+# substantially different from about:blank. This fuzziness should *not* be
+# removed as doing so would make the tests pass in situations where they
+# shouldn't.
+#
 # IMPORTANT: For robustness, each test should be listed *twice* in this
 # manifest -- once with the high quality downscaling pref disabled, and once
 # with this pref enabled. The pref is set via "default-preferences", so
@@ -19,6 +27,61 @@ default-preferences pref(image.high_quality_downscaling.enabled,false)
 
 fuzzy-if(cocoaWidget,106,31) == downscale-1.html downscale-1-ref.html
 
+fuzzy(5,999) random != downscale-2a.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,left about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,left about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,right about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,right about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,top about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,top about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,bottom about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,bottom about:blank
 
 # RUN TESTS WITH HIGH QUALITY DOWNSCALING ENABLED:
 # ================================================
@@ -26,3 +89,59 @@ fuzzy-if(cocoaWidget,106,31) == downscale-1.html downscale-1-ref.html
 default-preferences pref(image.high_quality_downscaling.enabled,true)
 
 fuzzy(31,127) == downscale-1.html downscale-1-ref.html
+
+fuzzy(5,999) random != downscale-2a.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,left about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,left about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,left about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,left about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,right about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,right about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,right about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,right about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,top about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,top about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,top about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,top about:blank
+
+fuzzy(5,999) random != downscale-2a.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2b.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2c.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2d.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2e.html?203,52,bottom about:blank
+fuzzy(5,999) random != downscale-2f.html?203,52,bottom about:blank
+
+fuzzy(5,999) random != downscale-2a.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2b.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2c.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2d.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2e.html?205,53,bottom about:blank
+fuzzy(5,999) random != downscale-2f.html?205,53,bottom about:blank

From ae2acbe31f5e3f107b77d76254d3243bb16f544c Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Tue, 12 Aug 2014 14:05:29 -0700
Subject: [PATCH 15/89] Bug 942364 - Add reftests. r=dholbert

---
 .../test/reftest/downscaling/black-border-rect.svg  |  3 +++
 .../reftest/downscaling/downscale-svg-1-ref.html    | 13 +++++++++++++
 .../test/reftest/downscaling/downscale-svg-1a.html  |  8 ++++++++
 .../test/reftest/downscaling/downscale-svg-1b.html  |  8 ++++++++
 .../test/reftest/downscaling/downscale-svg-1c.html  |  8 ++++++++
 .../test/reftest/downscaling/downscale-svg-1d.html  |  8 ++++++++
 .../test/reftest/downscaling/downscale-svg-1e.html  |  8 ++++++++
 .../test/reftest/downscaling/downscale-svg-1f.html  |  8 ++++++++
 image/test/reftest/downscaling/reftest.list         | 10 ++++++++++
 9 files changed, 74 insertions(+)
 create mode 100644 image/test/reftest/downscaling/black-border-rect.svg
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1-ref.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1a.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1b.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1c.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1d.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1e.html
 create mode 100644 image/test/reftest/downscaling/downscale-svg-1f.html

diff --git a/image/test/reftest/downscaling/black-border-rect.svg b/image/test/reftest/downscaling/black-border-rect.svg
new file mode 100644
index 000000000000..0fa01a0a6394
--- /dev/null
+++ b/image/test/reftest/downscaling/black-border-rect.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -0.5 53 43" stroke="#000000">
+  <rect x="0" y="7" width="52" height="35" fill="#ffffff"/>
+</svg>
diff --git a/image/test/reftest/downscaling/downscale-svg-1-ref.html b/image/test/reftest/downscaling/downscale-svg-1-ref.html
new file mode 100644
index 000000000000..8935619ebd28
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+<body style="margin: 0px">
+  <embed src="black-border-rect.svg" style="display: block">
+  <script>
+    var width = location.search.substring(1).split("&");
+    var embedElem = document.getElementsByTagName('embed')[0];
+    embedElem.style.width = width + 'px';
+  </script>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1a.html b/image/test/reftest/downscaling/downscale-svg-1a.html
new file mode 100644
index 000000000000..2263cc998240
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1a.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="1.0">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1b.html b/image/test/reftest/downscaling/downscale-svg-1b.html
new file mode 100644
index 000000000000..9db239c7cd7a
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1b.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.9">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1c.html b/image/test/reftest/downscaling/downscale-svg-1c.html
new file mode 100644
index 000000000000..f8babf02672b
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1c.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.8">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1d.html b/image/test/reftest/downscaling/downscale-svg-1d.html
new file mode 100644
index 000000000000..9a56a51de0ba
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1d.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.67">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1e.html b/image/test/reftest/downscaling/downscale-svg-1e.html
new file mode 100644
index 000000000000..732ac22c964d
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1e.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.5">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/downscale-svg-1f.html b/image/test/reftest/downscaling/downscale-svg-1f.html
new file mode 100644
index 000000000000..0124682c70ca
--- /dev/null
+++ b/image/test/reftest/downscaling/downscale-svg-1f.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.3">
+<body style="margin: 0px">
+  <div style="width: 80px; height: 80px; background: url(black-border-rect.svg) no-repeat"></div>
+</body>
+</html>
diff --git a/image/test/reftest/downscaling/reftest.list b/image/test/reftest/downscaling/reftest.list
index 340782ee5bf3..c087dd520c72 100644
--- a/image/test/reftest/downscaling/reftest.list
+++ b/image/test/reftest/downscaling/reftest.list
@@ -21,6 +21,16 @@
 # Also note that Mac OS X has its own system-level downscaling algorithm, so
 # tests here may need Mac-specific "fuzzy-if(cocoaWidget,...)" annotations.
 
+
+# RUN TESTS NOT AFFECTED BY HIGH QUALITY DOWNSCALING:
+# ===================================================
+fails == downscale-svg-1a.html downscale-svg-1-ref.html?80
+fails == downscale-svg-1b.html downscale-svg-1-ref.html?72
+fails == downscale-svg-1c.html downscale-svg-1-ref.html?64
+fails == downscale-svg-1d.html downscale-svg-1-ref.html?53
+fails == downscale-svg-1e.html downscale-svg-1-ref.html?40
+fails == downscale-svg-1f.html downscale-svg-1-ref.html?24
+
 # RUN TESTS WITH HIGH QUALITY DOWNSCALING DISABLED:
 # =================================================
 default-preferences pref(image.high_quality_downscaling.enabled,false)

From 8f78184d9ade6d0db75897389c6ae89f71fcc7dc Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Wed, 16 Jul 2014 14:41:57 -0400
Subject: [PATCH 16/89] bug 1016545 - Provide an iterator that iterates over
 all children of an element r=bz

---
 accessible/base/TreeWalker.cpp              | 40 +++--------
 content/base/src/ChildIterator.cpp          | 74 +++++++++++++++++++--
 content/base/src/ChildIterator.h            | 63 +++++++++++++++++-
 content/base/src/FragmentOrElement.cpp      | 45 +------------
 content/base/src/moz.build                  |  1 +
 layout/forms/nsColorControlFrame.cpp        |  6 +-
 layout/forms/nsColorControlFrame.h          |  2 +-
 layout/forms/nsComboboxControlFrame.cpp     | 11 ++-
 layout/forms/nsComboboxControlFrame.h       |  2 +-
 layout/forms/nsFileControlFrame.cpp         | 11 ++-
 layout/forms/nsFileControlFrame.h           |  2 +-
 layout/forms/nsGfxButtonControlFrame.cpp    |  6 +-
 layout/forms/nsGfxButtonControlFrame.h      |  2 +-
 layout/forms/nsMeterFrame.cpp               |  6 +-
 layout/forms/nsMeterFrame.h                 |  2 +-
 layout/forms/nsNumberControlFrame.cpp       |  6 +-
 layout/forms/nsNumberControlFrame.h         |  2 +-
 layout/forms/nsProgressFrame.cpp            |  6 +-
 layout/forms/nsProgressFrame.h              |  2 +-
 layout/forms/nsRangeFrame.cpp               | 16 +++--
 layout/forms/nsRangeFrame.h                 |  2 +-
 layout/forms/nsTextControlFrame.cpp         | 13 ++--
 layout/forms/nsTextControlFrame.h           |  2 +-
 layout/generic/nsCanvasFrame.cpp            | 16 +++--
 layout/generic/nsCanvasFrame.h              |  2 +-
 layout/generic/nsGfxScrollFrame.cpp         | 25 +++++--
 layout/generic/nsGfxScrollFrame.h           |  6 +-
 layout/generic/nsIAnonymousContentCreator.h |  2 +-
 layout/generic/nsVideoFrame.cpp             | 16 +++--
 layout/generic/nsVideoFrame.h               |  2 +-
 layout/svg/nsSVGUseFrame.cpp                |  8 ++-
 layout/xul/nsDocElementBoxFrame.cpp         | 13 ++--
 32 files changed, 273 insertions(+), 139 deletions(-)

diff --git a/accessible/base/TreeWalker.cpp b/accessible/base/TreeWalker.cpp
index 3e778a0cc81c..8e97e38c7a60 100644
--- a/accessible/base/TreeWalker.cpp
+++ b/accessible/base/TreeWalker.cpp
@@ -9,6 +9,7 @@
 #include "nsAccessibilityService.h"
 #include "DocAccessible.h"
 
+#include "mozilla/dom/ChildIterator.h"
 #include "mozilla/dom/Element.h"
 
 using namespace mozilla::a11y;
@@ -22,13 +23,12 @@ namespace a11y {
 
 struct WalkState
 {
-  WalkState(nsIContent *aContent) :
-    content(aContent), childIdx(0), prevState(nullptr) {}
+  WalkState(nsIContent *aContent, uint32_t aFilter) :
+    content(aContent), prevState(nullptr), iter(aContent, aFilter) {}
 
   nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsINodeList> childList;
-  uint32_t childIdx;
   WalkState *prevState;
+  dom::AllChildrenIterator iter;
 };
 
 } // namespace a11y
@@ -45,14 +45,13 @@ TreeWalker::
 {
   NS_ASSERTION(aContent, "No node for the accessible tree walker!");
 
-  if (aContent)
-    mState = new WalkState(aContent);
-
   mChildFilter = mContext->CanHaveAnonChildren() ?
     nsIContent::eAllChildren : nsIContent::eAllButXBL;
-
   mChildFilter |= nsIContent::eSkipPlaceholderContent;
 
+  if (aContent)
+    mState = new WalkState(aContent, mChildFilter);
+
   MOZ_COUNT_CTOR(TreeWalker);
 }
 
@@ -74,17 +73,7 @@ TreeWalker::NextChildInternal(bool aNoWalkUp)
   if (!mState || !mState->content)
     return nullptr;
 
-  if (!mState->childList)
-    mState->childList = mState->content->GetChildren(mChildFilter);
-
-  uint32_t length = 0;
-  if (mState->childList)
-    mState->childList->GetLength(&length);
-
-  while (mState->childIdx < length) {
-    nsIContent* childNode = mState->childList->Item(mState->childIdx);
-    mState->childIdx++;
-
+  while (nsIContent* childNode = mState->iter.GetNextChild()) {
     bool isSubtreeHidden = false;
     Accessible* accessible = mFlags & eWalkCache ?
       mDoc->GetAccessible(childNode) :
@@ -95,7 +84,7 @@ TreeWalker::NextChildInternal(bool aNoWalkUp)
       return accessible;
 
     // Walk down into subtree to find accessibles.
-    if (!isSubtreeHidden) {
+    if (!isSubtreeHidden && childNode->IsElement()) {
       PushState(childNode);
       accessible = NextChildInternal(true);
       if (accessible)
@@ -123,14 +112,7 @@ TreeWalker::NextChildInternal(bool aNoWalkUp)
       return nullptr;
 
     PushState(parentNode->AsElement());
-    mState->childList = mState->content->GetChildren(mChildFilter);
-    length = 0;
-    if (mState->childList)
-      mState->childList->GetLength(&length);
-
-    while (mState->childIdx < length) {
-      nsIContent* childNode = mState->childList->Item(mState->childIdx);
-      mState->childIdx++;
+    while (nsIContent* childNode = mState->iter.GetNextChild()) {
       if (childNode == anchorNode)
         return NextChildInternal(false);
     }
@@ -153,7 +135,7 @@ TreeWalker::PopState()
 void
 TreeWalker::PushState(nsIContent* aContent)
 {
-  WalkState* nextToLastState = new WalkState(aContent);
+  WalkState* nextToLastState = new WalkState(aContent, mChildFilter);
   nextToLastState->prevState = mState;
   mState = nextToLastState;
 }
diff --git a/content/base/src/ChildIterator.cpp b/content/base/src/ChildIterator.cpp
index 91c47e01829f..060d5d087f01 100644
--- a/content/base/src/ChildIterator.cpp
+++ b/content/base/src/ChildIterator.cpp
@@ -10,6 +10,8 @@
 #include "mozilla/dom/HTMLContentElement.h"
 #include "mozilla/dom/HTMLShadowElement.h"
 #include "mozilla/dom/ShadowRoot.h"
+#include "nsIAnonymousContentCreator.h"
+#include "nsIFrame.h"
 
 namespace mozilla {
 namespace dom {
@@ -154,11 +156,15 @@ ExplicitChildIterator::GetNextChild()
   return mChild;
 }
 
-FlattenedChildIterator::FlattenedChildIterator(nsIContent* aParent)
-  : ExplicitChildIterator(aParent), mXBLInvolved(false)
+void
+FlattenedChildIterator::Init(bool aIgnoreXBL)
 {
+  if (aIgnoreXBL) {
+    return;
+  }
+
   nsXBLBinding* binding =
-    aParent->OwnerDoc()->BindingManager()->GetBindingWithContent(aParent);
+    mParent->OwnerDoc()->BindingManager()->GetBindingWithContent(mParent);
 
   if (binding) {
     nsIContent* anon = binding->GetAnonymousContent();
@@ -171,8 +177,8 @@ FlattenedChildIterator::FlattenedChildIterator(nsIContent* aParent)
   // We set mXBLInvolved to true if either:
   // - The node we're iterating has a binding with content attached to it.
   // - The node is generated XBL content and has an <xbl:children> child.
-  if (!mXBLInvolved && aParent->GetBindingParent()) {
-    for (nsIContent* child = aParent->GetFirstChild();
+  if (!mXBLInvolved && mParent->GetBindingParent()) {
+    for (nsIContent* child = mParent->GetFirstChild();
          child;
          child = child->GetNextSibling()) {
       if (child->NodeInfo()->Equals(nsGkAtoms::children, kNameSpaceID_XBL)) {
@@ -281,5 +287,63 @@ ExplicitChildIterator::GetPreviousChild()
   return mChild;
 }
 
+nsIContent*
+AllChildrenIterator::GetNextChild()
+{
+  if (mPhase == eNeedBeforeKid) {
+    mPhase = eNeedExplicitKids;
+    nsIFrame* frame = mOriginalContent->GetPrimaryFrame();
+    if (frame) {
+      nsIFrame* beforeFrame = nsLayoutUtils::GetBeforeFrame(frame);
+      if (beforeFrame) {
+        return beforeFrame->GetContent();
+      }
+    }
+  }
+
+  if (mPhase == eNeedExplicitKids) {
+    nsIContent* kid = ExplicitChildIterator::GetNextChild();
+    if (kid) {
+      return kid;
+    }
+
+    mPhase = eNeedAnonKids;
+  }
+
+  if (mPhase == eNeedAnonKids) {
+    if (mAnonKids.IsEmpty()) {
+      nsIAnonymousContentCreator* ac =
+        do_QueryFrame(mOriginalContent->GetPrimaryFrame());
+      if (ac) {
+        ac->AppendAnonymousContentTo(mAnonKids, mFlags);
+      }
+    }
+
+    if (!mAnonKids.IsEmpty()) {
+      nsIContent* nextKid = mAnonKids[0];
+      mAnonKids.RemoveElementAt(0);
+      if (mAnonKids.IsEmpty()) {
+        mPhase = eNeedAfterKid;
+      }
+
+      return nextKid;
+    }
+
+    mPhase = eNeedAfterKid;
+  }
+
+  if (mPhase == eNeedAfterKid) {
+    mPhase = eDone;
+    nsIFrame* frame = mOriginalContent->GetPrimaryFrame();
+    if (frame) {
+      nsIFrame* afterFrame = nsLayoutUtils::GetAfterFrame(frame);
+      if (afterFrame) {
+        return afterFrame->GetContent();
+      }
+    }
+  }
+
+  return nullptr;
+}
 } // namespace dom
 } // namespace mozilla
diff --git a/content/base/src/ChildIterator.h b/content/base/src/ChildIterator.h
index eb80c9eaa0ef..09a2dc3e6229 100644
--- a/content/base/src/ChildIterator.h
+++ b/content/base/src/ChildIterator.h
@@ -7,6 +7,8 @@
 #ifndef ChildIterator_h
 #define ChildIterator_h
 
+#include "nsIContent.h"
+
 /**
  * Iterates over the children on a node. If a child is an insertion point,
  * iterates over the children inserted there instead, or the default content
@@ -107,16 +109,73 @@ protected:
 class FlattenedChildIterator : public ExplicitChildIterator
 {
 public:
-  FlattenedChildIterator(nsIContent* aParent);
+  FlattenedChildIterator(nsIContent* aParent)
+    : ExplicitChildIterator(aParent), mXBLInvolved(false)
+  {
+    Init(false);
+  }
 
   bool XBLInvolved() { return mXBLInvolved; }
 
-private:
+protected:
+  /**
+   * This constructor is a hack to help AllChildrenIterator which sometimes
+   * doesn't want to consider XBL.
+   */
+  FlattenedChildIterator(nsIContent* aParent, bool aIgnoreXBL)
+  : ExplicitChildIterator(aParent), mXBLInvolved(false)
+  {
+    Init(aIgnoreXBL);
+  }
+
+  void Init(bool aIgnoreXBL);
+
   // For certain optimizations, nsCSSFrameConstructor needs to know if the
   // child list of the element that we're iterating matches its .childNodes.
   bool mXBLInvolved;
 };
 
+/**
+ * AllChildrenIterator returns the children of a element including before /
+ * after content and optionally XBL children.  It assumes that no mutation of
+ * the DOM or frame tree takes place during iteration, and will break horribly
+ * if that is not true.
+ */
+class AllChildrenIterator : private FlattenedChildIterator
+{
+public:
+  AllChildrenIterator(nsIContent* aNode, uint32_t aFlags) :
+    FlattenedChildIterator(aNode, (aFlags & nsIContent::eAllButXBL)),
+    mOriginalContent(aNode), mFlags(aFlags),
+    mPhase(eNeedBeforeKid) {}
+
+#ifdef DEBUG
+  ~AllChildrenIterator() { MOZ_ASSERT(!mMutationGuard.Mutated(0)); }
+#endif
+
+  nsIContent* GetNextChild();
+
+private:
+  enum IteratorPhase
+  {
+    eNeedBeforeKid,
+    eNeedExplicitKids,
+    eNeedAnonKids,
+    eNeedAfterKid,
+    eDone
+  };
+
+  nsIContent* mOriginalContent;
+  nsTArray<nsIContent*> mAnonKids;
+  uint32_t mFlags;
+  IteratorPhase mPhase;
+#ifdef DEBUG
+  // XXX we should really assert there are no frame tree changes as well, but
+  // there's no easy way to do that.
+  nsMutationGuard mMutationGuard;
+#endif
+};
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp
index fb7f56dc2294..9176522dc9d2 100644
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -661,48 +661,9 @@ already_AddRefed<nsINodeList>
 FragmentOrElement::GetChildren(uint32_t aFilter)
 {
   nsRefPtr<nsSimpleContentList> list = new nsSimpleContentList(this);
-  if (!list) {
-    return nullptr;
-  }
-
-  nsIFrame *frame = GetPrimaryFrame();
-
-  // Append :before generated content.
-  if (frame) {
-    nsIFrame *beforeFrame = nsLayoutUtils::GetBeforeFrame(frame);
-    if (beforeFrame) {
-      list->AppendElement(beforeFrame->GetContent());
-    }
-  }
-
-  // If XBL is bound to this node then append XBL anonymous content including
-  // explict content altered by insertion point if we were requested for XBL
-  // anonymous content, otherwise append explicit content with respect to
-  // insertion point if any.
-  if (!(aFilter & eAllButXBL)) {
-    FlattenedChildIterator iter(this);
-    for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
-      list->AppendElement(child);
-    }
-  } else {
-    ExplicitChildIterator iter(this);
-    for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
-      list->AppendElement(child);
-    }
-  }
-
-  if (frame) {
-    // Append native anonymous content to the end.
-    nsIAnonymousContentCreator* creator = do_QueryFrame(frame);
-    if (creator) {
-      creator->AppendAnonymousContentTo(*list, aFilter);
-    }
-
-    // Append :after generated content.
-    nsIFrame *afterFrame = nsLayoutUtils::GetAfterFrame(frame);
-    if (afterFrame) {
-      list->AppendElement(afterFrame->GetContent());
-    }
+  AllChildrenIterator iter(this, aFilter);
+  while (nsIContent* kid = iter.GetNextChild()) {
+    list->AppendElement(kid);
   }
 
   return list.forget();
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 8ae00098f64c..a660ba44cbc5 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -61,6 +61,7 @@ EXPORTS.mozilla += [
 
 EXPORTS.mozilla.dom += [
     'Attr.h',
+    'ChildIterator.h',
     'Comment.h',
     'DocumentFragment.h',
     'DocumentType.h',
diff --git a/layout/forms/nsColorControlFrame.cpp b/layout/forms/nsColorControlFrame.cpp
index 466b8a364c6a..e5daf2243634 100644
--- a/layout/forms/nsColorControlFrame.cpp
+++ b/layout/forms/nsColorControlFrame.cpp
@@ -83,10 +83,12 @@ nsColorControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsColorControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsColorControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                               uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mColorContent);
+  if (mColorContent) {
+    aElements.AppendElement(mColorContent);
+  }
 }
 
 nsresult
diff --git a/layout/forms/nsColorControlFrame.h b/layout/forms/nsColorControlFrame.h
index 9aa3865e35a9..177920dbc476 100644
--- a/layout/forms/nsColorControlFrame.h
+++ b/layout/forms/nsColorControlFrame.h
@@ -37,7 +37,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   // nsIFrame
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 9711bc5276e2..c08e9e7f340f 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1184,11 +1184,16 @@ nsComboboxControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsComboboxControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsComboboxControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                                  uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mDisplayContent);
-  aElements.MaybeAppendElement(mButtonContent);
+  if (mDisplayContent) {
+    aElements.AppendElement(mDisplayContent);
+  }
+
+  if (mButtonContent) {
+    aElements.AppendElement(mButtonContent);
+  }
 }
 
 // XXXbz this is a for-now hack.  Now that display:inline-block works,
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index dd0654917f27..9c8c6d8beaeb 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -59,7 +59,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
   virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
 
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index ab65d8a9ccdf..90930897a792 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -150,11 +150,16 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsFileControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsFileControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                              uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mBrowse);
-  aElements.MaybeAppendElement(mTextContent);
+  if (mBrowse) {
+    aElements.AppendElement(mBrowse);
+  }
+
+  if (mTextContent) {
+    aElements.AppendElement(mTextContent);
+  }
 }
 
 NS_QUERYFRAME_HEAD(nsFileControlFrame)
diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h
index 62b971f53730..780fdb7e366e 100644
--- a/layout/forms/nsFileControlFrame.h
+++ b/layout/forms/nsFileControlFrame.h
@@ -57,7 +57,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
 #ifdef ACCESSIBILITY
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index b075f71998a4..34050ff589d9 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -69,10 +69,12 @@ nsGfxButtonControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements
 }
 
 void
-nsGfxButtonControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsGfxButtonControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                                   uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mTextContent);
+  if (mTextContent) {
+    aElements.AppendElement(mTextContent);
+  }
 }
 
 // Create the text content used as label for the button.
diff --git a/layout/forms/nsGfxButtonControlFrame.h b/layout/forms/nsGfxButtonControlFrame.h
index 1339ca96505f..03aa4861ca51 100644
--- a/layout/forms/nsGfxButtonControlFrame.h
+++ b/layout/forms/nsGfxButtonControlFrame.h
@@ -40,7 +40,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
   virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
 
diff --git a/layout/forms/nsMeterFrame.cpp b/layout/forms/nsMeterFrame.cpp
index f5bacd62fdf4..d479c5a0a436 100644
--- a/layout/forms/nsMeterFrame.cpp
+++ b/layout/forms/nsMeterFrame.cpp
@@ -79,10 +79,12 @@ nsMeterFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsMeterFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsMeterFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                        uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mBarDiv);
+  if (mBarDiv) {
+    aElements.AppendElement(mBarDiv);
+  }
 }
 
 NS_QUERYFRAME_HEAD(nsMeterFrame)
diff --git a/layout/forms/nsMeterFrame.h b/layout/forms/nsMeterFrame.h
index 142ebf4dbb19..cb2d746c9924 100644
--- a/layout/forms/nsMeterFrame.h
+++ b/layout/forms/nsMeterFrame.h
@@ -42,7 +42,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual nsresult AttributeChanged(int32_t  aNameSpaceID,
diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp
index 5f988d7e5b07..20ed683466b1 100644
--- a/layout/forms/nsNumberControlFrame.cpp
+++ b/layout/forms/nsNumberControlFrame.cpp
@@ -676,11 +676,13 @@ nsNumberControlFrame::ShouldUseNativeStyleForSpinner() const
 }
 
 void
-nsNumberControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsNumberControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                                uint32_t aFilter)
 {
   // Only one direct anonymous child:
-  aElements.MaybeAppendElement(mOuterWrapper);
+  if (mOuterWrapper) {
+    aElements.AppendElement(mOuterWrapper);
+  }
 }
 
 void
diff --git a/layout/forms/nsNumberControlFrame.h b/layout/forms/nsNumberControlFrame.h
index 30b7fcb9f806..b5eb3e92920f 100644
--- a/layout/forms/nsNumberControlFrame.h
+++ b/layout/forms/nsNumberControlFrame.h
@@ -68,7 +68,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
 #ifdef DEBUG_FRAME_DUMP
diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index b69dac6c1066..f1f9caa74f29 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -76,10 +76,12 @@ nsProgressFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsProgressFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsProgressFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                           uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mBarDiv);
+  if (mBarDiv) {
+    aElements.AppendElement(mBarDiv);
+  }
 }
 
 NS_QUERYFRAME_HEAD(nsProgressFrame)
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
index b99c27721e32..67b4990465d4 100644
--- a/layout/forms/nsProgressFrame.h
+++ b/layout/forms/nsProgressFrame.h
@@ -47,7 +47,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual nsresult AttributeChanged(int32_t  aNameSpaceID,
diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp
index 4c87fe547f9d..ea257e59bdf5 100644
--- a/layout/forms/nsRangeFrame.cpp
+++ b/layout/forms/nsRangeFrame.cpp
@@ -154,12 +154,20 @@ nsRangeFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsRangeFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsRangeFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                        uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mTrackDiv);
-  aElements.MaybeAppendElement(mProgressDiv);
-  aElements.MaybeAppendElement(mThumbDiv);
+  if (mTrackDiv) {
+    aElements.AppendElement(mTrackDiv);
+  }
+
+  if (mProgressDiv) {
+    aElements.AppendElement(mProgressDiv);
+  }
+
+  if (mThumbDiv) {
+    aElements.AppendElement(mThumbDiv);
+  }
 }
 
 class nsDisplayRangeFocusRing : public nsDisplayItem
diff --git a/layout/forms/nsRangeFrame.h b/layout/forms/nsRangeFrame.h
index 6fc3c54700e3..b84020f8c550 100644
--- a/layout/forms/nsRangeFrame.h
+++ b/layout/forms/nsRangeFrame.h
@@ -64,7 +64,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual nsresult AttributeChanged(int32_t  aNameSpaceID,
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index ca9502dfcd66..4b3dc363af44 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -394,15 +394,20 @@ nsTextControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsTextControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsTextControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                              uint32_t aFilter)
 {
   nsCOMPtr<nsITextControlElement> txtCtrl = do_QueryInterface(GetContent());
   NS_ASSERTION(txtCtrl, "Content not a text control element");
 
-  aElements.MaybeAppendElement(txtCtrl->GetRootEditorNode());
-  if (!(aFilter & nsIContent::eSkipPlaceholderContent))
-    aElements.MaybeAppendElement(txtCtrl->GetPlaceholderNode());
+  nsIContent* root = txtCtrl->GetRootEditorNode();
+  if (root) {
+    aElements.AppendElement(root);
+  }
+
+  nsIContent* placeholder = txtCtrl->GetPlaceholderNode();
+  if (placeholder && !(aFilter & nsIContent::eSkipPlaceholderContent))
+    aElements.AppendElement(placeholder);
   
 }
 
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index f4fc4d7602d7..d73b0f4e440b 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -82,7 +82,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual void SetInitialChildList(ChildListID     aListID,
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index 80a1edb88cca..5547312d60ac 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -114,11 +114,19 @@ nsCanvasFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsCanvasFrame::AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter)
+nsCanvasFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements, uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mTouchCaretElement);
-  aElements.MaybeAppendElement(mSelectionCaretsStartElement);
-  aElements.MaybeAppendElement(mSelectionCaretsEndElement);
+  if (mTouchCaretElement) {
+    aElements.AppendElement(mTouchCaretElement);
+  }
+
+  if (mSelectionCaretsStartElement) {
+    aElements.AppendElement(mSelectionCaretsStartElement);
+  }
+
+  if (mSelectionCaretsEndElement) {
+    aElements.AppendElement(mSelectionCaretsEndElement);
+  }
 }
 
 void
diff --git a/layout/generic/nsCanvasFrame.h b/layout/generic/nsCanvasFrame.h
index e20344fb8dea..1df0e02582b6 100644
--- a/layout/generic/nsCanvasFrame.h
+++ b/layout/generic/nsCanvasFrame.h
@@ -68,7 +68,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter) MOZ_OVERRIDE;
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements, uint32_t aFilter) MOZ_OVERRIDE;
 
   // Touch caret handle function
   mozilla::dom::Element* GetTouchCaretElement() const
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 153da2929d48..dafe5ebe9b8a 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -104,7 +104,7 @@ nsHTMLScrollFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsHTMLScrollFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsHTMLScrollFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                             uint32_t aFilter)
 {
   mHelper.AppendAnonymousContentTo(aElements, aFilter);
@@ -1048,7 +1048,7 @@ nsXULScrollFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsXULScrollFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsXULScrollFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                            uint32_t aFilter)
 {
   mHelper.AppendAnonymousContentTo(aElements, aFilter);
@@ -3546,13 +3546,24 @@ ScrollFrameHelper::CreateAnonymousContent(
 }
 
 void
-ScrollFrameHelper::AppendAnonymousContentTo(nsBaseContentList& aElements,
+ScrollFrameHelper::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                                 uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mHScrollbarContent);
-  aElements.MaybeAppendElement(mVScrollbarContent);
-  aElements.MaybeAppendElement(mScrollCornerContent);
-  aElements.MaybeAppendElement(mResizerContent);
+  if (mHScrollbarContent) {
+    aElements.AppendElement(mHScrollbarContent);
+  }
+
+  if (mVScrollbarContent) {
+    aElements.AppendElement(mVScrollbarContent);
+  }
+
+  if (mScrollCornerContent) {
+    aElements.AppendElement(mScrollCornerContent);
+  }
+
+  if (mResizerContent) {
+    aElements.AppendElement(mResizerContent);
+  }
 }
 
 void
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 7a7f355244da..1f0d1aaff34e 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -58,7 +58,7 @@ public:
 
   nsresult CreateAnonymousContent(
     nsTArray<nsIAnonymousContentCreator::ContentInfo>& aElements);
-  void AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter);
+  void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements, uint32_t aFilter);
   nsresult FireScrollPortEvent();
   void PostOverflowEvent();
   void Destroy();
@@ -544,7 +544,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   // nsIScrollbarOwner
@@ -833,7 +833,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
diff --git a/layout/generic/nsIAnonymousContentCreator.h b/layout/generic/nsIAnonymousContentCreator.h
index 12bb89c90e58..3343019d8186 100644
--- a/layout/generic/nsIAnonymousContentCreator.h
+++ b/layout/generic/nsIAnonymousContentCreator.h
@@ -69,7 +69,7 @@ public:
    *
    * @see nsIContent::GetChildren for set of values used for filter.
    */
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) = 0;
 
   /**
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index 60e0d92fc121..ffb77f5824ee 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -121,12 +121,20 @@ nsVideoFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsVideoFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsVideoFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                        uint32_t aFliter)
 {
-  aElements.MaybeAppendElement(mPosterImage);
-  aElements.MaybeAppendElement(mVideoControls);
-  aElements.MaybeAppendElement(mCaptionDiv);
+  if (mPosterImage) {
+    aElements.AppendElement(mPosterImage);
+  }
+
+  if (mVideoControls) {
+    aElements.AppendElement(mVideoControls);
+  }
+
+  if (mCaptionDiv) {
+    aElements.AppendElement(mCaptionDiv);
+  }
 }
 
 void
diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h
index d044ad319d4e..9047e43fedfc 100644
--- a/layout/generic/nsVideoFrame.h
+++ b/layout/generic/nsVideoFrame.h
@@ -76,7 +76,7 @@ public:
   }
   
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilters) MOZ_OVERRIDE;
 
   nsIContent* GetPosterImage() { return mPosterImage; }
diff --git a/layout/svg/nsSVGUseFrame.cpp b/layout/svg/nsSVGUseFrame.cpp
index 148f555b18bd..78c9f81c42e8 100644
--- a/layout/svg/nsSVGUseFrame.cpp
+++ b/layout/svg/nsSVGUseFrame.cpp
@@ -64,7 +64,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
 private:
@@ -243,10 +243,12 @@ nsSVGUseFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsSVGUseFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsSVGUseFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter)
 {
   SVGUseElement *use = static_cast<SVGUseElement*>(mContent);
   nsIContent* clone = use->GetAnonymousContent();
-  aElements.MaybeAppendElement(clone);
+  if (clone) {
+    aElements.AppendElement(clone);
+  }
 }
diff --git a/layout/xul/nsDocElementBoxFrame.cpp b/layout/xul/nsDocElementBoxFrame.cpp
index 9140a641c878..02a1ee0cea86 100644
--- a/layout/xul/nsDocElementBoxFrame.cpp
+++ b/layout/xul/nsDocElementBoxFrame.cpp
@@ -43,7 +43,7 @@ public:
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
-  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                         uint32_t aFilter) MOZ_OVERRIDE;
 
   virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
@@ -123,11 +123,16 @@ nsDocElementBoxFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 }
 
 void
-nsDocElementBoxFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+nsDocElementBoxFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
                                                uint32_t aFilter)
 {
-  aElements.MaybeAppendElement(mPopupgroupContent);
-  aElements.MaybeAppendElement(mTooltipContent);
+  if (mPopupgroupContent) {
+    aElements.AppendElement(mPopupgroupContent);
+  }
+
+  if (mTooltipContent) {
+    aElements.AppendElement(mTooltipContent);
+  }
 }
 
 NS_QUERYFRAME_HEAD(nsDocElementBoxFrame)

From 6f3e8d4952304da7b176bbd4e8f78b06e002ed90 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Wed, 13 Aug 2014 09:56:33 +1200
Subject: [PATCH 17/89] Bug 1050064 - Reconfigure WMFAACDecoder on stream
 change. r=padenot

---
 content/media/fmp4/wmf/WMFAudioMFTManager.cpp | 34 +++++++++++++++++--
 content/media/fmp4/wmf/WMFAudioMFTManager.h   |  6 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/content/media/fmp4/wmf/WMFAudioMFTManager.cpp b/content/media/fmp4/wmf/WMFAudioMFTManager.cpp
index 098b96dedc84..3a9dbdca196d 100644
--- a/content/media/fmp4/wmf/WMFAudioMFTManager.cpp
+++ b/content/media/fmp4/wmf/WMFAudioMFTManager.cpp
@@ -136,16 +136,44 @@ WMFAudioMFTManager::Input(mp4_demuxer::MP4Sample* aSample)
   return mDecoder->Input(data, length, aSample->composition_timestamp);
 }
 
+HRESULT
+WMFAudioMFTManager::UpdateOutputType()
+{
+  HRESULT hr;
+
+  RefPtr<IMFMediaType> type;
+  hr = mDecoder->GetOutputMediaType(type);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = type->GetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, &mAudioRate);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = type->GetUINT32(MF_MT_AUDIO_NUM_CHANNELS, &mAudioChannels);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  return S_OK;
+}
+
 HRESULT
 WMFAudioMFTManager::Output(int64_t aStreamOffset,
                            nsAutoPtr<MediaData>& aOutData)
 {
   aOutData = nullptr;
   RefPtr<IMFSample> sample;
-  HRESULT hr = mDecoder->Output(&sample);
-  if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-    return MF_E_TRANSFORM_NEED_MORE_INPUT;
+  HRESULT hr;
+  while (true) {
+    hr = mDecoder->Output(&sample);
+    if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+      return hr;
+    }
+    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
+      hr = UpdateOutputType();
+      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+      continue;
+    }
+    break;
   }
+
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
 
   RefPtr<IMFMediaBuffer> buffer;
diff --git a/content/media/fmp4/wmf/WMFAudioMFTManager.h b/content/media/fmp4/wmf/WMFAudioMFTManager.h
index 9caff24e3c30..04f041d787d4 100644
--- a/content/media/fmp4/wmf/WMFAudioMFTManager.h
+++ b/content/media/fmp4/wmf/WMFAudioMFTManager.h
@@ -31,12 +31,14 @@ public:
                          nsAutoPtr<MediaData>& aOutput) MOZ_OVERRIDE;
 private:
 
+  HRESULT UpdateOutputType();
+
   // IMFTransform wrapper that performs the decoding.
   RefPtr<MFTDecoder> mDecoder;
 
-  const uint32_t mAudioChannels;
+  uint32_t mAudioChannels;
   const uint32_t mAudioBytesPerSample;
-  const uint32_t mAudioRate;
+  uint32_t mAudioRate;
   nsTArray<BYTE> mUserData;
 
   // The offset, in audio frames, at which playback started since the

From f2bdad18c75b7acdb7ec88590b25ebf00ad497d0 Mon Sep 17 00:00:00 2001
From: Harshit Harchani <hharchani@gmail.com>
Date: Wed, 13 Aug 2014 01:35:22 +0530
Subject: [PATCH 18/89] Bug 927946 - Add all APZC preferences to all.js.
 r=botond

--HG--
extra : rebase_source : d96f4aea65b40490d4cc7f8ec8704a2a2f7ef4b8
---
 gfx/layers/apz/src/AsyncPanZoomController.cpp |  2 +-
 gfx/thebes/gfxPrefs.h                         |  2 +-
 modules/libpref/init/all.js                   | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index e8d8d46b2c9d..7bd09baeaab3 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -137,7 +137,7 @@ typedef mozilla::gfx::Matrix4x4 Matrix4x4;
  * The following prefs are used to control the behaviour of the APZC.
  * The default values are provided in gfxPrefs.h.
  *
- * "apz.allow-checkerboarding"
+ * "apz.allow_checkerboarding"
  * Pref that allows or disallows checkerboarding
  *
  * "apz.asyncscroll.throttle"
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 0c7f6f7b4eac..37a39c22a6ba 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -129,7 +129,7 @@ private:
   // a method accessing a pref already exists. Just add yours in the list.
 
   // The apz prefs are explained in AsyncPanZoomController.cpp
-  DECL_GFX_PREF(Live, "apz.allow-checkerboarding",             APZAllowCheckerboarding, bool, true);
+  DECL_GFX_PREF(Live, "apz.allow_checkerboarding",             APZAllowCheckerboarding, bool, true);
   DECL_GFX_PREF(Live, "apz.asyncscroll.throttle",              APZAsyncScrollThrottleTime, int32_t, 100);
   DECL_GFX_PREF(Live, "apz.asyncscroll.timeout",               APZAsyncScrollTimeout, int32_t, 300);
   DECL_GFX_PREF(Live, "apz.axis_lock_mode",                    APZAxisLockMode, int32_t, 0);
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index e50e60b30cb5..fd45f7e94c52 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -403,15 +403,54 @@ pref("media.audio_data.enabled", false);
 // Whether to use async panning and zooming
 pref("layers.async-pan-zoom.enabled", false);
 
+// APZ preferences. For documentation/details on what these prefs do, check 
+// gfx/layers/apz/src/AsyncPanZoomController.cpp.
+pref("apz.allow_checkerboarding", true);
+pref("apz.asyncscroll.throttle", 100);
+pref("apz.asyncscroll.timeout", 300);
+
 // Whether to lock touch scrolling to one axis at a time
 // 0 = FREE (No locking at all)
 // 1 = STANDARD (Once locked, remain locked until scrolling ends)
 // 2 = STICKY (Allow lock to be broken, with hysteresis)
 pref("apz.axis_lock_mode", 0);
 
+pref("apz.content_response_timeout", 300);
+pref("apz.cross_slide.enabled", false);
+pref("apz.danger_zone_x", 50);
+pref("apz.danger_zone_y", 100);
+pref("apz.enlarge_displayport_when_clipped", false);
+pref("apz.fling_accel_base_mult", "1.0");
+pref("apz.fling_accel_interval_ms", 500);
+pref("apz.fling_accel_supplemental_mult", "1.0");
+pref("apz.fling_friction", "0.002");
+pref("apz.fling_stop_on_tap_threshold", "0.05");
+pref("apz.fling_stopped_threshold", "0.01");
+pref("apz.max_velocity_inches_per_ms", "-1.0");
+pref("apz.max_velocity_queue_size", 5);
+pref("apz.min_skate_speed", "1.0");
+pref("apz.num_paint_duration_samples", 3);
+pref("apz.overscroll.enabled", false);
+pref("apz.overscroll.fling_friction", "0.02");
+pref("apz.overscroll.fling_stopped_threshold", "0.4");
+pref("apz.overscroll.clamping", "0.5");
+pref("apz.overscroll.z_effect", "0.2");
+pref("apz.overscroll.snap_back.spring_stiffness", "0.6");
+pref("apz.overscroll.snap_back.spring_friction", "0.1");
+pref("apz.overscroll.snap_back.mass", "1000.0");
+
 // Whether to print the APZC tree for debugging
 pref("apz.printtree", false);
 
+pref("apz.test.logging_enabled", false);
+pref("apz.touch_start_tolerance", "0.2222222");  // 0.2222222 came from 1.0/4.5
+pref("apz.use_paint_duration", true);
+pref("apz.velocity_bias", "1.0");
+pref("apz.velocity_relevance_time_ms", 150);
+pref("apz.x_stationary_size_multiplier", "3.0");
+pref("apz.y_stationary_size_multiplier", "3.5");
+pref("apz.zoom_animation_duration_ms", 250);
+
 #ifdef XP_MACOSX
 // Layerize scrollable subframes to allow async panning
 pref("apz.subframe.enabled", true);
@@ -421,6 +460,10 @@ pref("apz.apz.x_skate_size_multiplier", "2.5");
 pref("apz.apz.y_skate_size_multiplier", "3.5");
 #else
 pref("apz.subframe.enabled", false);
+pref("apz.fling_repaint_interval", 75);
+pref("apz.pan_repaint_interval", 250);
+pref("apz.x_skate_size_multiplier", "1.5");
+pref("apz.y_skate_size_multiplier", "2.5");
 #endif
 
 // APZ testing (bug 961289)

From 07510ca0605cc81f6d3954a17a985184565a0135 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Tue, 12 Aug 2014 18:46:16 -0400
Subject: [PATCH 19/89] Bug 1052857 - Overdraw should report dst pixels, not
 src pixels. r=jrmuizel

---
 gfx/layers/opengl/CompositorOGL.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index aff372271f7d..60ea8ffbff1d 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1059,7 +1059,12 @@ CompositorOGL::DrawQuad(const Rect& aRect,
     maskType = MaskType::MaskNone;
   }
 
-  mPixelsFilled += aRect.width * aRect.height;
+  {
+    // XXX: This doesn't handle 3D transforms. It also doesn't handled rotated
+    //      quads. Fix me.
+    const Rect destRect = aTransform.TransformBounds(aRect);
+    mPixelsFilled += destRect.width * destRect.height;
+  }
 
   // Determine the color if this is a color shader and fold the opacity into
   // the color since color shaders don't have an opacity uniform.

From 95bd91b3cdf24d4cad7eb81206b1774798e1487e Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 12 Aug 2014 09:23:33 -0700
Subject: [PATCH 20/89] Bug 1052526 - Treat appending None to List as empty
 list; r=glandium

As a special exception, we change List's + and += operators to treat
"+ None" and "+= None" as "+ []" and "+= []" respectively.

This is a hack to make moz.build files simpler so they don't have to
perform "is x" checks before appending x.

While I was here, I fixed the implementation of List.__add__ to return a
List instead of list.

--HG--
extra : rebase_source : e61db4be4cf8144b092609d3baf84c372b9cf9a0
extra : amend_source : dfabc00765582764426f7cf74e79354a0bfb0824
---
 .../mozbuild/mozbuild/test/test_containers.py | 23 ++++++++++++++++++-
 python/mozbuild/mozbuild/util.py              |  6 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/python/mozbuild/mozbuild/test/test_containers.py b/python/mozbuild/mozbuild/test/test_containers.py
index 7e29d1c3afee..414f3eb51f1e 100644
--- a/python/mozbuild/mozbuild/test/test_containers.py
+++ b/python/mozbuild/mozbuild/test/test_containers.py
@@ -57,15 +57,36 @@ class TestList(unittest.TestCase):
         test = List([1, 2, 3])
 
         test += [4, 5, 6]
-
+        self.assertIsInstance(test, List)
         self.assertEqual(test, [1, 2, 3, 4, 5, 6])
 
+        test = test + [7, 8]
+        self.assertIsInstance(test, List)
+        self.assertEqual(test, [1, 2, 3, 4, 5, 6, 7, 8])
+
     def test_add_string(self):
         test = List([1, 2, 3])
 
         with self.assertRaises(ValueError):
             test += 'string'
 
+    def test_none(self):
+        """As a special exception, we allow None to be treated as an empty
+        list."""
+        test = List([1, 2, 3])
+
+        test += None
+        self.assertEqual(test, [1, 2, 3])
+
+        test = test + None
+        self.assertIsInstance(test, List)
+        self.assertEqual(test, [1, 2, 3])
+
+        with self.assertRaises(ValueError):
+            test += False
+
+        with self.assertRaises(ValueError):
+            test = test + False
 
 if __name__ == '__main__':
     main()
diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
index 65d4e782cf4c..f976ee55a60d 100644
--- a/python/mozbuild/mozbuild/util.py
+++ b/python/mozbuild/mozbuild/util.py
@@ -249,12 +249,16 @@ class List(list):
         return list.__setslice__(self, i, j, sequence)
 
     def __add__(self, other):
+        # Allow None is a special case because it makes undefined variable
+        # references in moz.build behave better.
+        other = [] if other is None else other
         if not isinstance(other, list):
             raise ValueError('Only lists can be appended to lists.')
 
-        return list.__add__(self, other)
+        return List(list.__add__(self, other))
 
     def __iadd__(self, other):
+        other = [] if other is None else other
         if not isinstance(other, list):
             raise ValueError('Only lists can be appended to lists.')
 

From fca802563cd34ef8687289ef13f9d070eedc5d40 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 12 Aug 2014 16:29:39 -0700
Subject: [PATCH 21/89] Bug 1052213 - Reduce default size of
 Native2WrappedNativeMaps. r=mrbkap.

---
 js/xpconnect/src/xpcprivate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index ff5729419cad..a1e7f02a7167 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -179,7 +179,7 @@
 #define XPC_JS_MAP_LENGTH                       32
 #define XPC_JS_CLASS_MAP_LENGTH                 32
 
-#define XPC_NATIVE_MAP_LENGTH                   32
+#define XPC_NATIVE_MAP_LENGTH                    8
 #define XPC_NATIVE_PROTO_MAP_LENGTH              8
 #define XPC_DYING_NATIVE_PROTO_MAP_LENGTH        8
 #define XPC_DETACHED_NATIVE_PROTO_MAP_LENGTH    16

From f81382dd8079b20ff21ab3cac87bfb2c0210af9b Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Fri, 8 Aug 2014 09:12:01 +1200
Subject: [PATCH 22/89] Bug 1019693 - Always use tiled thebes layers when we're
 a descendant of a layer with a critical display port so that the
 low-resolution drawing area is handled correctly. r=tn

--HG--
extra : rebase_source : 0dabb9c73d65414979945d0cc46ba8c89d86b90e
---
 layout/base/FrameLayerBuilder.cpp |  3 +++
 layout/base/FrameLayerBuilder.h   |  4 ++++
 layout/base/nsDisplayList.cpp     | 25 ++++++++++++++++++++-----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 326e5b9e0162..57b12e1440b4 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1579,6 +1579,9 @@ ContainerState::CreateOrRecycleThebesLayer(const nsIFrame* aAnimatedGeometryRoot
   // Check whether the layer will be scrollable. This is used as a hint to
   // influence whether tiled layers are used or not.
   LayerManager::ThebesLayerCreationHint creationHint = LayerManager::NONE;
+  if (mParameters.mInLowPrecisionDisplayPort ) {
+    creationHint = LayerManager::SCROLLABLE;
+  }
   nsIFrame* animatedGeometryRootParent = aAnimatedGeometryRoot->GetParent();
   if (animatedGeometryRootParent &&
       animatedGeometryRootParent->GetType() == nsGkAtoms::scrollFrame) {
diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h
index 1db33c9ed62b..b0c25a959283 100644
--- a/layout/base/FrameLayerBuilder.h
+++ b/layout/base/FrameLayerBuilder.h
@@ -72,6 +72,7 @@ struct ContainerLayerParameters {
     , mInTransformedSubtree(false)
     , mInActiveTransformedSubtree(false)
     , mDisableSubpixelAntialiasingInDescendants(false)
+    , mInLowPrecisionDisplayPort(false)
   {}
   ContainerLayerParameters(float aXScale, float aYScale)
     : mXScale(aXScale)
@@ -80,6 +81,7 @@ struct ContainerLayerParameters {
     , mInTransformedSubtree(false)
     , mInActiveTransformedSubtree(false)
     , mDisableSubpixelAntialiasingInDescendants(false)
+    , mInLowPrecisionDisplayPort(false)
   {}
   ContainerLayerParameters(float aXScale, float aYScale,
                            const nsIntPoint& aOffset,
@@ -91,6 +93,7 @@ struct ContainerLayerParameters {
     , mInTransformedSubtree(aParent.mInTransformedSubtree)
     , mInActiveTransformedSubtree(aParent.mInActiveTransformedSubtree)
     , mDisableSubpixelAntialiasingInDescendants(aParent.mDisableSubpixelAntialiasingInDescendants)
+    , mInLowPrecisionDisplayPort(aParent.mInLowPrecisionDisplayPort)
   {}
   float mXScale, mYScale;
   /**
@@ -106,6 +109,7 @@ struct ContainerLayerParameters {
   bool mInTransformedSubtree;
   bool mInActiveTransformedSubtree;
   bool mDisableSubpixelAntialiasingInDescendants;
+  bool mInLowPrecisionDisplayPort;
   /**
    * When this is false, ThebesLayer coordinates are drawn to with an integer
    * translation and the scale in mXScale/mYScale.
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 6967ebee6b33..2b27ca8affbd 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3586,8 +3586,17 @@ already_AddRefed<Layer>
 nsDisplaySubDocument::BuildLayer(nsDisplayListBuilder* aBuilder,
                                  LayerManager* aManager,
                                  const ContainerLayerParameters& aContainerParameters) {
+  nsPresContext* presContext = mFrame->PresContext();
+  nsIFrame* rootScrollFrame = presContext->PresShell()->GetRootScrollFrame();
+  ContainerLayerParameters params = aContainerParameters;
+  if ((mFlags & GENERATE_SCROLLABLE_LAYER) &&
+      rootScrollFrame->GetContent() &&
+      nsLayoutUtils::GetCriticalDisplayPort(rootScrollFrame->GetContent(), nullptr)) {
+    params.mInLowPrecisionDisplayPort = true; 
+  }
+
   nsRefPtr<Layer> layer = nsDisplayOwnLayer::BuildLayer(
-    aBuilder, aManager, aContainerParameters);
+    aBuilder, aManager, params);
 
   if (!(mFlags & GENERATE_SCROLLABLE_LAYER)) {
     return layer.forget();
@@ -3595,7 +3604,6 @@ nsDisplaySubDocument::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   NS_ASSERTION(layer->AsContainerLayer(), "nsDisplayOwnLayer should have made a ContainerLayer");
   if (ContainerLayer* container = layer->AsContainerLayer()) {
-    nsPresContext* presContext = mFrame->PresContext();
     nsIFrame* rootScrollFrame = presContext->PresShell()->GetRootScrollFrame();
     bool isRootContentDocument = presContext->IsRootContentDocument();
 
@@ -3606,7 +3614,7 @@ nsDisplaySubDocument::BuildLayer(nsDisplayListBuilder* aBuilder,
     container->SetScrollHandoffParentId(mScrollParentId);
     RecordFrameMetrics(mFrame, rootScrollFrame, ReferenceFrame(),
                        container, viewport,
-                       false, isRootContentDocument, aContainerParameters);
+                       false, isRootContentDocument, params);
   }
 
   return layer.forget();
@@ -3899,9 +3907,16 @@ already_AddRefed<Layer>
 nsDisplayScrollLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
                                  LayerManager* aManager,
                                  const ContainerLayerParameters& aContainerParameters) {
+
+  ContainerLayerParameters params = aContainerParameters;
+  if (mScrolledFrame->GetContent() &&
+      nsLayoutUtils::GetCriticalDisplayPort(mScrolledFrame->GetContent(), nullptr)) {
+    params.mInLowPrecisionDisplayPort = true; 
+  }
+
   nsRefPtr<ContainerLayer> layer = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
-                           aContainerParameters, nullptr);
+                           params, nullptr);
 
   nsRect viewport = mScrollFrame->GetRect() -
                     mScrollFrame->GetPosition() +
@@ -3909,7 +3924,7 @@ nsDisplayScrollLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   layer->SetScrollHandoffParentId(mScrollParentId);
   RecordFrameMetrics(mScrolledFrame, mScrollFrame, ReferenceFrame(), layer,
-                     viewport, false, false, aContainerParameters);
+                     viewport, false, false, params);
 
   if (mList.IsOpaque()) {
     nsRect displayport;

From 14dc52ff497b72560be1d0ede86e503dfc5f774c Mon Sep 17 00:00:00 2001
From: George Wright <george@mozilla.com>
Date: Tue, 12 Aug 2014 17:14:43 -0400
Subject: [PATCH 23/89] Bug 1052813 - Add -fomit-frame-pointer to CXXFLAGS for
 Skia r=mattwoodrow

---
 gfx/skia/generate_mozbuild.py | 1 +
 gfx/skia/moz.build            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index e5d8fc01146f..7b5b44b67c67 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -142,6 +142,7 @@ if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
+        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 6c0c2b5be157..1606995375c7 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -970,6 +970,7 @@ if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
+        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']

From e1c08d8e7299b6b019b05a1591bdd84012a88343 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Wed, 13 Aug 2014 15:04:19 +1200
Subject: [PATCH 24/89] Bug 1052378 - Replace stray mIsXXXDecoding fields with
 IsXXXDecoding() function calls in MediaDecoderStateMachine. r=kinetik

---
 content/media/MediaDecoderStateMachine.cpp | 4 ++--
 content/media/MediaDecoderStateMachine.h   | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp
index c91512124ee6..c74b3bdd7012 100644
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@@ -586,8 +586,8 @@ MediaDecoderStateMachine::DecodeVideo()
     // soon anyway and we'll want to be able to display frames immediately
     // after buffering finishes.
     if (mState == DECODER_STATE_DECODING &&
-        mIsVideoDecoding &&
-        ((!mIsAudioPrerolling && mIsAudioDecoding &&
+        IsVideoDecoding() &&
+        ((!mIsAudioPrerolling && IsAudioDecoding() &&
           GetDecodedAudioDuration() < mLowAudioThresholdUsecs * mPlaybackRate) ||
           (!mIsVideoPrerolling && IsVideoDecoding() &&
            // don't skip frame when |clock time| <= |mVideoFrameEndTime| for
diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h
index 78b0597a6041..d2d062bba795 100644
--- a/content/media/MediaDecoderStateMachine.h
+++ b/content/media/MediaDecoderStateMachine.h
@@ -829,14 +829,6 @@ protected:
   bool mIsAudioPrerolling;
   bool mIsVideoPrerolling;
 
-  // True when we have an audio stream that we're decoding, and we have not
-  // yet decoded to end of stream.
-  bool mIsAudioDecoding;
-
-  // True when we have a video stream that we're decoding, and we have not
-  // yet decoded to end of stream.
-  bool mIsVideoDecoding;
-
   // True when we have dispatched a task to the decode task queue to request
   // decoded audio/video, and/or we are waiting for the requested sample to be
   // returned by callback from the Reader.

From 50bda571f1b920cd458f6533d04ea9ac44752eaa Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 13 Aug 2014 12:55:59 +0900
Subject: [PATCH 25/89] Bug 1050124 Support TSATTRID_Text_VerticalWriting for
 consistency with other TSF aware applications r=jimm

---
 widget/windows/nsTextStore.cpp | 290 +++++++++++++++++++++++++--------
 widget/windows/nsTextStore.h   |  33 +++-
 2 files changed, 253 insertions(+), 70 deletions(-)

diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp
index 1e8bc4c86e0d..0180aaf36837 100644
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -23,6 +23,7 @@
 #include "mozilla/WindowsVersion.h"
 
 #define INPUTSCOPE_INIT_GUID
+#define TEXTATTRS_INIT_GUID
 #include "nsTextStore.h"
 
 using namespace mozilla;
@@ -257,6 +258,105 @@ GetGUIDNameStr(REFGUID aGUID)
   return NS_ConvertUTF16toUTF8(str);
 }
 
+static nsCString
+GetGUIDNameStrWithTable(REFGUID aGUID)
+{
+#define RETURN_GUID_NAME(aNamedGUID) \
+  if (IsEqualGUID(aGUID, aNamedGUID)) { \
+    return NS_LITERAL_CSTRING(#aNamedGUID); \
+  }
+
+  RETURN_GUID_NAME(GUID_PROP_INPUTSCOPE)
+  RETURN_GUID_NAME(TSATTRID_OTHERS)
+  RETURN_GUID_NAME(TSATTRID_Font)
+  RETURN_GUID_NAME(TSATTRID_Font_FaceName)
+  RETURN_GUID_NAME(TSATTRID_Font_SizePts)
+  RETURN_GUID_NAME(TSATTRID_Font_Style)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Bold)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Italic)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_SmallCaps)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Capitalize)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Uppercase)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Lowercase)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_LasVegasLights)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_BlinkingBackground)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_SparkleText)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_MarchingBlackAnts)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_MarchingRedAnts)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_Shimmer)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_WipeDown)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Animation_WipeRight)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Emboss)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Engrave)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Hidden)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Kerning)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Outlined)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Position)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Protected)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Shadow)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Spacing)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Weight)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Height)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Underline)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Underline_Single)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Underline_Double)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Strikethrough)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Strikethrough_Single)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Strikethrough_Double)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Overline)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Overline_Single)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Overline_Double)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Blink)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Subscript)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Superscript)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_Color)
+  RETURN_GUID_NAME(TSATTRID_Font_Style_BackgroundColor)
+  RETURN_GUID_NAME(TSATTRID_Text)
+  RETURN_GUID_NAME(TSATTRID_Text_VerticalWriting)
+  RETURN_GUID_NAME(TSATTRID_Text_RightToLeft)
+  RETURN_GUID_NAME(TSATTRID_Text_Orientation)
+  RETURN_GUID_NAME(TSATTRID_Text_Language)
+  RETURN_GUID_NAME(TSATTRID_Text_ReadOnly)
+  RETURN_GUID_NAME(TSATTRID_Text_EmbeddedObject)
+  RETURN_GUID_NAME(TSATTRID_Text_Alignment)
+  RETURN_GUID_NAME(TSATTRID_Text_Alignment_Left)
+  RETURN_GUID_NAME(TSATTRID_Text_Alignment_Right)
+  RETURN_GUID_NAME(TSATTRID_Text_Alignment_Center)
+  RETURN_GUID_NAME(TSATTRID_Text_Alignment_Justify)
+  RETURN_GUID_NAME(TSATTRID_Text_Link)
+  RETURN_GUID_NAME(TSATTRID_Text_Hyphenation)
+  RETURN_GUID_NAME(TSATTRID_Text_Para)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_FirstLineIndent)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LeftIndent)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_RightIndent)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_SpaceAfter)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_SpaceBefore)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_Single)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_OnePtFive)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_Double)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_AtLeast)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_Exactly)
+  RETURN_GUID_NAME(TSATTRID_Text_Para_LineSpacing_Multiple)
+  RETURN_GUID_NAME(TSATTRID_List)
+  RETURN_GUID_NAME(TSATTRID_List_LevelIndel)
+  RETURN_GUID_NAME(TSATTRID_List_Type)
+  RETURN_GUID_NAME(TSATTRID_List_Type_Bullet)
+  RETURN_GUID_NAME(TSATTRID_List_Type_Arabic)
+  RETURN_GUID_NAME(TSATTRID_List_Type_LowerLetter)
+  RETURN_GUID_NAME(TSATTRID_List_Type_UpperLetter)
+  RETURN_GUID_NAME(TSATTRID_List_Type_LowerRoman)
+  RETURN_GUID_NAME(TSATTRID_List_Type_UpperRoman)
+  RETURN_GUID_NAME(TSATTRID_App)
+  RETURN_GUID_NAME(TSATTRID_App_IncorrectSpelling)
+  RETURN_GUID_NAME(TSATTRID_App_IncorrectGrammar)
+
+#undef RETURN_GUID_NAME
+
+  GetGUIDNameStr(aGUID);
+}
+
 static nsCString
 GetRIIDNameStr(REFIID aRIID)
 {
@@ -504,22 +604,25 @@ GetDisplayAttrStr(const TF_DISPLAYATTRIBUTE &aDispAttr)
 #endif // #ifdef PR_LOGGING
 
 nsTextStore::nsTextStore()
- : mContent(mComposition, mSelection)
+  : mContent(mComposition, mSelection)
+  , mEditCookie(0)
+  , mIPProfileCookie(TF_INVALID_COOKIE)
+  , mLangProfileCookie(TF_INVALID_COOKIE)
+  , mSinkMask(0)
+  , mLock(0)
+  , mLockQueued(0)
+  , mRequestedAttrValues(false)
+  , mIsRecordingActionsWithoutLock(false)
+  , mPendingOnSelectionChange(false)
+  , mPendingOnLayoutChange(false)
+  , mNativeCaretIsCreated(false)
+  , mIsIMM_IME(false)
+  , mOnActivatedCalled(false)
 {
-  mEditCookie = 0;
-  mIPProfileCookie = TF_INVALID_COOKIE;
-  mLangProfileCookie = TF_INVALID_COOKIE;
-  mSinkMask = 0;
-  mLock = 0;
-  mLockQueued = 0;
-  mInputScopeDetected = false;
-  mInputScopeRequested = false;
-  mIsRecordingActionsWithoutLock = false;
-  mPendingOnSelectionChange = false;
-  mPendingOnLayoutChange = false;
-  mNativeCaretIsCreated = false;
-  mIsIMM_IME = false;
-  mOnActivatedCalled = false;
+  for (int32_t i = 0; i < NUM_OF_SUPPORTED_ATTRS; i++) {
+    mRequestedAttrs[i] = false;
+  }
+
   // We hope that 5 or more actions don't occur at once.
   mPendingActions.SetCapacity(5);
 
@@ -2100,15 +2203,41 @@ nsTextStore::SetInputScope(const nsString& aHTMLInputType)
   }
 }
 
+int32_t
+nsTextStore::GetRequestedAttrIndex(const TS_ATTRID& aAttrID)
+{
+  if (IsEqualGUID(aAttrID, GUID_PROP_INPUTSCOPE)) {
+    return eInputScope;
+  }
+  if (IsEqualGUID(aAttrID, TSATTRID_Text_VerticalWriting)) {
+    return eTextVerticalWriting;
+  }
+  return eNotSupported;
+}
+
+TS_ATTRID
+nsTextStore::GetAttrID(int32_t aIndex)
+{
+  switch (aIndex) {
+    case eInputScope:
+      return GUID_PROP_INPUTSCOPE;
+    case eTextVerticalWriting:
+      return TSATTRID_Text_VerticalWriting;
+    default:
+      MOZ_CRASH("Invalid index? Or not implemented yet?");
+      return GUID_NULL;
+  }
+}
+
 HRESULT
-nsTextStore::ProcessScopeRequest(DWORD dwFlags,
-                                 ULONG cFilterAttrs,
-                                 const TS_ATTRID *paFilterAttrs)
+nsTextStore::HandleRequestAttrs(DWORD aFlags,
+                                ULONG aFilterCount,
+                                const TS_ATTRID* aFilterAttrs)
 {
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-         ("TSF: 0x%p nsTextStore::ProcessScopeRequest(dwFlags=%s, "
-          "cFilterAttrs=%ld",
-          this, GetFindFlagName(dwFlags).get(), cFilterAttrs));
+         ("TSF: 0x%p nsTextStore::HandleRequestAttrs(aFlags=%s, "
+          "aFilterCount=%u)",
+          this, GetFindFlagName(aFlags).get(), aFilterCount));
 
   // This is a little weird! RequestSupportedAttrs gives us advanced notice
   // of a support query via RetrieveRequestedAttrs for a specific attribute.
@@ -2116,26 +2245,19 @@ nsTextStore::ProcessScopeRequest(DWORD dwFlags,
   // support, but the text service will only want the input scope object
   // returned in RetrieveRequestedAttrs if the dwFlags passed in here contains
   // TS_ATTR_FIND_WANT_VALUE.
-  mInputScopeDetected = mInputScopeRequested = false;
+  for (int32_t i = 0; i < NUM_OF_SUPPORTED_ATTRS; i++) {
+    mRequestedAttrs[i] = false;
+  }
+  mRequestedAttrValues = !!(aFlags & TS_ATTR_FIND_WANT_VALUE);
 
-  // Currently we only support GUID_PROP_INPUTSCOPE
-  for (uint32_t idx = 0; idx < cFilterAttrs; ++idx) {
+  for (uint32_t i = 0; i < aFilterCount; i++) {
     PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-           ("TSF: 0x%p   nsTextStore::ProcessScopeRequest() "
+           ("TSF: 0x%p   nsTextStore::HandleRequestAttrs(), "
             "requested attr=%s",
-            this, GetCLSIDNameStr(paFilterAttrs[idx]).get()));
-    if (IsEqualGUID(paFilterAttrs[idx], GUID_PROP_INPUTSCOPE)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-             ("TSF: 0x%p   nsTextStore::ProcessScopeRequest() "
-              "GUID_PROP_INPUTSCOPE queried", this));
-      mInputScopeDetected = true;
-      if (dwFlags & TS_ATTR_FIND_WANT_VALUE) {
-        PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-               ("TSF: 0x%p   nsTextStore::ProcessScopeRequest() "
-                "TS_ATTR_FIND_WANT_VALUE specified", this));
-        mInputScopeRequested = true;
-      }
-      break;
+            this, GetGUIDNameStrWithTable(aFilterAttrs[i]).get()));
+    int32_t index = GetRequestedAttrIndex(aFilterAttrs[i]);
+    if (index != eNotSupported) {
+      mRequestedAttrs[index] = true;
     }
   }
   return S_OK;
@@ -2151,7 +2273,7 @@ nsTextStore::RequestSupportedAttrs(DWORD dwFlags,
           "cFilterAttrs=%lu)",
           this, GetFindFlagName(dwFlags).get(), cFilterAttrs));
 
-  return ProcessScopeRequest(dwFlags, cFilterAttrs, paFilterAttrs);
+  return HandleRequestAttrs(dwFlags, cFilterAttrs, paFilterAttrs);
 }
 
 STDMETHODIMP
@@ -2165,8 +2287,8 @@ nsTextStore::RequestAttrsAtPosition(LONG acpPos,
           "cFilterAttrs=%lu, dwFlags=%s)",
           this, acpPos, cFilterAttrs, GetFindFlagName(dwFlags).get()));
 
-  return ProcessScopeRequest(dwFlags | TS_ATTR_FIND_WANT_VALUE,
-                             cFilterAttrs, paFilterAttrs);
+  return HandleRequestAttrs(dwFlags | TS_ATTR_FIND_WANT_VALUE,
+                            cFilterAttrs, paFilterAttrs);
 }
 
 STDMETHODIMP
@@ -2217,38 +2339,76 @@ nsTextStore::RetrieveRequestedAttrs(ULONG ulCount,
                                     TS_ATTRVAL *paAttrVals,
                                     ULONG *pcFetched)
 {
-  if (!pcFetched || !ulCount || !paAttrVals) {
+  if (!pcFetched || !paAttrVals) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-         ("TSF: 0x%p   nsTextStore::RetrieveRequestedAttrs() called "
-          "ulCount=%d", this, ulCount));
-
-  if (mInputScopeDetected || mInputScopeRequested) {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-           ("TSF: 0x%p   nsTextStore::RetrieveRequestedAttrs() for "
-            "GUID_PROP_INPUTSCOPE: "
-            "mInputScopeDetected=%s mInputScopeRequested=%s",
-            this, GetBoolName(mInputScopeDetected),
-            GetBoolName(mInputScopeRequested)));
-
-    paAttrVals->idAttr = GUID_PROP_INPUTSCOPE;
-    paAttrVals->dwOverlapId = 0;
-    paAttrVals->varValue.vt = VT_EMPTY;
-    *pcFetched = 1;
-
-    if (mInputScopeRequested) {
-      paAttrVals->varValue.vt = VT_UNKNOWN;
-      nsRefPtr<IUnknown> inputScope = new InputScopeImpl(mInputScopes);
-      paAttrVals->varValue.punkVal = inputScope.forget().take();
+  ULONG expectedCount = 0;
+  for (int32_t i = 0; i < NUM_OF_SUPPORTED_ATTRS; i++) {
+    if (mRequestedAttrs[i]) {
+      expectedCount++;
     }
+  }
+  if (ulCount < expectedCount) {
+    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+           ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() FAILED due to "
+            "not enough count ulCount=%u, expectedCount=%u",
+            this, ulCount, expectedCount));
+    return E_INVALIDARG;
+  }
 
-    mInputScopeDetected = mInputScopeRequested = false;
-    return S_OK;
+  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+         ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() called "
+          "ulCount=%d, mRequestedAttrValues=%s",
+          this, ulCount, GetBoolName(mRequestedAttrValues)));
+
+  int32_t count = 0;
+  for (int32_t i = 0; i < NUM_OF_SUPPORTED_ATTRS; i++) {
+    if (!mRequestedAttrs[i]) {
+      continue;
+    }
+    mRequestedAttrs[i] = false;
+
+    TS_ATTRID attrID = GetAttrID(i);
+
+    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+           ("TSF: 0x%p   nsTextStore::RetrieveRequestedAttrs() for %s",
+            this, GetGUIDNameStrWithTable(attrID).get()));
+
+    paAttrVals[count].idAttr = attrID;
+    paAttrVals[count].dwOverlapId = 0;
+
+    if (!mRequestedAttrValues) {
+      paAttrVals[count].varValue.vt = VT_EMPTY;
+    } else {
+      switch (i) {
+        case eInputScope: {
+          paAttrVals[count].varValue.vt = VT_UNKNOWN;
+          nsRefPtr<IUnknown> inputScope = new InputScopeImpl(mInputScopes);
+          paAttrVals[count].varValue.punkVal = inputScope.forget().take();
+          break;
+        }
+        case eTextVerticalWriting:
+          // Currently, we don't support vertical writing mode.
+          paAttrVals[count].varValue.vt = VT_BOOL;
+          paAttrVals[count].varValue.boolVal = VARIANT_FALSE;
+          break;
+        default:
+          MOZ_CRASH("Invalid index? Or not implemented yet?");
+          break;
+      }
+    }
+    count++;
+  }
+
+  mRequestedAttrValues = false;
+
+  if (count) {
+    *pcFetched = count;
+    return NS_OK;
   }
 
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
diff --git a/widget/windows/nsTextStore.h b/widget/windows/nsTextStore.h
index 6294be96d5a6..08cc1e752a16 100644
--- a/widget/windows/nsTextStore.h
+++ b/widget/windows/nsTextStore.h
@@ -24,6 +24,9 @@
 #ifdef INPUTSCOPE_INIT_GUID
 #include <initguid.h>
 #endif
+#ifdef TEXTATTRS_INIT_GUID
+#include <tsattrs.h>
+#endif
 #include <inputscope.h>
 
 // TSF InputScope, for earlier SDK 8
@@ -284,9 +287,9 @@ protected:
   void     FlushPendingActions();
 
   nsresult OnLayoutChangeInternal();
-  HRESULT  ProcessScopeRequest(DWORD dwFlags,
-                               ULONG cFilterAttrs,
-                               const TS_ATTRID *paFilterAttrs);
+  HRESULT  HandleRequestAttrs(DWORD aFlags,
+                              ULONG aFilterCount,
+                              const TS_ATTRID* aFilterAttrs);
   void     SetInputScope(const nsString& aHTMLInputType);
 
   // Creates native caret over our caret.  This method only works on desktop
@@ -663,8 +666,28 @@ protected:
 
   // The input scopes for this context, defaults to IS_DEFAULT.
   nsTArray<InputScope>         mInputScopes;
-  bool                         mInputScopeDetected;
-  bool                         mInputScopeRequested;
+
+  // Support retrieving attributes.
+  // TODO: We should support RightToLeft, perhaps.
+  enum
+  {
+    // Used for result of GetRequestedAttrIndex()
+    eNotSupported = -1,
+
+    // Supported attributes
+    eInputScope = 0,
+    eTextVerticalWriting,
+
+    // Count of the supported attributes
+    NUM_OF_SUPPORTED_ATTRS
+  };
+  bool mRequestedAttrs[NUM_OF_SUPPORTED_ATTRS];
+
+  int32_t GetRequestedAttrIndex(const TS_ATTRID& aAttrID);
+  TS_ATTRID GetAttrID(int32_t aIndex);
+
+  bool mRequestedAttrValues;
+
   // If edit actions are being recorded without document lock, this is true.
   // Otherwise, false.
   bool                         mIsRecordingActionsWithoutLock;

From 033a6785eb696a50f895d0bc8d4e0e6a28333c46 Mon Sep 17 00:00:00 2001
From: Jed Davis <jld@mozilla.com>
Date: Tue, 12 Aug 2014 21:28:27 -0700
Subject: [PATCH 26/89] Bug 1043733 - Require sandboxing to load Gecko Media
 Plugins on Linux. r=jesup r=kang

Also refactors how sandbox support and disabling are handled, and allows
simulating a lack of sandbox support with an env var (for testing
without rebuilding a kernel).
---
 content/media/gmp/GMPChild.cpp     |  1 +
 content/media/gmp/GMPService.cpp   |  8 +++
 dom/ipc/ContentChild.cpp           |  4 +-
 security/sandbox/linux/Sandbox.cpp | 91 ++++++++++++++++++++----------
 security/sandbox/linux/Sandbox.h   | 13 ++++-
 5 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/content/media/gmp/GMPChild.cpp b/content/media/gmp/GMPChild.cpp
index 1c5f9bb31dc9..c0ef5bede0cd 100644
--- a/content/media/gmp/GMPChild.cpp
+++ b/content/media/gmp/GMPChild.cpp
@@ -157,6 +157,7 @@ GMPChild::LoadPluginLibrary(const std::string& aPluginPath)
 #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
   // Enable sandboxing here -- we know the plugin file's path, but
   // this process's execution hasn't been affected by its content yet.
+  MOZ_ASSERT(mozilla::CanSandboxMediaPlugin());
   mozilla::SetMediaPluginSandbox(nativePath.get());
 #endif
 
diff --git a/content/media/gmp/GMPService.cpp b/content/media/gmp/GMPService.cpp
index 989decc974d2..762d0d73eb6b 100644
--- a/content/media/gmp/GMPService.cpp
+++ b/content/media/gmp/GMPService.cpp
@@ -20,6 +20,9 @@
 #include "GMPDecryptorParent.h"
 #include "GMPAudioDecoderParent.h"
 #include "runnable_utils.h"
+#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
+#include "mozilla/Sandbox.h"
+#endif
 
 namespace mozilla {
 
@@ -453,6 +456,11 @@ NS_IMETHODIMP
 GeckoMediaPluginService::AddPluginDirectory(const nsAString& aDirectory)
 {
   MOZ_ASSERT(NS_IsMainThread());
+#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
+  if (!mozilla::CanSandboxMediaPlugin()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+#endif
   nsCOMPtr<nsIThread> thread;
   nsresult rv = GetThread(getter_AddRefs(thread));
   if (NS_FAILED(rv)) {
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 15b4c84dad1d..0dad108d72a3 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -922,7 +922,9 @@ ContentChild::RecvSetProcessSandbox()
   // at some point; see bug 880808.
 #if defined(MOZ_CONTENT_SANDBOX)
 #if defined(XP_LINUX)
-    SetContentProcessSandbox();
+    if (CanSandboxContentProcess()) {
+        SetContentProcessSandbox();
+    }
 #elif defined(XP_WIN)
     mozilla::SandboxTarget::Instance()->StartSandbox();
 #endif
diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp
index 095d6a150efc..fb201cfd3bc0 100644
--- a/security/sandbox/linux/Sandbox.cpp
+++ b/security/sandbox/linux/Sandbox.cpp
@@ -58,6 +58,40 @@ static int gMediaPluginFileDesc = -1;
 static const char *gMediaPluginFilePath;
 #endif
 
+struct SandboxFlags {
+  bool isSupported;
+#ifdef MOZ_CONTENT_SANDBOX
+  bool isDisabledForContent;
+#endif
+#ifdef MOZ_GMP_SANDBOX
+  bool isDisabledForGMP;
+#endif
+
+  SandboxFlags() {
+    // Allow simulating the absence of seccomp-bpf support, for testing.
+    if (getenv("MOZ_FAKE_NO_SANDBOX")) {
+      isSupported = false;
+    } else {
+      // Determine whether seccomp-bpf is supported by trying to
+      // enable it with an invalid pointer for the filter.  This will
+      // fail with EFAULT if supported and EINVAL if not, without
+      // changing the process's state.
+      if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr) != -1) {
+        MOZ_CRASH("prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr) didn't fail");
+      }
+      isSupported = errno == EFAULT;
+    }
+#ifdef MOZ_CONTENT_SANDBOX
+    isDisabledForContent = getenv("MOZ_DISABLE_CONTENT_SANDBOX");
+#endif
+#ifdef MOZ_GMP_SANDBOX
+    isDisabledForGMP = getenv("MOZ_DISABLE_GMP_SANDBOX");
+#endif
+  }
+};
+
+static const SandboxFlags gSandboxFlags;
+
 /**
  * Log JS stack info in the same place as the sandbox violation
  * message.  Useful in case the responsible code is JS and all we have
@@ -224,20 +258,23 @@ InstallSyscallReporter(void)
  * to pass a bpf program (in our case, it contains a syscall
  * whitelist).
  *
- * @return 0 on success, 1 on failure.
+ * Reports failure by crashing.
+ *
  * @see sock_fprog (the seccomp_prog).
  */
-static int
+static void
 InstallSyscallFilter(const sock_fprog *prog)
 {
   if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
-    return 1;
+    LOG_ERROR("prctl(PR_SET_NO_NEW_PRIVS) failed: %s", strerror(errno));
+    MOZ_CRASH("prctl(PR_SET_NO_NEW_PRIVS)");
   }
 
   if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (unsigned long)prog, 0, 0)) {
-    return 1;
+    LOG_ERROR("prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER) failed: %s",
+              strerror(errno));
+    MOZ_CRASH("prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER)");
   }
-  return 0;
 }
 
 // Use signals for permissions that need to be set per-thread.
@@ -268,22 +305,16 @@ FindFreeSignalNumber()
   return 0;
 }
 
+// Returns true if sandboxing was enabled, or false if sandboxing
+// already was enabled.  Crashes if sandboxing could not be enabled.
 static bool
 SetThreadSandbox()
 {
-  bool didAnything = false;
-
   if (prctl(PR_GET_SECCOMP, 0, 0, 0, 0) == 0) {
-    if (InstallSyscallFilter(sSetSandboxFilter) == 0) {
-      didAnything = true;
-    }
-    /*
-     * Bug 880797: when all B2G devices are required to support
-     * seccomp-bpf, this should exit/crash if InstallSyscallFilter
-     * returns nonzero (ifdef MOZ_WIDGET_GONK).
-     */
+    InstallSyscallFilter(sSetSandboxFilter);
+    return true;
   }
-  return didAnything;
+  return false;
 }
 
 static void
@@ -435,14 +466,6 @@ BroadcastSetThreadSandbox(SandboxType aType)
   SetThreadSandbox();
 }
 
-// This function can overapproximate (i.e., return true even if
-// sandboxing isn't supported, but not the reverse).  See bug 993145.
-static bool
-IsSandboxingSupported(void)
-{
-  return prctl(PR_GET_SECCOMP) != -1;
-}
-
 // Common code for sandbox startup.
 static void
 SetCurrentProcessSandbox(SandboxType aType)
@@ -451,9 +474,7 @@ SetCurrentProcessSandbox(SandboxType aType)
     LOG_ERROR("install_syscall_reporter() failed\n");
   }
 
-  if (IsSandboxingSupported()) {
-    BroadcastSetThreadSandbox(aType);
-  }
+  BroadcastSetThreadSandbox(aType);
 }
 
 #ifdef MOZ_CONTENT_SANDBOX
@@ -466,12 +487,18 @@ SetCurrentProcessSandbox(SandboxType aType)
 void
 SetContentProcessSandbox()
 {
-  if (PR_GetEnv("MOZ_DISABLE_CONTENT_SANDBOX")) {
+  if (gSandboxFlags.isDisabledForContent) {
     return;
   }
 
   SetCurrentProcessSandbox(kSandboxContentProcess);
 }
+
+bool
+CanSandboxContentProcess()
+{
+  return gSandboxFlags.isSupported || gSandboxFlags.isDisabledForContent;
+}
 #endif // MOZ_CONTENT_SANDBOX
 
 #ifdef MOZ_GMP_SANDBOX
@@ -489,7 +516,7 @@ SetContentProcessSandbox()
 void
 SetMediaPluginSandbox(const char *aFilePath)
 {
-  if (PR_GetEnv("MOZ_DISABLE_GMP_SANDBOX")) {
+  if (gSandboxFlags.isDisabledForGMP) {
     return;
   }
 
@@ -504,6 +531,12 @@ SetMediaPluginSandbox(const char *aFilePath)
   // Finally, start the sandbox.
   SetCurrentProcessSandbox(kSandboxMediaPlugin);
 }
+
+bool
+CanSandboxMediaPlugin()
+{
+  return gSandboxFlags.isSupported || gSandboxFlags.isDisabledForGMP;
+}
 #endif // MOZ_GMP_SANDBOX
 
 } // namespace mozilla
diff --git a/security/sandbox/linux/Sandbox.h b/security/sandbox/linux/Sandbox.h
index d8a3891ceb13..1e15fb70317e 100644
--- a/security/sandbox/linux/Sandbox.h
+++ b/security/sandbox/linux/Sandbox.h
@@ -9,14 +9,25 @@
 
 namespace mozilla {
 
+// The Set*Sandbox() functions must not be called if the corresponding
+// CanSandbox*() function has returned false; if sandboxing is
+// attempted, any failure to enable it is fatal.
+//
+// If sandboxing is disabled for a process type with the corresponding
+// environment variable, Set*Sandbox() does nothing and CanSandbox*()
+// returns true.
+
 #ifdef MOZ_CONTENT_SANDBOX
+// Disabled by setting env var MOZ_DISABLE_CONTENT_SANDBOX.
+bool CanSandboxContentProcess();
 void SetContentProcessSandbox();
 #endif
 #ifdef MOZ_GMP_SANDBOX
+// Disabled by setting env var MOZ_DISABLE_GMP_SANDBOX.
+bool CanSandboxMediaPlugin();
 void SetMediaPluginSandbox(const char *aFilePath);
 #endif
 
 } // namespace mozilla
 
 #endif // mozilla_Sandbox_h
-

From 5c21275b201b9259eb64efd56f3bbbd664ecee7b Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Mon, 11 Aug 2014 23:21:09 -0700
Subject: [PATCH 27/89] Bug 1052248 - Tweak the goodAllocated heuristics.
 r=bhackett.

--HG--
extra : rebase_source : 2ba3467efa21d5e00ae300d0fa57b3522ba3d721
---
 js/src/jsobj.cpp | 56 ++++++++++++++----------------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index a78e333f27e2..0c1c62bda238 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3237,46 +3237,20 @@ ReallocateElements(ThreadSafeContext *cx, JSObject *obj, ObjectElements *oldHead
 // Having the second class means that for bigger arrays the constant factor is
 // higher, but we waste less space.
 //
-// There are two exceptions to the above rules. Both exceptions optimize for
-// cases where the requested capacity is near the array's length.
-//
-// - If |reqAllocated| would give us a capacity equal to |length|, it's
-//   probably due to code like this:
-//
-//      var a = new Array(1024);
-//
-//   1024 is smaller than |EagerAllocationMaxLength|, so the array elements
-//   are allocated immediately. This is likely to be the final size of the
-//   array, so we just allocate the exact length immediately. In this case, the
-//   capacity is 1024 and |goodAllocated| is 1026.
-//
-// - If the |goodAllocated| value we compute gives a capacity slightly smaller
-//   than |length|, we nudge |goodAllocated| up so that the capacity equals the
-//   length. Consider the following code, which is very much like some code
-//   that appears in the Kraken benchmark suite:
-//
-//     var a = new Array(8192);
-//     for (var i = 0; i < 8192; i++) { a[i] = i; }
-//
-//   8192 is larger than |EagerAllocationMaxLength|, so the elements will be
-//   resized up to the final size rather than allocated immediately. Without
-//   this exception, it would be repeatedly resized and |goodAllocated| would
-//   reach 8192, which gives a capacity of 8190, which isn't quite enough, so
-//   it would then be have to be resized one more time to 16382 elements,
-//   wasting time and memory. But with the exception, the final resizing is
-//   nudged, resulting in a capacity of 8192 and |goodAllocated| value of 8194.
+// There is one exception to the above rule: for the power-of-two cases, if the
+// chosen capacity would be 2/3 or more of the array's length, the chosen
+// capacity is adjusted (up or down) to be equal to the array's length
+// (assuming length is at least as large as the required capacity). This avoids
+// the allocation of excess elements which are unlikely to be needed, either in
+// this resizing or a subsequent one. The 2/3 factor is chosen so that
+// exceptional resizings will at most triple the capacity, as opposed to the
+// usual doubling.
 //
 /* static */ uint32_t
 JSObject::goodAllocated(uint32_t reqAllocated, uint32_t length = 0)
 {
     static const uint32_t Mebi = 1024 * 1024;
 
-    uint32_t reqCapacity = reqAllocated - ObjectElements::VALUES_PER_HEADER;
-    if (reqCapacity == length && reqAllocated >= JSObject::SLOT_CAPACITY_MIN) {
-        // This is the first exception mentioned above.
-        return length + ObjectElements::VALUES_PER_HEADER;
-    }
-
     // This table was generated with this JavaScript code and a small amount
     // subsequent reformatting:
     //
@@ -3303,8 +3277,16 @@ JSObject::goodAllocated(uint32_t reqAllocated, uint32_t length = 0)
     uint32_t goodAllocated = reqAllocated;
     if (goodAllocated < Mebi) {
         goodAllocated = RoundUpPow2(goodAllocated);
+
+        // Look for the abovementioned exception.
+        uint32_t goodCapacity = goodAllocated - ObjectElements::VALUES_PER_HEADER;
+        uint32_t reqCapacity = reqAllocated - ObjectElements::VALUES_PER_HEADER;
+        if (length >= reqCapacity && goodCapacity > (length / 3) * 2)
+            goodAllocated = length + ObjectElements::VALUES_PER_HEADER;
+
         if (goodAllocated < JSObject::SLOT_CAPACITY_MIN)
             goodAllocated = JSObject::SLOT_CAPACITY_MIN;
+
     } else {
         uint32_t i = 0;
         while (true) {
@@ -3322,12 +3304,6 @@ JSObject::goodAllocated(uint32_t reqAllocated, uint32_t length = 0)
         }
     }
 
-    uint32_t goodCapacity = goodAllocated - ObjectElements::VALUES_PER_HEADER;
-    if (length > goodCapacity && (length - goodCapacity) < 16) {
-        // This is the second exception mentioned above.
-        return length + ObjectElements::VALUES_PER_HEADER;
-    }
-
     return goodAllocated;
 }
 

From 8c367c2bf125c8e797d6b12ec010765f78f2d616 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 12 Aug 2014 21:46:27 -0700
Subject: [PATCH 28/89] Bug 1052758: Remove unused variable 'kWorkScheduled'
 from message_pump_glib.cc. r=ehsan

---
 ipc/chromium/src/base/message_pump_glib.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ipc/chromium/src/base/message_pump_glib.cc b/ipc/chromium/src/base/message_pump_glib.cc
index 58ebe86dc860..eefa3df53283 100644
--- a/ipc/chromium/src/base/message_pump_glib.cc
+++ b/ipc/chromium/src/base/message_pump_glib.cc
@@ -16,9 +16,6 @@
 
 namespace {
 
-// We send a byte across a pipe to wakeup the event loop.
-const char kWorkScheduled = '\0';
-
 // Return a timeout suitable for the glib loop, -1 to block forever,
 // 0 to return right away, or a timeout in milliseconds from now.
 int GetTimeIntervalMilliseconds(const base::TimeTicks& from) {

From 8efb3061264655a5b8141a03bbc5e54d82c4417f Mon Sep 17 00:00:00 2001
From: Dan Glastonbury <dglastonbury@mozilla.com>
Date: Tue, 5 Aug 2014 17:26:57 +1000
Subject: [PATCH 29/89] Bug 1050599 - Sort GLContext extension names and
 strings.; r=bjacob

--HG--
extra : rebase_source : 1af2dd171a4eac879ee83aa25d1430e620f11021
---
 gfx/gl/GLContext.cpp | 142 +++++++++++++++++++++----------------------
 gfx/gl/GLContext.h   | 142 +++++++++++++++++++++----------------------
 2 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 27b527c771b8..230f81add85a 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -63,87 +63,87 @@ uint32_t GLContext::sDebugMode = 0;
 // should match the order of GLExtensions, and be null-terminated.
 static const char *sExtensionNames[] = {
     "NO_EXTENSION",
-    "GL_EXT_framebuffer_object",
-    "GL_ARB_framebuffer_object",
-    "GL_ARB_texture_rectangle",
-    "GL_EXT_bgra",
-    "GL_EXT_texture_format_BGRA8888",
-    "GL_OES_depth24",
-    "GL_OES_depth32",
-    "GL_OES_stencil8",
-    "GL_OES_texture_npot",
-    "GL_IMG_texture_npot",
-    "GL_ARB_depth_texture",
-    "GL_OES_depth_texture",
-    "GL_OES_packed_depth_stencil",
-    "GL_IMG_read_format",
-    "GL_EXT_read_format_bgra",
-    "GL_APPLE_client_storage",
-    "GL_APPLE_texture_range",
-    "GL_ARB_texture_non_power_of_two",
-    "GL_ARB_pixel_buffer_object",
-    "GL_ARB_ES2_compatibility",
-    "GL_ARB_ES3_compatibility",
-    "GL_OES_texture_float",
-    "GL_OES_texture_float_linear",
-    "GL_ARB_texture_float",
-    "GL_OES_texture_half_float",
-    "GL_OES_texture_half_float_linear",
-    "GL_NV_half_float",
-    "GL_EXT_color_buffer_float",
-    "GL_EXT_color_buffer_half_float",
-    "GL_ARB_color_buffer_float",
-    "GL_EXT_unpack_subimage",
-    "GL_OES_standard_derivatives",
-    "GL_EXT_texture_filter_anisotropic",
-    "GL_EXT_texture_compression_s3tc",
-    "GL_EXT_texture_compression_dxt1",
+    "GL_AMD_compressed_ATC_texture",
+    "GL_ANGLE_depth_texture",
+    "GL_ANGLE_framebuffer_blit",
+    "GL_ANGLE_framebuffer_multisample",
+    "GL_ANGLE_instanced_arrays",
     "GL_ANGLE_texture_compression_dxt3",
     "GL_ANGLE_texture_compression_dxt5",
-    "GL_AMD_compressed_ATC_texture",
-    "GL_IMG_texture_compression_pvrtc",
-    "GL_EXT_framebuffer_blit",
-    "GL_ANGLE_framebuffer_blit",
-    "GL_EXT_framebuffer_multisample",
-    "GL_ANGLE_framebuffer_multisample",
-    "GL_OES_rgb8_rgba8",
-    "GL_ARB_robustness",
-    "GL_EXT_robustness",
-    "GL_ARB_sync",
-    "GL_OES_EGL_image",
-    "GL_OES_EGL_sync",
-    "GL_OES_EGL_image_external",
-    "GL_EXT_packed_depth_stencil",
-    "GL_OES_element_index_uint",
-    "GL_OES_vertex_array_object",
-    "GL_ARB_vertex_array_object",
+    "GL_APPLE_client_storage",
+    "GL_APPLE_texture_range",
     "GL_APPLE_vertex_array_object",
+    "GL_ARB_ES2_compatibility",
+    "GL_ARB_ES3_compatibility",
+    "GL_ARB_color_buffer_float",
+    "GL_ARB_depth_texture",
     "GL_ARB_draw_buffers",
-    "GL_EXT_draw_buffers",
-    "GL_EXT_gpu_shader4",
-    "GL_EXT_blend_minmax",
     "GL_ARB_draw_instanced",
-    "GL_EXT_draw_instanced",
-    "GL_NV_draw_instanced",
-    "GL_ARB_instanced_arrays",
-    "GL_NV_instanced_arrays",
-    "GL_ANGLE_instanced_arrays",
-    "GL_EXT_occlusion_query_boolean",
-    "GL_ARB_occlusion_query2",
-    "GL_EXT_transform_feedback",
-    "GL_NV_transform_feedback",
-    "GL_ANGLE_depth_texture",
-    "GL_EXT_sRGB",
-    "GL_EXT_texture_sRGB",
+    "GL_ARB_framebuffer_object",
     "GL_ARB_framebuffer_sRGB",
-    "GL_EXT_framebuffer_sRGB",
-    "GL_KHR_debug",
     "GL_ARB_half_float_pixel",
-    "GL_EXT_frag_depth",
-    "GL_OES_compressed_ETC1_RGB8_texture",
+    "GL_ARB_instanced_arrays",
+    "GL_ARB_occlusion_query2",
+    "GL_ARB_pixel_buffer_object",
+    "GL_ARB_robustness",
+    "GL_ARB_sync",
+    "GL_ARB_texture_float",
+    "GL_ARB_texture_non_power_of_two",
+    "GL_ARB_texture_rectangle",
+    "GL_ARB_vertex_array_object",
+    "GL_EXT_bgra",
+    "GL_EXT_blend_minmax",
+    "GL_EXT_color_buffer_float",
+    "GL_EXT_color_buffer_half_float",
+    "GL_EXT_draw_buffers",
+    "GL_EXT_draw_instanced",
     "GL_EXT_draw_range_elements",
+    "GL_EXT_frag_depth",
+    "GL_EXT_framebuffer_blit",
+    "GL_EXT_framebuffer_multisample",
+    "GL_EXT_framebuffer_object",
+    "GL_EXT_framebuffer_sRGB",
+    "GL_EXT_gpu_shader4",
+    "GL_EXT_occlusion_query_boolean",
+    "GL_EXT_packed_depth_stencil",
+    "GL_EXT_read_format_bgra",
+    "GL_EXT_robustness",
+    "GL_EXT_sRGB",
     "GL_EXT_shader_texture_lod",
+    "GL_EXT_texture_compression_dxt1",
+    "GL_EXT_texture_compression_s3tc",
+    "GL_EXT_texture_filter_anisotropic",
+    "GL_EXT_texture_format_BGRA8888",
+    "GL_EXT_texture_sRGB",
+    "GL_EXT_transform_feedback",
+    "GL_EXT_unpack_subimage",
+    "GL_IMG_read_format",
+    "GL_IMG_texture_compression_pvrtc",
+    "GL_IMG_texture_npot",
+    "GL_KHR_debug",
+    "GL_NV_draw_instanced",
     "GL_NV_fence",
+    "GL_NV_half_float",
+    "GL_NV_instanced_arrays",
+    "GL_NV_transform_feedback",
+    "GL_OES_EGL_image",
+    "GL_OES_EGL_image_external",
+    "GL_OES_EGL_sync",
+    "GL_OES_compressed_ETC1_RGB8_texture",
+    "GL_OES_depth24",
+    "GL_OES_depth32",
+    "GL_OES_depth_texture",
+    "GL_OES_element_index_uint",
+    "GL_OES_packed_depth_stencil",
+    "GL_OES_rgb8_rgba8",
+    "GL_OES_standard_derivatives",
+    "GL_OES_stencil8",
+    "GL_OES_texture_float",
+    "GL_OES_texture_float_linear",
+    "GL_OES_texture_half_float",
+    "GL_OES_texture_half_float_linear",
+    "GL_OES_texture_npot",
+    "GL_OES_vertex_array_object",
     nullptr
 };
 
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 409c0de84721..3c94439da9e5 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -332,87 +332,87 @@ public:
      */
     enum GLExtensions {
         Extension_None = 0,
-        EXT_framebuffer_object,
-        ARB_framebuffer_object,
-        ARB_texture_rectangle,
-        EXT_bgra,
-        EXT_texture_format_BGRA8888,
-        OES_depth24,
-        OES_depth32,
-        OES_stencil8,
-        OES_texture_npot,
-        IMG_texture_npot,
-        ARB_depth_texture,
-        OES_depth_texture,
-        OES_packed_depth_stencil,
-        IMG_read_format,
-        EXT_read_format_bgra,
-        APPLE_client_storage,
-        APPLE_texture_range,
-        ARB_texture_non_power_of_two,
-        ARB_pixel_buffer_object,
-        ARB_ES2_compatibility,
-        ARB_ES3_compatibility,
-        OES_texture_float,
-        OES_texture_float_linear,
-        ARB_texture_float,
-        OES_texture_half_float,
-        OES_texture_half_float_linear,
-        NV_half_float,
-        EXT_color_buffer_float,
-        EXT_color_buffer_half_float,
-        ARB_color_buffer_float,
-        EXT_unpack_subimage,
-        OES_standard_derivatives,
-        EXT_texture_filter_anisotropic,
-        EXT_texture_compression_s3tc,
-        EXT_texture_compression_dxt1,
+        AMD_compressed_ATC_texture,
+        ANGLE_depth_texture,
+        ANGLE_framebuffer_blit,
+        ANGLE_framebuffer_multisample,
+        ANGLE_instanced_arrays,
         ANGLE_texture_compression_dxt3,
         ANGLE_texture_compression_dxt5,
-        AMD_compressed_ATC_texture,
-        IMG_texture_compression_pvrtc,
-        EXT_framebuffer_blit,
-        ANGLE_framebuffer_blit,
-        EXT_framebuffer_multisample,
-        ANGLE_framebuffer_multisample,
-        OES_rgb8_rgba8,
-        ARB_robustness,
-        EXT_robustness,
-        ARB_sync,
-        OES_EGL_image,
-        OES_EGL_sync,
-        OES_EGL_image_external,
-        EXT_packed_depth_stencil,
-        OES_element_index_uint,
-        OES_vertex_array_object,
-        ARB_vertex_array_object,
+        APPLE_client_storage,
+        APPLE_texture_range,
         APPLE_vertex_array_object,
+        ARB_ES2_compatibility,
+        ARB_ES3_compatibility,
+        ARB_color_buffer_float,
+        ARB_depth_texture,
         ARB_draw_buffers,
-        EXT_draw_buffers,
-        EXT_gpu_shader4,
-        EXT_blend_minmax,
         ARB_draw_instanced,
-        EXT_draw_instanced,
-        NV_draw_instanced,
-        ARB_instanced_arrays,
-        NV_instanced_arrays,
-        ANGLE_instanced_arrays,
-        EXT_occlusion_query_boolean,
-        ARB_occlusion_query2,
-        EXT_transform_feedback,
-        NV_transform_feedback,
-        ANGLE_depth_texture,
-        EXT_sRGB,
-        EXT_texture_sRGB,
+        ARB_framebuffer_object,
         ARB_framebuffer_sRGB,
-        EXT_framebuffer_sRGB,
-        KHR_debug,
         ARB_half_float_pixel,
-        EXT_frag_depth,
-        OES_compressed_ETC1_RGB8_texture,
+        ARB_instanced_arrays,
+        ARB_occlusion_query2,
+        ARB_pixel_buffer_object,
+        ARB_robustness,
+        ARB_sync,
+        ARB_texture_float,
+        ARB_texture_non_power_of_two,
+        ARB_texture_rectangle,
+        ARB_vertex_array_object,
+        EXT_bgra,
+        EXT_blend_minmax,
+        EXT_color_buffer_float,
+        EXT_color_buffer_half_float,
+        EXT_draw_buffers,
+        EXT_draw_instanced,
         EXT_draw_range_elements,
+        EXT_frag_depth,
+        EXT_framebuffer_blit,
+        EXT_framebuffer_multisample,
+        EXT_framebuffer_object,
+        EXT_framebuffer_sRGB,
+        EXT_gpu_shader4,
+        EXT_occlusion_query_boolean,
+        EXT_packed_depth_stencil,
+        EXT_read_format_bgra,
+        EXT_robustness,
+        EXT_sRGB,
         EXT_shader_texture_lod,
+        EXT_texture_compression_dxt1,
+        EXT_texture_compression_s3tc,
+        EXT_texture_filter_anisotropic,
+        EXT_texture_format_BGRA8888,
+        EXT_texture_sRGB,
+        EXT_transform_feedback,
+        EXT_unpack_subimage,
+        IMG_read_format,
+        IMG_texture_compression_pvrtc,
+        IMG_texture_npot,
+        KHR_debug,
+        NV_draw_instanced,
         NV_fence,
+        NV_half_float,
+        NV_instanced_arrays,
+        NV_transform_feedback,
+        OES_EGL_image,
+        OES_EGL_image_external,
+        OES_EGL_sync,
+        OES_compressed_ETC1_RGB8_texture,
+        OES_depth24,
+        OES_depth32,
+        OES_depth_texture,
+        OES_element_index_uint,
+        OES_packed_depth_stencil,
+        OES_rgb8_rgba8,
+        OES_standard_derivatives,
+        OES_stencil8,
+        OES_texture_float,
+        OES_texture_float_linear,
+        OES_texture_half_float,
+        OES_texture_half_float_linear,
+        OES_texture_npot,
+        OES_vertex_array_object,
         Extensions_Max,
         Extensions_End
     };

From a1fac8fd58927a0c3c0c3a7c6bcf5598ae14839a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 12:25:31 -0700
Subject: [PATCH 30/89] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/eefaf8448377
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #22793 from malini/serialfix

Bug 1052609 - only add serial for device runs

========

https://hg.mozilla.org/integration/gaia-central/rev/e57cb92f0be5
Author: Malini Das <mdas@mozilla.com>
Desc: only add serial for device runs

========

https://hg.mozilla.org/integration/gaia-central/rev/65df24f0592e
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #22786 from davehunt/bug1051743

Bug 1051743 - Bump marionette_client dependency to 0.8.2

========

https://hg.mozilla.org/integration/gaia-central/rev/408e86de8836
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1051743 - Bump marionette_client dependency to 0.8.2. r=bsilverberg
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 032b9e35ceb8..99d96a22c000 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "ac2ad84f3387c493bc6c2b1c0496b0fc10a49a49", 
+    "revision": "eefaf8448377f643531ab2d8b366e8335804e550", 
     "repo_path": "/integration/gaia-central"
 }

From b9618707022af5a33991ceb5fc54b3acd5e1872b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 12:31:18 -0700
Subject: [PATCH 31/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 228cb9bea14e..5c4b41425ba3 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 5c5de49e830d..f6c007bcc510 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6e1b7effe75f..e6f80ded0dd1 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 228cb9bea14e..5c4b41425ba3 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index fda8b59317fd..b5d20cbbb7bf 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d9480e1fd113..e82206cdde84 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index f57af41c3ec0..ce1e753f6392 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 0f774290d9aa..e9d73651425c 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 2af3f4aea56c..ba0bb5a820e6 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9f35fca9d818b26c06aa6b7e5c0bef25886f8f20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 1a489abb0356f3eb393f64a094a4e28dff46ca70 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 12:40:31 -0700
Subject: [PATCH 32/89] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b74497e7589a
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #22739 from sfoster/bug-1009793-instanceID-cards

Bug 1009793 - replace cardsByOrigin w. cardsByAppID for card/app lookup. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/16b616b0eed7
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1009793 - replace cardsByOrigin with cardsByAppID for card/app lookup. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/9aeef0ae5a30
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #22639 from yzen/bug-1050390

Bug 1050390 - fixed a11y visibility issues around call screen dialog con...

========

https://hg.mozilla.org/integration/gaia-central/rev/0caae7863062
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1050390 - fixed a11y visibility issues around call screen dialog controls. r=Rik

========

https://hg.mozilla.org/integration/gaia-central/rev/2e2a8e5a7691
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #22764 from asutherland/email-cronsync-save

Bug 987931 - [email] cronsync's self-close races an IndexedDB commit. r=mcav, r=jrburke, r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/e4398d30a21c
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 987931 - [email] cronsync's self-close races an IndexedDB commit. r=mcav, r=jrburke, r=asuth

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/326
which was reviewed by mcav so r=mcav

this patch also includes:
- secret debug menu updates, r=jrburke
- a fix by jrburke to defer header slice creation until needed,
  avoiding cronsync from creating a wasteful slice.  this part is r=asuth
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 99d96a22c000..3283ad0ac47d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "eefaf8448377f643531ab2d8b366e8335804e550", 
+    "revision": "b74497e7589a5efbe3f1a2e54f6896a80896ade3", 
     "repo_path": "/integration/gaia-central"
 }

From dcd167b9beeae74cadab88d0dd67757b5edf3215 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 12:46:22 -0700
Subject: [PATCH 33/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5c4b41425ba3..17401be294c0 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index f6c007bcc510..06fb4bbcfba7 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e6f80ded0dd1..64bd07053977 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5c4b41425ba3..17401be294c0 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index b5d20cbbb7bf..6656259ad428 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index e82206cdde84..bdd46adaf168 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index ce1e753f6392..c7edd49d5df6 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e9d73651425c..a4b2e2027d62 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index ba0bb5a820e6..b418339da4b9 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6d4c5a7ba56158375f80adced67ad0ded7054d6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From e1cecda50b853f7dc4276dff7267c844f18bdb48 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:10:32 -0700
Subject: [PATCH 34/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0e5dd903f5fe
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #22790 from awiss/branding

Bug 1052469 - [email] Update signature default to use proper brand r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/2d1c4ba63a69
Author: Alex Wissmann <awiss@wharton.upenn.edu>
Desc: Bug 1052469 - [email] Update signature default to use proper brand
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3283ad0ac47d..8c900d2741ba 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b74497e7589a5efbe3f1a2e54f6896a80896ade3", 
+    "revision": "0e5dd903f5fec5946e5b40daf97ce8445e75e387", 
     "repo_path": "/integration/gaia-central"
 }

From 7cf6f8862bb4cbf33577014cad0ba689676fbf04 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:11:58 -0700
Subject: [PATCH 35/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 17401be294c0..573544de4601 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 06fb4bbcfba7..a4c451473b01 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 64bd07053977..faf5cc0b77f5 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 17401be294c0..573544de4601 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 6656259ad428..c0936c9b83c4 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index bdd46adaf168..353b52b7071f 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index c7edd49d5df6..68c082eb5ec7 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index a4b2e2027d62..157ca9c4d9df 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b418339da4b9..7d7304cc9744 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0ff9451520a8c43e5efa82081f4b39930b1bc044"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From e2af23bfc5a773934113ea0b333504e2d8b182e5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:21:53 -0700
Subject: [PATCH 36/89] Bumping manifests a=b2g-bump

---
 b2g/config/flame/sources.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c0936c9b83c4..5d0b79519d4e 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -133,7 +133,7 @@
   <project name="platform_external_libnfc-nci" path="external/libnfc-nci" remote="t2m" revision="4186bdecb4dae911b39a8202252cc2310d91b0be"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="320b05a5761eb2a4816f7529c91ea49422979b55"/>
   <project name="platform/frameworks/av" path="frameworks/av" revision="0f7829661cd7125de9dc2c90eca2fa1dbc68dfbf"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="c1019aa8ff3d7f1aa9e3439d3b26ec5f7ef68205"/>
+  <project name="platform/frameworks/base" path="frameworks/base" revision="f9309b4463abd80e0876cd113c892e31d62113b1"/>
   <project name="platform/frameworks/native" path="frameworks/native" revision="268d569074237b53617db8211400d4e3c947ae73"/>
   <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="484802559ed106bac4811bd01c024ca64f741e60"/>
   <project name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="de4ade568b273781416638fbbce13ff31b636ada"/>

From 48bd9a8563efbcfcf2cfa64a7865f5735a67f704 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:35:35 -0700
Subject: [PATCH 37/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1b9ad927701b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22689 from KevinGrandon/bug_1051061_homescreen_dragdrop_error

Bug 1051061 - [VerticalHomescreen] TypeError: this.grid._grid.dragdrop is undefined

========

https://hg.mozilla.org/integration/gaia-central/rev/5e7158c07712
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1051061 - [VerticalHomescreen] TypeError: this.grid._grid.dragdrop is undefined r=djf r=Cwiiis
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8c900d2741ba..49a8986dbd22 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "0e5dd903f5fec5946e5b40daf97ce8445e75e387", 
+    "revision": "1b9ad927701be275e8562bd876a070024f45298b", 
     "repo_path": "/integration/gaia-central"
 }

From 9d86708b91e6b7df22698aa20ad926a70a45340f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:41:22 -0700
Subject: [PATCH 38/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 573544de4601..b827da9a2e08 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a4c451473b01..fff0d7d772d6 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index faf5cc0b77f5..536469aabab1 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 573544de4601..b827da9a2e08 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 5d0b79519d4e..c85ef1bf4127 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 353b52b7071f..229897f8f0d6 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 68c082eb5ec7..5e9ed9e5bf92 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 157ca9c4d9df..b546c08ef17b 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 7d7304cc9744..39a81ac19109 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ec3fe5fc780bb56a8a618c086fc700bbcf18b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From e32f31cb333bbe1bbac3cb2d54ac11f9f4864096 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:50:32 -0700
Subject: [PATCH 39/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4b023ea12541
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22747 from mikehenrty/bug-1041902-cost-control-theme

Bug 1041902 - Add theme color for cost control

========

https://hg.mozilla.org/integration/gaia-central/rev/35c4ae4502c9
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1041902 - Add theme color for cost control
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 49a8986dbd22..830c32b67793 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "1b9ad927701be275e8562bd876a070024f45298b", 
+    "revision": "4b023ea1254146909de9e1f1a9049c65583c95c2", 
     "repo_path": "/integration/gaia-central"
 }

From 110d9d8b2a44584476030f0f6825005e1da9e6df Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 13:56:18 -0700
Subject: [PATCH 40/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b827da9a2e08..677df8398301 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index fff0d7d772d6..0f720655f149 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 536469aabab1..a347845dbd58 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b827da9a2e08..677df8398301 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c85ef1bf4127..455847fd7761 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 229897f8f0d6..e4d9d4e93b6e 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 5e9ed9e5bf92..a7452b95f216 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b546c08ef17b..b5216689f0e3 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 39a81ac19109..c1f670ad3150 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c9b9925202c1419de201871fe40a431d41b50490"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 40aa0d7ccb5fd07057100de2bc8d2b12bd3c3758 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 14:05:33 -0700
Subject: [PATCH 41/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0c5fca6d0896
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22748 from mikehenrty/bug-1041903-dialer-theme

Bug 1041903 - Fix theme color for dialer

========

https://hg.mozilla.org/integration/gaia-central/rev/2a7d0dee72a7
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1041903 - Fix theme color for dialer
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 830c32b67793..dad832e1afcb 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "4b023ea1254146909de9e1f1a9049c65583c95c2", 
+    "revision": "0c5fca6d089629a31a88ccef73e81e72dad640dd", 
     "repo_path": "/integration/gaia-central"
 }

From f04efe5fdcef8844da66a1c1f9e9e3cc5d870f77 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 14:11:19 -0700
Subject: [PATCH 42/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 677df8398301..df91f4f6c794 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 0f720655f149..7c6d5c471fe8 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index a347845dbd58..74da65ebb3de 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 677df8398301..df91f4f6c794 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 455847fd7761..89898cabcfc9 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index e4d9d4e93b6e..6da947cba09c 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index a7452b95f216..3f24a0ed6c3c 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b5216689f0e3..e05f5ad62ebd 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index c1f670ad3150..7697dcb1a2bc 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="de78700b715d5cab59e680ba69545e4fff18846f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ef8b36a70e7f40ce02043b49cce7afc6dcca2b1e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 14:50:32 -0700
Subject: [PATCH 43/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/336ec72b95eb
Author: Fabrice Desré <fabrice@desre.org>
Desc: Merge pull request #22795 from fabricedesre/app-eventhandler

Bug 1052618 - Prepare gaia to mozApps switching to webidl r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/851d1510da1b
Author: Fabrice Desré <fabrice@desre.org>
Desc: Bug 1052618 - Prepare gaia to mozApps switching to webidl r=kgrandon
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index dad832e1afcb..3f113d10481a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "0c5fca6d089629a31a88ccef73e81e72dad640dd", 
+    "revision": "336ec72b95eb1677d298bb7cef4692566314f3db", 
     "repo_path": "/integration/gaia-central"
 }

From 2026f4bf83a341e53f915edcac51028ca8528b39 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 14:56:20 -0700
Subject: [PATCH 44/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index df91f4f6c794..b9173a7f9f9a 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7c6d5c471fe8..02f15718320f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 74da65ebb3de..ea31b89991a3 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index df91f4f6c794..b9173a7f9f9a 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 89898cabcfc9..8bb5a05cf5ec 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 6da947cba09c..d089fbfb9496 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 3f24a0ed6c3c..d4dcba6f0ccf 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e05f5ad62ebd..7e5aac22a2f8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 7697dcb1a2bc..1c8955e4a800 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="99c0095ed363957313a1aefa7f1c6518f1362b93"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 71cb27d2bd40ec8dffa5980c462c0c08b5b2b95e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 15:05:38 -0700
Subject: [PATCH 45/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dfe15fdc1a34
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #22794 from mcav/alarm-enable

Bug 1048352 - All alarms appear to be enabled when app is opened. r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/603173f74e61
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1048352 - All alarms appear to be enabled when app is opened.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3f113d10481a..3f26fbe332d5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "336ec72b95eb1677d298bb7cef4692566314f3db", 
+    "revision": "dfe15fdc1a343e811abf9dbfde2168766aa3b012", 
     "repo_path": "/integration/gaia-central"
 }

From feba128d596d47e64a629e5d9a8d944335809a5a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 15:11:24 -0700
Subject: [PATCH 46/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b9173a7f9f9a..876b1ff700e2 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 02f15718320f..200f4256f5ea 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index ea31b89991a3..464fa00faf60 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b9173a7f9f9a..876b1ff700e2 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 8bb5a05cf5ec..3f3d5e2e8085 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d089fbfb9496..b4a5d9911918 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index d4dcba6f0ccf..0ebd22b2c518 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 7e5aac22a2f8..d88c7a6ddc60 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 1c8955e4a800..eb51226a70a3 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2f05c9c2a10d45f91e1094246d43c5fda57c4e99"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 0669f8cf90e62513cfa6abbbb048e383f4180ca1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 17:00:32 -0700
Subject: [PATCH 47/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/382db8d86514
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #22797 from jrburke/bug1052428-email-test-double-done

Bug 1052428 - Intermittent email/test/unit/app_messages_test.js | Timed out after 120 seconds r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/ed80bae8adac
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1052428 - Intermittent email/test/unit/app_messages_test.js | Timed out after 120 seconds
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3f26fbe332d5..ae1470e7f827 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "dfe15fdc1a343e811abf9dbfde2168766aa3b012", 
+    "revision": "382db8d8651471e1b04300192d722e2d22a3bb80", 
     "repo_path": "/integration/gaia-central"
 }

From 36686be3400b3a20c069733a04fef71e330c24a6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 17:06:28 -0700
Subject: [PATCH 48/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 876b1ff700e2..2bf4e21d18e6 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 200f4256f5ea..d406e4b9e9c6 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 464fa00faf60..b006c89d9507 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 876b1ff700e2..2bf4e21d18e6 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 3f3d5e2e8085..848e8c30228f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b4a5d9911918..d17dc6bc1889 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 0ebd22b2c518..66e006b9038b 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d88c7a6ddc60..4dd8e9460119 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index eb51226a70a3..80d611dad346 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a6282f433f87031e62fe1bf0a79992e8d30ac17"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From b51e3da5a72f38243ba5cf96d5a9d72c9ba53b08 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 17:30:32 -0700
Subject: [PATCH 49/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d71a3e5ede0d
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22798 from mikehenrty/bug-1044984-disable-worker

Bug 1044984 - disable worker_test.js in tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/93bcb5fbb9fc
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1044984 - disable worker_test.js in tbpl
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ae1470e7f827..07c1dd715038 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "382db8d8651471e1b04300192d722e2d22a3bb80", 
+    "revision": "d71a3e5ede0d03f631fb7cf8834ff697bf29262c", 
     "repo_path": "/integration/gaia-central"
 }

From d41f214b965c4d20d9c5ce794b8fb7b66386e89e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 17:36:19 -0700
Subject: [PATCH 50/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 2bf4e21d18e6..fd43437363e6 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index d406e4b9e9c6..0ff3e5695166 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b006c89d9507..fac0c97caf22 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 2bf4e21d18e6..fd43437363e6 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 848e8c30228f..72f5aad04164 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d17dc6bc1889..5dd142f4b191 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 66e006b9038b..9c5321d1d23a 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 4dd8e9460119..28099511c6b9 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 80d611dad346..c1b2f16c4afa 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34f2dc4e9f26cf581cb3911fb078c25040b7ab66"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 1bf030cd76eef67962e6f79752e1ce2782bd5d8d Mon Sep 17 00:00:00 2001
From: Garner Lee <garner.lee@telekom.com>
Date: Mon, 11 Aug 2014 16:03:35 -0700
Subject: [PATCH 51/89] Bug 1050577: [NFC] Techlost not clearing peer appId
 correctly. r=allstars.chh

---
 dom/nfc/gonk/Nfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/nfc/gonk/Nfc.js b/dom/nfc/gonk/Nfc.js
index e85d7f4c9297..a0b22b953228 100644
--- a/dom/nfc/gonk/Nfc.js
+++ b/dom/nfc/gonk/Nfc.js
@@ -514,7 +514,7 @@ Nfc.prototype = {
 
         delete this.sessionTokenMap[this._currentSessionId];
         this._currentSessionId = null;
-        this.currentPeerAppId = null;
+        gMessageManager.currentPeerAppId = null;
         break;
      case "ConfigResponse":
         let target = this.targetsByRequestId[message.requestId];

From dae19a975967cacb230b3a389091db3473177b97 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 21:05:26 -0700
Subject: [PATCH 52/89] Bumping gaia.json for 10 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6aedf00bf4f5
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #22766 from EragonJ/bug-1048846

Bug 1048846 - Intermittent failing test - ime_uninstallation_test

========

https://hg.mozilla.org/integration/gaia-central/rev/79743c4fdf84
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1048846 - Intermittent failing test - ime_uninstallation_test

========

https://hg.mozilla.org/integration/gaia-central/rev/64076dc14d02
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #22706 from EragonJ/bug-1048373

Bug 1048373 - [settings] can't join hidden network, have to join it ...

========

https://hg.mozilla.org/integration/gaia-central/rev/d43a902ba356
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1048373 - [settings] can't join hidden network, have to join it ...

========

https://hg.mozilla.org/integration/gaia-central/rev/6f64a8e9233b
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #22773 from mnjul/bug_1052300_wrong_keyboard_after_ime_switching

Bug 1052300 - [Keyboard] Wrong keyboard may be activated after using IMESwitcher. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/f09ff6fc3e9a
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1052300 - [Keyboard] Wrong keyboard may be activated after using IMESwitcher

========

https://hg.mozilla.org/integration/gaia-central/rev/cc5a323903f7
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #22780 from evanxd/bug-1052252

Bug 1052252 - Set the scrolling speed as 500

========

https://hg.mozilla.org/integration/gaia-central/rev/3b94155d2eaf
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 1052252 - Set the scrolling speed as 500 r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/333f71a7d876
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22696 from timdream/keyboard-const

Bug 1048095 - Remove "const" in keyboard app, r=rudyl, f=djf, sangpire

========

https://hg.mozilla.org/integration/gaia-central/rev/08cb92665e14
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1048095 - Remove "const" in keyboard app
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 07c1dd715038..e6e347e96850 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "d71a3e5ede0d03f631fb7cf8834ff697bf29262c", 
+    "revision": "6aedf00bf4f58882d1f011f0cb4ebcb07c41f369", 
     "repo_path": "/integration/gaia-central"
 }

From 72982c6b564d07d4d8d626458b8c803a2d0bbf5a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 21:11:46 -0700
Subject: [PATCH 53/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index fd43437363e6..ae148d483e52 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 0ff3e5695166..210eb2c16b03 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fac0c97caf22..b5cdae4d5f98 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index fd43437363e6..ae148d483e52 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 72f5aad04164..edd2179ad0a1 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 5dd142f4b191..2c6dc4c9481c 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 9c5321d1d23a..74016809b6f5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 28099511c6b9..8d8965fa6dac 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index c1b2f16c4afa..83aca4778887 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="31cd87328f5fc76c60097d25354fe84bd6456542"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 9031089463bf328ae29a5c5ca4552219d7462478 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Tue, 12 Aug 2014 11:50:30 +0900
Subject: [PATCH 54/89] Bug 1050660 - setInputMethodActive doesn't sometimes
 work when switching IME imminently after boot. r=fabrice

---
 dom/browser-element/BrowserElementParent.jsm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dom/browser-element/BrowserElementParent.jsm b/dom/browser-element/BrowserElementParent.jsm
index 517d4d361f33..1baf02c13913 100644
--- a/dom/browser-element/BrowserElementParent.jsm
+++ b/dom/browser-element/BrowserElementParent.jsm
@@ -68,6 +68,8 @@ this.BrowserElementParentBuilder = {
 function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
   debug("Creating new BrowserElementParent object for " + frameLoader);
   this._domRequestCounter = 0;
+  this._domRequestReady = false;
+  this._pendingAPICalls = [];
   this._pendingDOMRequests = {};
   this._pendingSetInputMethodActive = [];
   this._hasRemoteFrame = hasRemoteFrame;
@@ -94,7 +96,7 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
 
   let defineNoReturnMethod = function(name, fn) {
     XPCNativeWrapper.unwrap(self._frameElement)[name] = function method() {
-      if (!self._mm) {
+      if (!self._domRequestReady) {
         // Remote browser haven't been created, we just queue the API call.
         let args = Array.slice(arguments);
         args.unshift(self);
@@ -175,7 +177,6 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
   } else {
     // if we are a pending frame, we setup message manager after
     // observing remote-browser-frame-shown
-    this._pendingAPICalls = [];
     Services.obs.addObserver(this, 'remote-browser-frame-shown', /* ownsWeak = */ true);
   }
 }
@@ -348,6 +349,13 @@ BrowserElementParent.prototype = {
       this._ownerVisibilityChange();
     }
 
+    if (!this._domRequestReady) {
+      // At least, one message listener such as for hello is registered.
+      // So we can use sendAsyncMessage now.
+      this._domRequestReady = true;
+      this._runPendingAPICall();
+    }
+
     return {
       name: this._frameElement.getAttribute('name'),
       fullscreenAllowed:
@@ -509,7 +517,7 @@ BrowserElementParent.prototype = {
         Services.DOMRequest.fireErrorAsync(req, "fail");
       }
     };
-    if (this._mm) {
+    if (this._domRequestReady) {
       send();
     } else {
       // Child haven't been loaded.
@@ -775,7 +783,7 @@ BrowserElementParent.prototype = {
       if (self._nextPaintListeners.push(listener) == 1)
         self._sendAsyncMsg('activate-next-paint-listener');
     };
-    if (!this._mm) {
+    if (!this._domRequestReady) {
       this._pendingAPICalls.push(run);
     } else {
       run();
@@ -798,7 +806,7 @@ BrowserElementParent.prototype = {
       if (self._nextPaintListeners.length == 0)
         self._sendAsyncMsg('deactivate-next-paint-listener');
     };
-    if (!this._mm) {
+    if (!this._domRequestReady) {
       this._pendingAPICalls.push(run);
     } else {
       run();
@@ -886,7 +894,6 @@ BrowserElementParent.prototype = {
         if (!this._mm) {
           this._setupMessageListener();
           this._registerAppManifest();
-          this._runPendingAPICall();
         }
         Services.obs.removeObserver(this, 'remote-browser-frame-shown');
       }

From ae0690b0eb9a9c85108e9e1d874ddc402582b7b0 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:27 +1200
Subject: [PATCH 55/89] Bug 1050060 - Clean up MP4 index fields; r=edwin

---
 media/libstagefright/binding/Box.cpp         |  2 +-
 media/libstagefright/binding/mp4_demuxer.cpp | 41 +++++++-------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/media/libstagefright/binding/Box.cpp b/media/libstagefright/binding/Box.cpp
index d33cfcc634ac..8e28806066cc 100644
--- a/media/libstagefright/binding/Box.cpp
+++ b/media/libstagefright/binding/Box.cpp
@@ -58,7 +58,7 @@ Box::Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent)
   }
 
   MediaByteRange boxRange(aOffset, aOffset + size);
-  if (boxRange.mEnd > mChildOffset ||
+  if (mChildOffset >= boxRange.mEnd ||
       (mParent && !mParent->mRange.Contains(boxRange)) ||
       !byteRange->Contains(boxRange)) {
     return;
diff --git a/media/libstagefright/binding/mp4_demuxer.cpp b/media/libstagefright/binding/mp4_demuxer.cpp
index f4d9242bb129..5daf7dd75bf9 100644
--- a/media/libstagefright/binding/mp4_demuxer.cpp
+++ b/media/libstagefright/binding/mp4_demuxer.cpp
@@ -24,11 +24,11 @@ struct StageFrightPrivate
 
   sp<MediaSource> mAudio;
   MediaSource::ReadOptions mAudioOptions;
-  nsAutoPtr<Index> mAudioIndex;
 
   sp<MediaSource> mVideo;
   MediaSource::ReadOptions mVideoOptions;
-  nsAutoPtr<Index> mVideoIndex;
+
+  nsTArray<nsAutoPtr<Index>> mIndexes;
 };
 
 class DataSourceAdapter : public DataSource
@@ -101,14 +101,14 @@ MP4Demuxer::Init()
       mPrivate->mAudio = e->getTrack(i);
       mPrivate->mAudio->start();
       mAudioConfig.Update(metaData, mimeType);
-      auto index = mPrivate->mAudio->exportIndex();
-      mPrivate->mAudioIndex = new Index(index, mSource, mAudioConfig.mTrackId);
+      mPrivate->mIndexes.AppendElement(new Index(
+        mPrivate->mAudio->exportIndex(), mSource, mAudioConfig.mTrackId));
     } else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) {
       mPrivate->mVideo = e->getTrack(i);
       mPrivate->mVideo->start();
       mVideoConfig.Update(metaData, mimeType);
-      auto index = mPrivate->mVideo->exportIndex();
-      mPrivate->mVideoIndex = new Index(index, mSource, mVideoConfig.mTrackId);
+      mPrivate->mIndexes.AppendElement(new Index(
+        mPrivate->mVideo->exportIndex(), mSource, mVideoConfig.mTrackId));
     }
   }
   sp<MetaData> metaData = e->getMetaData();
@@ -199,33 +199,20 @@ MP4Demuxer::ConvertByteRangesToTime(
   const nsTArray<mozilla::MediaByteRange>& aByteRanges,
   nsTArray<Interval<Microseconds>>* aIntervals)
 {
-  if (!HasValidVideo() && !HasValidAudio()) {
+  if (mPrivate->mIndexes.IsEmpty()) {
     return;
   }
 
-  nsTArray<Interval<Microseconds>> video;
-  if (HasValidVideo()) {
-    nsTArray<Interval<Microseconds>> ranges;
-    if (!HasValidAudio()) {
-      mPrivate->mVideoIndex->ConvertByteRangesToTimeRanges(aByteRanges,
-                                                           aIntervals);
-      return;
-    }
-    mPrivate->mVideoIndex->ConvertByteRangesToTimeRanges(aByteRanges, &video);
-  }
+  mPrivate->mIndexes[0]->ConvertByteRangesToTimeRanges(aByteRanges, aIntervals);
 
-  nsTArray<Interval<Microseconds>> audio;
-  if (HasValidAudio()) {
+  for (int i = 1; i < mPrivate->mIndexes.Length(); i++) {
     nsTArray<Interval<Microseconds>> ranges;
-    if (!HasValidVideo()) {
-      mPrivate->mAudioIndex->ConvertByteRangesToTimeRanges(aByteRanges,
-                                                           aIntervals);
-      return;
-    }
-    mPrivate->mAudioIndex->ConvertByteRangesToTimeRanges(aByteRanges, &audio);
-  }
+    mPrivate->mIndexes[i]->ConvertByteRangesToTimeRanges(aByteRanges, &ranges);
 
-  Interval<Microseconds>::Intersection(audio, video, aIntervals);
+    nsTArray<Interval<Microseconds>> intersection;
+    Interval<Microseconds>::Intersection(*aIntervals, ranges, &intersection);
+    *aIntervals = intersection;
+  }
 }
 
 } // namespace mp4_demuxer

From 4f53a7c1a65c627959af13e53261423b9c93da16 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:28 +1200
Subject: [PATCH 56/89] Bug 1050060 - Update index off main thread; r=edwin

---
 content/media/fmp4/MP4Reader.cpp | 12 ++++++++++++
 content/media/fmp4/MP4Reader.h   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/content/media/fmp4/MP4Reader.cpp b/content/media/fmp4/MP4Reader.cpp
index 119de3864905..2b8244051ca2 100644
--- a/content/media/fmp4/MP4Reader.cpp
+++ b/content/media/fmp4/MP4Reader.cpp
@@ -744,6 +744,18 @@ MP4Reader::Seek(int64_t aTime,
 void
 MP4Reader::NotifyDataArrived(const char* aBuffer, uint32_t aLength,
                              int64_t aOffset)
+{
+  if (NS_IsMainThread()) {
+    MediaTaskQueue* queue =
+      mAudio.mTaskQueue ? mAudio.mTaskQueue : mVideo.mTaskQueue;
+    queue->Dispatch(NS_NewRunnableMethod(this, &MP4Reader::UpdateIndex));
+  } else {
+    UpdateIndex();
+  }
+}
+
+void
+MP4Reader::UpdateIndex()
 {
   nsTArray<MediaByteRange> ranges;
   if (NS_FAILED(mDecoder->GetResource()->GetCachedRanges(ranges))) {
diff --git a/content/media/fmp4/MP4Reader.h b/content/media/fmp4/MP4Reader.h
index 4bf010c678e0..6bc00ad18b31 100644
--- a/content/media/fmp4/MP4Reader.h
+++ b/content/media/fmp4/MP4Reader.h
@@ -86,6 +86,7 @@ private:
   bool Decode(mp4_demuxer::TrackType aTrack);
   void Flush(mp4_demuxer::TrackType aTrack);
   void DrainComplete(mp4_demuxer::TrackType aTrack);
+  void UpdateIndex();
   void NotifyResourcesStatusChanged();
   bool IsWaitingOnCodecResource();
   bool IsWaitingOnCDMResource();

From 2c2bccb36d3138003b417719ab4b574627602484 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:28 +1200
Subject: [PATCH 57/89] Bug 1050060 - Optimise MP4 range calculation; r=edwin

---
 content/media/MediaResource.h                 |  7 ++
 media/libstagefright/binding/Index.cpp        | 18 +++-
 media/libstagefright/binding/MoofParser.cpp   | 87 ++++++++-----------
 .../binding/include/mp4_demuxer/Box.h         |  3 +
 .../binding/include/mp4_demuxer/Index.h       |  2 +
 .../binding/include/mp4_demuxer/Interval.h    | 11 +++
 .../binding/include/mp4_demuxer/MoofParser.h  | 27 ++++--
 7 files changed, 95 insertions(+), 60 deletions(-)

diff --git a/content/media/MediaResource.h b/content/media/MediaResource.h
index f386df90de1d..12892b25d3c5 100644
--- a/content/media/MediaResource.h
+++ b/content/media/MediaResource.h
@@ -17,6 +17,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/TimeStamp.h"
 #include "nsThreadUtils.h"
+#include <algorithm>
 
 // For HTTP seeking, if number of bytes needing to be
 // seeked forward is less than this value then a read is
@@ -151,6 +152,12 @@ public:
     return aByteRange.mStart >= mStart && aByteRange.mEnd <= mEnd;
   }
 
+  MediaByteRange Extents(const MediaByteRange& aByteRange) const
+  {
+    return MediaByteRange(std::min(mStart, aByteRange.mStart),
+                          std::max(mEnd, aByteRange.mEnd));
+  }
+
   int64_t mStart, mEnd;
 };
 
diff --git a/media/libstagefright/binding/Index.cpp b/media/libstagefright/binding/Index.cpp
index 75e2374dc095..eaed3b2c16f0 100644
--- a/media/libstagefright/binding/Index.cpp
+++ b/media/libstagefright/binding/Index.cpp
@@ -83,11 +83,16 @@ Index::Index(const stagefright::Vector<MediaSource::Indice>& aIndex,
   }
 }
 
+Index::~Index() {}
+
 void
 Index::ConvertByteRangesToTimeRanges(
   const nsTArray<MediaByteRange>& aByteRanges,
   nsTArray<Interval<Microseconds>>* aTimeRanges)
 {
+  RangeFinder rangeFinder(aByteRanges);
+  nsTArray<Interval<Microseconds>> timeRanges;
+
   nsTArray<stagefright::MediaSource::Indice> moofIndex;
   nsTArray<stagefright::MediaSource::Indice>* index;
   if (mMoofParser) {
@@ -98,16 +103,21 @@ Index::ConvertByteRangesToTimeRanges(
       // We take the index out of the moof parser and move it into a local
       // variable so we don't get concurrency issues. It gets freed when we
       // exit this function.
-      moofIndex = mMoofParser->mIndex;
+      for (int i = 0; i < mMoofParser->mMoofs.Length(); i++) {
+        Moof& moof = mMoofParser->mMoofs[i];
+        if (rangeFinder.Contains(moof.mRange) &&
+            rangeFinder.Contains(moof.mMdatRange)) {
+          timeRanges.AppendElements(moof.mTimeRanges);
+        } else {
+          moofIndex.AppendElements(mMoofParser->mMoofs[i].mIndex);
+        }
+      }
     }
     index = &moofIndex;
   } else {
     index = &mIndex;
   }
 
-  nsTArray<Interval<Microseconds>> timeRanges;
-  RangeFinder rangeFinder(aByteRanges);
-
   bool hasSync = false;
   for (size_t i = 0; i < index->Length(); i++) {
     const MediaSource::Indice& indice = (*index)[i];
diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp
index 45625bd4fb5c..89bf631b83a0 100644
--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -4,52 +4,26 @@
 
 #include "mp4_demuxer/MoofParser.h"
 #include "mp4_demuxer/Box.h"
-#include "MediaResource.h"
-
-using namespace stagefright;
-using namespace mozilla;
 
 namespace mp4_demuxer
 {
 
-class Moof
-{
-public:
-  Moof(Box& aBox, MoofParser* aMoofParser);
-  void ParseTraf(Box& aBox);
-  void ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt);
-
-private:
-  MoofParser* mMoofParser;
-};
+using namespace stagefright;
+using namespace mozilla;
 
 void
 MoofParser::RebuildFragmentedIndex(const nsTArray<MediaByteRange>& aByteRanges)
 {
   BoxContext context(mSource, aByteRanges);
 
-  mIndex.Clear();
-  size_t moofCount = 0;
-  for (size_t i = 0; i + 1 < mMoofOffsets.Length(); i++) {
-    Box box(&context, mMoofOffsets[i]);
-    if (box.IsAvailable()) {
-      MOZ_ASSERT(box.IsType("moof"));
-      Moof(box, this);
-    }
-  }
-  for (Box box = mMoofOffsets.IsEmpty()
-                   ? Box(&context, 0)
-                   : Box(&context, mMoofOffsets.LastElement());
-       box.IsAvailable(); box = box.Next()) {
+  Box box(&context, mOffset);
+  for (; box.IsAvailable(); box = box.Next()) {
     if (box.IsType("moov")) {
       ParseMoov(box);
     } else if (box.IsType("moof")) {
-      if (mMoofOffsets.IsEmpty() ||
-          mMoofOffsets.LastElement() != box.Offset()) {
-        mMoofOffsets.AppendElement(box.Offset());
-      }
-      Moof(box, this);
+      mMoofs.AppendElement(Moof(box, mTrex, mMdhd));
     }
+    mOffset = box.NextOffset();
   }
 }
 
@@ -73,7 +47,9 @@ MoofParser::ParseTrak(Box& aBox)
     if (box.IsType("tkhd")) {
       tkhd = Tkhd(box);
     } else if (box.IsType("mdia")) {
-      ParseMdia(box, tkhd);
+      if (tkhd.mTrackId == mTrex.mTrackId) {
+        ParseMdia(box, tkhd);
+      }
     }
   }
 }
@@ -83,9 +59,7 @@ MoofParser::ParseMdia(Box& aBox, Tkhd& aTkhd)
 {
   for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("mdhd")) {
-      if (mTrackId == aTkhd.mTrackId) {
-        mMdhd = Mdhd(box);
-      }
+      mMdhd = Mdhd(box);
     }
   }
 }
@@ -95,42 +69,45 @@ MoofParser::ParseMvex(Box& aBox)
 {
   for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("trex")) {
-      mTrex = Trex(box);
+      Trex trex = Trex(box);
+      if (trex.mTrackId == mTrex.mTrackId) {
+        mTrex = trex;
+      }
     }
   }
 }
 
-Moof::Moof(Box& aBox, MoofParser* aMoofParser) : mMoofParser(aMoofParser)
+Moof::Moof(Box& aBox, Trex& aTrex, Mdhd& aMdhd) : mRange(aBox.Range())
 {
   for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("traf")) {
-      ParseTraf(box);
+      ParseTraf(box, aTrex, aMdhd);
     }
   }
 }
 
 void
-Moof::ParseTraf(Box& aBox)
+Moof::ParseTraf(Box& aBox, Trex& aTrex, Mdhd& aMdhd)
 {
-  Tfhd tfhd(mMoofParser->mTrex);
+  Tfhd tfhd(aTrex);
   Tfdt tfdt;
   for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("tfhd")) {
-      tfhd = Tfhd(box, mMoofParser->mTrex);
+      tfhd = Tfhd(box, aTrex);
     } else if (box.IsType("tfdt")) {
       tfdt = Tfdt(box);
     } else if (box.IsType("trun")) {
-      if (mMoofParser->mTrackId == tfhd.mTrackId) {
-        ParseTrun(box, tfhd, tfdt);
+      if (tfhd.mTrackId == aTrex.mTrackId) {
+        ParseTrun(box, tfhd, tfdt, aMdhd);
       }
     }
   }
 }
 
 void
-Moof::ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt)
+Moof::ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt, Mdhd& aMdhd)
 {
-  if (!mMoofParser->mMdhd.mTimescale) {
+  if (!aMdhd.mTimescale) {
     return;
   }
 
@@ -147,6 +124,7 @@ Moof::ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt)
   bool hasFirstSampleFlags = flags & 4;
   uint32_t firstSampleFlags = hasFirstSampleFlags ? reader->ReadU32() : 0;
   uint64_t decodeTime = aTfdt.mBaseMediaDecodeTime;
+  nsTArray<Interval<Microseconds>> timeRanges;
   for (size_t i = 0; i < sampleCount; i++) {
     uint32_t sampleDuration =
       flags & 0x100 ? reader->ReadU32() : aTfhd.mDefaultSampleDuration;
@@ -164,15 +142,26 @@ Moof::ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt)
     indice.end_offset = offset;
 
     indice.start_composition =
-      ((decodeTime + ctsOffset) * 1000000ll) / mMoofParser->mMdhd.mTimescale;
+      ((decodeTime + ctsOffset) * 1000000ll) / aMdhd.mTimescale;
     decodeTime += sampleDuration;
     indice.end_composition =
-      ((decodeTime + ctsOffset) * 1000000ll) / mMoofParser->mMdhd.mTimescale;
+      ((decodeTime + ctsOffset) * 1000000ll) / aMdhd.mTimescale;
 
     indice.sync = !(sampleFlags & 0x1010000);
 
-    mMoofParser->mIndex.AppendElement(indice);
+    mIndex.AppendElement(indice);
+
+    MediaByteRange compositionRange(indice.start_offset, indice.end_offset);
+    if (mMdatRange.IsNull()) {
+      mMdatRange = compositionRange;
+    } else {
+      mMdatRange = mMdatRange.Extents(compositionRange);
+    }
+    Interval<Microseconds>::SemiNormalAppend(
+      timeRanges,
+      Interval<Microseconds>(indice.start_composition, indice.end_composition));
   }
+  Interval<Microseconds>::Normalize(timeRanges, &mTimeRanges);
 }
 
 Tkhd::Tkhd(Box& aBox)
diff --git a/media/libstagefright/binding/include/mp4_demuxer/Box.h b/media/libstagefright/binding/include/mp4_demuxer/Box.h
index c5dbf600bd0d..d0cb81ae5f48 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/Box.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/Box.h
@@ -39,6 +39,9 @@ public:
   bool IsAvailable() const { return !mRange.IsNull(); }
   uint64_t Offset() const { return mRange.mStart; }
   uint64_t Length() const { return mRange.mEnd - mRange.mStart; }
+  uint64_t NextOffset() const { return mRange.mEnd; }
+  const MediaByteRange& Range() const { return mRange; }
+
   const Box* Parent() const { return mParent; }
 
   bool IsType(const char* aType) const
diff --git a/media/libstagefright/binding/include/mp4_demuxer/Index.h b/media/libstagefright/binding/include/mp4_demuxer/Index.h
index 81bb23824ade..618a905d4c75 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/Index.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/Index.h
@@ -20,6 +20,8 @@ class Index
 public:
   Index(const stagefright::Vector<stagefright::MediaSource::Indice>& aIndex,
         Stream* aSource, uint32_t aTrackId);
+  ~Index();
+
   void ConvertByteRangesToTimeRanges(
     const nsTArray<mozilla::MediaByteRange>& aByteRanges,
     nsTArray<Interval<Microseconds>>* aTimeRanges);
diff --git a/media/libstagefright/binding/include/mp4_demuxer/Interval.h b/media/libstagefright/binding/include/mp4_demuxer/Interval.h
index 2e16c675b66a..61268acdb8a4 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/Interval.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/Interval.h
@@ -41,6 +41,17 @@ struct Interval
   T start;
   T end;
 
+  static void SemiNormalAppend(nsTArray<Interval<T>>& aIntervals,
+                               Interval<T> aInterval)
+  {
+    if (!aIntervals.IsEmpty() &&
+        aIntervals.LastElement().end == aInterval.start) {
+      aIntervals.LastElement().end = aInterval.end;
+    } else {
+      aIntervals.AppendElement(aInterval);
+    }
+  }
+
   static void Normalize(const nsTArray<Interval<T>>& aIntervals,
                         nsTArray<Interval<T>>* aNormalized)
   {
diff --git a/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h b/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
index 25d5074cf7c5..2f0cbdef7476 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
@@ -7,13 +7,13 @@
 
 #include "media/stagefright/MediaSource.h"
 #include "mp4_demuxer/mp4_demuxer.h"
-
-namespace mozilla { class MediaByteRange; }
+#include "MediaResource.h"
 
 namespace mp4_demuxer {
 
 class Stream;
 class Box;
+class Moof;
 
 class Tkhd
 {
@@ -54,9 +54,9 @@ public:
 class Trex
 {
 public:
-  Trex()
+  Trex(uint32_t aTrackId)
     : mFlags(0)
-    , mTrackId(0)
+    , mTrackId(aTrackId)
     , mDefaultSampleDescriptionIndex(0)
     , mDefaultSampleDuration(0)
     , mDefaultSampleSize(0)
@@ -92,11 +92,24 @@ public:
   uint64_t mBaseMediaDecodeTime;
 };
 
+class Moof
+{
+public:
+  Moof(Box& aBox, Trex& aTrex, Mdhd& aMdhd);
+  void ParseTraf(Box& aBox, Trex& aTrex, Mdhd& aMdhd);
+  void ParseTrun(Box& aBox, Tfhd& aTfhd, Tfdt& aTfdt, Mdhd& aMdhd);
+
+  mozilla::MediaByteRange mRange;
+  mozilla::MediaByteRange mMdatRange;
+  nsTArray<Interval<Microseconds>> mTimeRanges;
+  nsTArray<stagefright::MediaSource::Indice> mIndex;
+};
+
 class MoofParser
 {
 public:
   MoofParser(Stream* aSource, uint32_t aTrackId)
-    : mSource(aSource), mTrackId(aTrackId)
+    : mSource(aSource), mOffset(0), mTrex(aTrackId)
   {
   }
   void RebuildFragmentedIndex(
@@ -107,12 +120,12 @@ public:
   void ParseMvex(Box& aBox);
 
   nsRefPtr<Stream> mSource;
-  uint32_t mTrackId;
+  uint64_t mOffset;
   nsTArray<uint64_t> mMoofOffsets;
   Mdhd mMdhd;
   Trex mTrex;
   Tfdt mTfdt;
-  nsTArray<stagefright::MediaSource::Indice> mIndex;
+  nsTArray<Moof> mMoofs;
 };
 }
 

From fa358b339a2dd9da5c73679c8d6e255d9e75168c Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:28 +1200
Subject: [PATCH 58/89] Bug 1050060 - Fix MP4 range pinning; r=edwin

---
 content/media/fmp4/MP4Reader.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/content/media/fmp4/MP4Reader.cpp b/content/media/fmp4/MP4Reader.cpp
index 2b8244051ca2..437b3a10e57c 100644
--- a/content/media/fmp4/MP4Reader.cpp
+++ b/content/media/fmp4/MP4Reader.cpp
@@ -758,12 +758,14 @@ void
 MP4Reader::UpdateIndex()
 {
   nsTArray<MediaByteRange> ranges;
-  if (NS_FAILED(mDecoder->GetResource()->GetCachedRanges(ranges))) {
-    return;
-  }
-
   nsTArray<Interval<Microseconds>> timeRanges;
-  mDemuxer->ConvertByteRangesToTime(ranges, &timeRanges);
+
+  MediaResource* resource = mDecoder->GetResource();
+  resource->Pin();
+  if (NS_SUCCEEDED(resource->GetCachedRanges(ranges))) {
+    mDemuxer->ConvertByteRangesToTime(ranges, &timeRanges);
+  }
+  resource->Unpin();
 
   MonitorAutoLock mon(mTimeRangesMonitor);
   mTimeRanges = timeRanges;

From 4c33e4d4acb4c58e125ec7f0e250686a17619ff8 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:28 +1200
Subject: [PATCH 59/89] Bug 1050060 - Fix 64 bit file offset in MP4 reader;
 r=edwin

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

diff --git a/content/media/fmp4/MP4Reader.cpp b/content/media/fmp4/MP4Reader.cpp
index 437b3a10e57c..f60a9983f433 100644
--- a/content/media/fmp4/MP4Reader.cpp
+++ b/content/media/fmp4/MP4Reader.cpp
@@ -78,7 +78,7 @@ public:
     uint32_t sum = 0;
     uint32_t bytesRead = 0;
     do {
-      uint32_t offset = aOffset + sum;
+      uint64_t offset = aOffset + sum;
       char* buffer = reinterpret_cast<char*>(aBuffer) + sum;
       uint32_t toRead = aCount - sum;
       nsresult rv = mResource->ReadAt(offset, buffer, toRead, &bytesRead);

From b8b01041ffe4c511d6fdd24304c79afa1bd7bc30 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Wed, 13 Aug 2014 17:13:28 +1200
Subject: [PATCH 60/89] Bug 1051666 - Add avc3 atom support to MP4 parser;
 r=edwin

---
 .../frameworks/av/media/libstagefright/MPEG4Extractor.cpp       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
index 33a0db99deb8..93ac8e5cfe20 100644
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -314,6 +314,7 @@ static const char *FourCC2MIME(uint32_t fourcc) {
             return MEDIA_MIMETYPE_VIDEO_H263;
 
         case FOURCC('a', 'v', 'c', '1'):
+        case FOURCC('a', 'v', 'c', '3'):
             return MEDIA_MIMETYPE_VIDEO_AVC;
 
         default:
@@ -1297,6 +1298,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
         case FOURCC('H', '2', '6', '3'):
         case FOURCC('h', '2', '6', '3'):
         case FOURCC('a', 'v', 'c', '1'):
+        case FOURCC('a', 'v', 'c', '3'):
         {
             mHasVideo = true;
 

From e49c62328759b7202651934d8cf22d8e27eda86e Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Wed, 13 Aug 2014 10:13:19 +0200
Subject: [PATCH 61/89] Bug 1052380: Fix builds without Ion after bug 1019831
 landed; r=nbp

---
 js/src/jit/none/Architecture-none.h | 3 +++
 js/src/jit/none/Trampoline-none.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/src/jit/none/Architecture-none.h b/js/src/jit/none/Architecture-none.h
index 33ffec64f590..7878b3ca5cc4 100644
--- a/js/src/jit/none/Architecture-none.h
+++ b/js/src/jit/none/Architecture-none.h
@@ -12,6 +12,9 @@
 namespace js {
 namespace jit {
 
+static const bool SupportsSimd = false;
+static const uint32_t SimdStackAlignment = 0;
+
 class Registers
 {
   public:
diff --git a/js/src/jit/none/Trampoline-none.cpp b/js/src/jit/none/Trampoline-none.cpp
index 9022e6e273e5..f08ae3302913 100644
--- a/js/src/jit/none/Trampoline-none.cpp
+++ b/js/src/jit/none/Trampoline-none.cpp
@@ -35,9 +35,9 @@ uint32_t FrameSizeClass::frameSize() const { MOZ_CRASH(); }
 
 void DispatchIonCache::initializeAddCacheState(LInstruction *, AddCacheState *) { MOZ_CRASH(); }
 
-void MacroAssembler::PushRegsInMask(RegisterSet) { MOZ_CRASH(); }
+void MacroAssembler::PushRegsInMask(RegisterSet, FloatRegisterSet) { MOZ_CRASH(); }
 void MacroAssembler::clampDoubleToUint8(FloatRegister, Register) { MOZ_CRASH(); }
-void MacroAssembler::PopRegsInMaskIgnore(RegisterSet, RegisterSet) { MOZ_CRASH(); }
+void MacroAssembler::PopRegsInMaskIgnore(RegisterSet, RegisterSet, FloatRegisterSet) { MOZ_CRASH(); }
 void MacroAssembler::alignFrameForICArguments(AfterICSaveLive &) { MOZ_CRASH(); }
 void MacroAssembler::restoreFrameAlignmentForICArguments(AfterICSaveLive &) { MOZ_CRASH(); }
 

From 48493473e21eb6743abd8198e94534d56b6aee78 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 13 Aug 2014 10:03:45 +0100
Subject: [PATCH 62/89] Bug 1049440 - Don't crash in jsapi-tests when a test
 fails to initialize r=luke

---
 js/src/jsapi-tests/tests.cpp | 30 ++++++++++++++++++++++++++++--
 js/src/jsapi-tests/tests.h   | 26 ++++++--------------------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index 2f3008b4c0a8..0be730b81edf 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -28,6 +28,28 @@ bool JSAPITest::init()
     return true;
 }
 
+void JSAPITest::uninit()
+{
+    if (oldCompartment) {
+        JS_LeaveCompartment(cx, oldCompartment);
+        oldCompartment = nullptr;
+    }
+    if (global) {
+        JS_LeaveCompartment(cx, nullptr);
+        JS::RemoveObjectRoot(cx, &global);
+        global = nullptr;
+    }
+    if (cx) {
+        JS_EndRequest(cx);
+        JS_DestroyContext(cx);
+        cx = nullptr;
+    }
+    if (rt) {
+        destroyRuntime();
+        rt = nullptr;
+    }
+}
+
 bool JSAPITest::exec(const char *bytes, const char *filename, int lineno)
 {
     JS::RootedValue v(cx);
@@ -64,8 +86,11 @@ JSObject * JSAPITest::createGlobal(JSPrincipals *principals)
 
     /* Populate the global object with the standard globals, like Object and
        Array. */
-    if (!JS_InitStandardClasses(cx, globalHandle))
-        return nullptr;
+    if (!JS_InitStandardClasses(cx, globalHandle)) {
+        global = nullptr;
+        JS::RemoveObjectRoot(cx, &global);
+    }
+
     return global;
 }
 
@@ -91,6 +116,7 @@ int main(int argc, char *argv[])
         if (!test->init()) {
             printf("TEST-UNEXPECTED-FAIL | %s | Failed to initialize.\n", name);
             failures++;
+            test->uninit();
             continue;
         }
 
diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h
index a89b1caef7d1..dfe00235db3d 100644
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.h
@@ -67,28 +67,14 @@ class JSAPITest
         list = this;
     }
 
-    virtual ~JSAPITest() { uninit(); }
+    virtual ~JSAPITest() {
+        JS_ASSERT(!rt);
+        JS_ASSERT(!cx);
+        JS_ASSERT(!global);
+    }
 
     virtual bool init();
-
-    virtual void uninit() {
-        if (oldCompartment) {
-            JS_LeaveCompartment(cx, oldCompartment);
-            oldCompartment = nullptr;
-        }
-        global = nullptr;
-        if (cx) {
-            JS::RemoveObjectRoot(cx, &global);
-            JS_LeaveCompartment(cx, nullptr);
-            JS_EndRequest(cx);
-            JS_DestroyContext(cx);
-            cx = nullptr;
-        }
-        if (rt) {
-            destroyRuntime();
-            rt = nullptr;
-        }
-    }
+    virtual void uninit();
 
     virtual const char * name() = 0;
     virtual bool run(JS::HandleObject global) = 0;

From 511f6ef1c5a55178cc2f3a40a95cc6ac2fa038d9 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 13 Aug 2014 10:05:22 +0100
Subject: [PATCH 63/89] Bug 1052388 - Rename JS_CallHeapFooTracer() functions
 to JS_CallFooTracer() r=terrence r=smaug

---
 content/base/src/nsContentUtils.cpp           |  2 +-
 content/xul/content/src/nsXULElement.h        |  2 +-
 .../xul/document/src/nsXULPrototypeCache.cpp  |  2 +-
 dom/base/nsWrapperCache.h                     |  2 +-
 dom/base/nsWrapperCacheInlines.h              |  2 +-
 dom/bindings/BindingUtils.h                   |  8 ++---
 dom/bindings/Codegen.py                       |  6 ++--
 dom/bindings/TypedArray.h                     |  4 +--
 dom/plugins/base/nsJSNPRuntime.cpp            | 12 +++----
 dom/workers/XMLHttpRequest.cpp                |  4 +--
 js/ipc/JavaScriptShared.cpp                   |  4 +--
 js/public/TracingAPI.h                        | 31 ++++++++++---------
 js/src/builtin/TestingFunctions.cpp           |  2 +-
 js/src/ctypes/CTypes.cpp                      | 18 +++++------
 js/src/gc/Tracer.cpp                          | 22 ++++++-------
 js/src/jsfriendapi.cpp                        |  2 +-
 js/src/vm/WeakMapPtr.cpp                      |  2 +-
 js/xpconnect/src/XPCMaps.h                    |  4 +--
 js/xpconnect/src/XPCVariant.cpp               |  2 +-
 js/xpconnect/src/XPCWrappedJS.cpp             |  2 +-
 js/xpconnect/src/XPCWrappedNative.cpp         |  2 +-
 xpcom/base/CycleCollectedJSRuntime.cpp        | 12 +++----
 xpcom/glue/tests/gtest/TestGCPostBarriers.cpp |  2 +-
 23 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 88249a443d08..4837b9fa9345 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -1949,7 +1949,7 @@ nsContentUtils::TraceSafeJSContext(JSTracer* aTrc)
   }
   if (JSObject* global = js::DefaultObjectForContextOrNull(cx)) {
     JS::AssertGCThingMustBeTenured(global);
-    JS_CallObjectTracer(aTrc, &global, "safe context");
+    JS_CallUnbarrieredObjectTracer(aTrc, &global, "safe context");
     MOZ_ASSERT(global == js::DefaultObjectForContextOrNull(cx));
   }
 }
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index 906c3681d370..bd825757759d 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -264,7 +264,7 @@ public:
     void TraceScriptObject(JSTracer* aTrc)
     {
         if (mScriptObject) {
-            JS_CallHeapScriptTracer(aTrc, &mScriptObject, "active window XUL prototype script");
+            JS_CallScriptTracer(aTrc, &mScriptObject, "active window XUL prototype script");
         }
     }
 
diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp
index 91331055f55b..0ef5ae1d3837 100644
--- a/content/xul/document/src/nsXULPrototypeCache.cpp
+++ b/content/xul/document/src/nsXULPrototypeCache.cpp
@@ -641,7 +641,7 @@ static PLDHashOperator
 MarkScriptsInGC(nsIURI* aKey, JS::Heap<JSScript*>& aScript, void* aClosure)
 {
     JSTracer* trc = static_cast<JSTracer*>(aClosure);
-    JS_CallHeapScriptTracer(trc, &aScript, "nsXULPrototypeCache script");
+    JS_CallScriptTracer(trc, &aScript, "nsXULPrototypeCache script");
     return PL_DHASH_NEXT;
 }
 
diff --git a/dom/base/nsWrapperCache.h b/dom/base/nsWrapperCache.h
index 2eb1e0196382..980277f3cd20 100644
--- a/dom/base/nsWrapperCache.h
+++ b/dom/base/nsWrapperCache.h
@@ -228,7 +228,7 @@ protected:
   void TraceWrapper(JSTracer* aTrc, const char* name)
   {
     if (mWrapper) {
-      JS_CallHeapObjectTracer(aTrc, &mWrapper, name);
+      JS_CallObjectTracer(aTrc, &mWrapper, name);
     }
   }
 
diff --git a/dom/base/nsWrapperCacheInlines.h b/dom/base/nsWrapperCacheInlines.h
index 0c9a6fe6c0c9..6eec9de9d975 100644
--- a/dom/base/nsWrapperCacheInlines.h
+++ b/dom/base/nsWrapperCacheInlines.h
@@ -55,7 +55,7 @@ nsWrapperCache::IsBlackAndDoesNotNeedTracing(nsISupports* aThis)
 inline void
 nsWrapperCache::TraceWrapperJSObject(JSTracer* aTrc, const char* aName)
 {
-  JS_CallHeapObjectTracer(aTrc, &mWrapper, aName);
+  JS_CallObjectTracer(aTrc, &mWrapper, aName);
 }
 
 #endif /* nsWrapperCache_h___ */
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index d37b203e4d40..4ba8a0f5c19e 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -325,7 +325,7 @@ class ProtoAndIfaceCache
     void Trace(JSTracer* aTracer) {
       for (size_t i = 0; i < ArrayLength(*this); ++i) {
         if ((*this)[i]) {
-          JS_CallHeapObjectTracer(aTracer, &(*this)[i], "protoAndIfaceCache[i]");
+          JS_CallObjectTracer(aTracer, &(*this)[i], "protoAndIfaceCache[i]");
         }
       }
     }
@@ -386,7 +386,7 @@ class ProtoAndIfaceCache
         if (p) {
           for (size_t j = 0; j < ArrayLength(*p); ++j) {
             if ((*p)[j]) {
-              JS_CallHeapObjectTracer(trc, &(*p)[j], "protoAndIfaceCache[i]");
+              JS_CallObjectTracer(trc, &(*p)[j], "protoAndIfaceCache[i]");
             }
           }
         }
@@ -1975,7 +1975,7 @@ class SequenceTracer<JSObject*, false, false, false>
 public:
   static void TraceSequence(JSTracer* trc, JSObject** objp, JSObject** end) {
     for (; objp != end; ++objp) {
-      JS_CallObjectTracer(trc, objp, "sequence<object>");
+      JS_CallUnbarrieredObjectTracer(trc, objp, "sequence<object>");
     }
   }
 };
@@ -1989,7 +1989,7 @@ class SequenceTracer<JS::Value, false, false, false>
 public:
   static void TraceSequence(JSTracer* trc, JS::Value* valp, JS::Value* end) {
     for (; valp != end; ++valp) {
-      JS_CallValueTracer(trc, valp, "sequence<any>");
+      JS_CallUnbarrieredValueTracer(trc, valp, "sequence<any>");
     }
   }
 };
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 441b5131fb45..494fad3fc3ea 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -8534,7 +8534,7 @@ class CGUnionStruct(CGThing):
                 if t.isObject():
                     traceCases.append(
                         CGCase("e" + vars["name"],
-                               CGGeneric('JS_CallObjectTracer(trc, %s, "%s");\n' %
+                               CGGeneric('JS_CallUnbarrieredObjectTracer(trc, %s, "%s");\n' %
                                          ("&mValue.m" + vars["name"] + ".Value()",
                                           "mValue.m" + vars["name"]))))
                 elif t.isDictionary():
@@ -11427,12 +11427,12 @@ class CGDictionary(CGThing):
                                 memberLoc)
 
         if type.isObject():
-            trace = CGGeneric('JS_CallObjectTracer(trc, %s, "%s");\n' %
+            trace = CGGeneric('JS_CallUnbarrieredObjectTracer(trc, %s, "%s");\n' %
                               ("&"+memberData, memberName))
             if type.nullable():
                 trace = CGIfWrapper(trace, memberData)
         elif type.isAny():
-            trace = CGGeneric('JS_CallValueTracer(trc, %s, "%s");\n' %
+            trace = CGGeneric('JS_CallUnbarrieredValueTracer(trc, %s, "%s");\n' %
                               ("&"+memberData, memberName))
         elif (type.isSequence() or type.isDictionary() or
               type.isSpiderMonkeyInterface() or type.isUnion()):
diff --git a/dom/bindings/TypedArray.h b/dom/bindings/TypedArray.h
index ca3e19567cae..0c58a351c960 100644
--- a/dom/bindings/TypedArray.h
+++ b/dom/bindings/TypedArray.h
@@ -45,10 +45,10 @@ public:
   inline void TraceSelf(JSTracer* trc)
   {
     if (mTypedObj) {
-      JS_CallObjectTracer(trc, &mTypedObj, "TypedArray.mTypedObj");
+      JS_CallUnbarrieredObjectTracer(trc, &mTypedObj, "TypedArray.mTypedObj");
     }
     if (mWrappedObj) {
-      JS_CallObjectTracer(trc, &mTypedObj, "TypedArray.mWrappedObj");
+      JS_CallUnbarrieredObjectTracer(trc, &mTypedObj, "TypedArray.mWrappedObj");
     }
   }
 
diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index 5fd47c01f119..375f9364b2d8 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -952,7 +952,7 @@ JSObjWrapperKeyMarkCallback(JSTracer *trc, JSObject *obj, void *data) {
   if (!p)
     return;
 
-  JS_CallObjectTracer(trc, &obj, "sJSObjWrappers key object");
+  JS_CallUnbarrieredObjectTracer(trc, &obj, "sJSObjWrappers key object");
   nsJSObjWrapperKey newKey(obj, npp);
   sJSObjWrappers.rekeyIfMoved(oldKey, newKey);
 }
@@ -2122,18 +2122,18 @@ NPObjectMember_Trace(JSTracer *trc, JSObject *obj)
     return;
 
   // Our NPIdentifier is not always interned, so we must root it explicitly.
-  JS_CallHeapIdTracer(trc, &memberPrivate->methodName, "NPObjectMemberPrivate.methodName");
+  JS_CallIdTracer(trc, &memberPrivate->methodName, "NPObjectMemberPrivate.methodName");
 
   if (!memberPrivate->fieldValue.isPrimitive()) {
-    JS_CallHeapValueTracer(trc, &memberPrivate->fieldValue,
-                           "NPObject Member => fieldValue");
+    JS_CallValueTracer(trc, &memberPrivate->fieldValue,
+                       "NPObject Member => fieldValue");
   }
 
   // There's no strong reference from our private data to the
   // NPObject, so make sure to mark the NPObject wrapper to keep the
   // NPObject alive as long as this NPObjectMember is alive.
   if (memberPrivate->npobjWrapper) {
-    JS_CallHeapObjectTracer(trc, &memberPrivate->npobjWrapper,
-                            "NPObject Member => npobjWrapper");
+    JS_CallObjectTracer(trc, &memberPrivate->npobjWrapper,
+                        "NPObject Member => npobjWrapper");
   }
 }
diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp
index 2208d7809562..e2cbbfd96824 100644
--- a/dom/workers/XMLHttpRequest.cpp
+++ b/dom/workers/XMLHttpRequest.cpp
@@ -447,8 +447,8 @@ public:
   private:
     virtual void trace(JSTracer* aTrc)
     {
-      JS_CallHeapValueTracer(aTrc, &mStateData->mResponse,
-                             "XMLHttpRequest::StateData::mResponse");
+      JS_CallValueTracer(aTrc, &mStateData->mResponse,
+                         "XMLHttpRequest::StateData::mResponse");
     }
   };
 
diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp
index b048d8e3e367..2c96f3fea70c 100644
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -35,7 +35,7 @@ IdToObjectMap::trace(JSTracer *trc)
 {
     for (Table::Range r(table_.all()); !r.empty(); r.popFront()) {
         DebugOnly<JSObject *> prior = r.front().value().get();
-        JS_CallHeapObjectTracer(trc, &r.front().value(), "ipc-object");
+        JS_CallObjectTracer(trc, &r.front().value(), "ipc-object");
         MOZ_ASSERT(r.front().value() == prior);
     }
 }
@@ -135,7 +135,7 @@ ObjectToIdMap::keyMarkCallback(JSTracer *trc, JSObject *key, void *data)
 {
     Table *table = static_cast<Table*>(data);
     JSObject *prior = key;
-    JS_CallObjectTracer(trc, &key, "ObjectIdCache::table_ key");
+    JS_CallUnbarrieredObjectTracer(trc, &key, "ObjectIdCache::table_ key");
     table->rekeyIfMoved(prior, key);
 }
 
diff --git a/js/public/TracingAPI.h b/js/public/TracingAPI.h
index 3c7fdbe1b11c..fef0e5dec7b3 100644
--- a/js/public/TracingAPI.h
+++ b/js/public/TracingAPI.h
@@ -155,37 +155,40 @@ class JS_PUBLIC_API(JSTracer)
 // and re-inserted with the correct hash.
 //
 extern JS_PUBLIC_API(void)
-JS_CallValueTracer(JSTracer *trc, JS::Value *valuep, const char *name);
+JS_CallValueTracer(JSTracer *trc, JS::Heap<JS::Value> *valuep, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallIdTracer(JSTracer *trc, jsid *idp, const char *name);
+JS_CallIdTracer(JSTracer *trc, JS::Heap<jsid> *idp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallObjectTracer(JSTracer *trc, JSObject **objp, const char *name);
+JS_CallObjectTracer(JSTracer *trc, JS::Heap<JSObject *> *objp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallStringTracer(JSTracer *trc, JSString **strp, const char *name);
+JS_CallStringTracer(JSTracer *trc, JS::Heap<JSString *> *strp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallScriptTracer(JSTracer *trc, JSScript **scriptp, const char *name);
+JS_CallScriptTracer(JSTracer *trc, JS::Heap<JSScript *> *scriptp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallHeapValueTracer(JSTracer *trc, JS::Heap<JS::Value> *valuep, const char *name);
+JS_CallFunctionTracer(JSTracer *trc, JS::Heap<JSFunction *> *funp, const char *name);
+
+// The following JS_CallUnbarriered*Tracer functions should only be called where
+// you know for sure that a heap post barrier is not required.  Use with extreme
+// caution!
+extern JS_PUBLIC_API(void)
+JS_CallUnbarrieredValueTracer(JSTracer *trc, JS::Value *valuep, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallHeapIdTracer(JSTracer *trc, JS::Heap<jsid> *idp, const char *name);
+JS_CallUnbarrieredIdTracer(JSTracer *trc, jsid *idp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallHeapObjectTracer(JSTracer *trc, JS::Heap<JSObject *> *objp, const char *name);
+JS_CallUnbarrieredObjectTracer(JSTracer *trc, JSObject **objp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallHeapStringTracer(JSTracer *trc, JS::Heap<JSString *> *strp, const char *name);
+JS_CallUnbarrieredStringTracer(JSTracer *trc, JSString **strp, const char *name);
 
 extern JS_PUBLIC_API(void)
-JS_CallHeapScriptTracer(JSTracer *trc, JS::Heap<JSScript *> *scriptp, const char *name);
-
-extern JS_PUBLIC_API(void)
-JS_CallHeapFunctionTracer(JSTracer *trc, JS::Heap<JSFunction *> *funp, const char *name);
+JS_CallUnbarrieredScriptTracer(JSTracer *trc, JSScript **scriptp, const char *name);
 
 template <typename HashSetEnum>
 inline void
@@ -193,7 +196,7 @@ JS_CallHashSetObjectTracer(JSTracer *trc, HashSetEnum &e, JSObject *const &key,
 {
     JSObject *updated = key;
     trc->setTracingLocation(reinterpret_cast<void *>(&const_cast<JSObject *&>(key)));
-    JS_CallObjectTracer(trc, &updated, name);
+    JS_CallUnbarrieredObjectTracer(trc, &updated, name);
     if (updated != key)
         e.rekeyFront(key, updated);
 }
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index c938963f1fec..1b2ee023b526 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -829,7 +829,7 @@ CountHeap(JSContext *cx, unsigned argc, jsval *vp)
     if (startValue.isUndefined()) {
         JS_TraceRuntime(&countTracer.base);
     } else {
-        JS_CallValueTracer(&countTracer.base, startValue.address(), "root");
+        JS_CallUnbarrieredValueTracer(&countTracer.base, startValue.address(), "root");
     }
 
     JSCountHeapNode *node;
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index 9f1189fb154e..133279a3c5d6 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -3400,10 +3400,10 @@ CType::Trace(JSTracer* trc, JSObject* obj)
     FieldInfoHash* fields = static_cast<FieldInfoHash*>(slot.toPrivate());
     for (FieldInfoHash::Enum e(*fields); !e.empty(); e.popFront()) {
       JSString *key = e.front().key();
-      JS_CallStringTracer(trc, &key, "fieldName");
+      JS_CallUnbarrieredStringTracer(trc, &key, "fieldName");
       if (key != e.front().key())
           e.rekeyFront(JS_ASSERT_STRING_IS_FLAT(key));
-      JS_CallHeapObjectTracer(trc, &e.front().value().mType, "fieldType");
+      JS_CallObjectTracer(trc, &e.front().value().mType, "fieldType");
     }
 
     break;
@@ -3418,10 +3418,10 @@ CType::Trace(JSTracer* trc, JSObject* obj)
     JS_ASSERT(fninfo);
 
     // Identify our objects to the tracer.
-    JS_CallHeapObjectTracer(trc, &fninfo->mABI, "abi");
-    JS_CallHeapObjectTracer(trc, &fninfo->mReturnType, "returnType");
+    JS_CallObjectTracer(trc, &fninfo->mABI, "abi");
+    JS_CallObjectTracer(trc, &fninfo->mReturnType, "returnType");
     for (size_t i = 0; i < fninfo->mArgTypes.length(); ++i)
-      JS_CallHeapObjectTracer(trc, &fninfo->mArgTypes[i], "argType");
+      JS_CallObjectTracer(trc, &fninfo->mArgTypes[i], "argType");
 
     break;
   }
@@ -4818,7 +4818,7 @@ PostBarrierCallback(JSTracer *trc, JSString *key, void *data)
 
     UnbarrieredFieldInfoHash *table = reinterpret_cast<UnbarrieredFieldInfoHash*>(data);
     JSString *prior = key;
-    JS_CallStringTracer(trc, &key, "CType fieldName");
+    JS_CallUnbarrieredStringTracer(trc, &key, "CType fieldName");
     table->rekeyIfMoved(JS_ASSERT_STRING_IS_FLAT(prior), JS_ASSERT_STRING_IS_FLAT(key));
 }
 
@@ -6152,10 +6152,10 @@ CClosure::Trace(JSTracer* trc, JSObject* obj)
 
   // Identify our objects to the tracer. (There's no need to identify
   // 'closureObj', since that's us.)
-  JS_CallHeapObjectTracer(trc, &cinfo->typeObj, "typeObj");
-  JS_CallHeapObjectTracer(trc, &cinfo->jsfnObj, "jsfnObj");
+  JS_CallObjectTracer(trc, &cinfo->typeObj, "typeObj");
+  JS_CallObjectTracer(trc, &cinfo->jsfnObj, "jsfnObj");
   if (cinfo->thisObj)
-    JS_CallHeapObjectTracer(trc, &cinfo->thisObj, "thisObj");
+    JS_CallObjectTracer(trc, &cinfo->thisObj, "thisObj");
 }
 
 void
diff --git a/js/src/gc/Tracer.cpp b/js/src/gc/Tracer.cpp
index fcd0c80c47f6..f5c9d6761dad 100644
--- a/js/src/gc/Tracer.cpp
+++ b/js/src/gc/Tracer.cpp
@@ -28,67 +28,67 @@ using namespace js::gc;
 using mozilla::DebugOnly;
 
 JS_PUBLIC_API(void)
-JS_CallValueTracer(JSTracer *trc, Value *valuep, const char *name)
+JS_CallUnbarrieredValueTracer(JSTracer *trc, Value *valuep, const char *name)
 {
     MarkValueUnbarriered(trc, valuep, name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallIdTracer(JSTracer *trc, jsid *idp, const char *name)
+JS_CallUnbarrieredIdTracer(JSTracer *trc, jsid *idp, const char *name)
 {
     MarkIdUnbarriered(trc, idp, name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallObjectTracer(JSTracer *trc, JSObject **objp, const char *name)
+JS_CallUnbarrieredObjectTracer(JSTracer *trc, JSObject **objp, const char *name)
 {
     MarkObjectUnbarriered(trc, objp, name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallStringTracer(JSTracer *trc, JSString **strp, const char *name)
+JS_CallUnbarrieredStringTracer(JSTracer *trc, JSString **strp, const char *name)
 {
     MarkStringUnbarriered(trc, strp, name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallScriptTracer(JSTracer *trc, JSScript **scriptp, const char *name)
+JS_CallUnbarrieredScriptTracer(JSTracer *trc, JSScript **scriptp, const char *name)
 {
     MarkScriptUnbarriered(trc, scriptp, name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapValueTracer(JSTracer *trc, JS::Heap<JS::Value> *valuep, const char *name)
+JS_CallValueTracer(JSTracer *trc, JS::Heap<JS::Value> *valuep, const char *name)
 {
     MarkValueUnbarriered(trc, valuep->unsafeGet(), name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapIdTracer(JSTracer *trc, JS::Heap<jsid> *idp, const char *name)
+JS_CallIdTracer(JSTracer *trc, JS::Heap<jsid> *idp, const char *name)
 {
     MarkIdUnbarriered(trc, idp->unsafeGet(), name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapObjectTracer(JSTracer *trc, JS::Heap<JSObject *> *objp, const char *name)
+JS_CallObjectTracer(JSTracer *trc, JS::Heap<JSObject *> *objp, const char *name)
 {
     MarkObjectUnbarriered(trc, objp->unsafeGet(), name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapStringTracer(JSTracer *trc, JS::Heap<JSString *> *strp, const char *name)
+JS_CallStringTracer(JSTracer *trc, JS::Heap<JSString *> *strp, const char *name)
 {
     MarkStringUnbarriered(trc, strp->unsafeGet(), name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapScriptTracer(JSTracer *trc, JS::Heap<JSScript *> *scriptp, const char *name)
+JS_CallScriptTracer(JSTracer *trc, JS::Heap<JSScript *> *scriptp, const char *name)
 {
     MarkScriptUnbarriered(trc, scriptp->unsafeGet(), name);
 }
 
 JS_PUBLIC_API(void)
-JS_CallHeapFunctionTracer(JSTracer *trc, JS::Heap<JSFunction *> *funp, const char *name)
+JS_CallFunctionTracer(JSTracer *trc, JS::Heap<JSFunction *> *funp, const char *name)
 {
     MarkObjectUnbarriered(trc, funp->unsafeGet(), name);
 }
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 36b3dd8123f8..d46d33db6c2b 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1022,7 +1022,7 @@ JS::ObjectPtr::isAboutToBeFinalized()
 void
 JS::ObjectPtr::trace(JSTracer *trc, const char *name)
 {
-    JS_CallHeapObjectTracer(trc, &value, name);
+    JS_CallObjectTracer(trc, &value, name);
 }
 
 JS_FRIEND_API(JSObject *)
diff --git a/js/src/vm/WeakMapPtr.cpp b/js/src/vm/WeakMapPtr.cpp
index 99d0c19323a6..84f75767f36b 100644
--- a/js/src/vm/WeakMapPtr.cpp
+++ b/js/src/vm/WeakMapPtr.cpp
@@ -99,7 +99,7 @@ JS::WeakMapPtr<K, V>::keyMarkCallback(JSTracer *trc, K key, void *data)
 {
     auto map = static_cast< JS::WeakMapPtr<K, V>* >(data);
     K prior = key;
-    JS_CallObjectTracer(trc, &key, "WeakMapPtr key");
+    JS_CallUnbarrieredObjectTracer(trc, &key, "WeakMapPtr key");
     return Utils<K, V>::cast(map->ptr)->rekeyIfMoved(prior, key);
 }
 
diff --git a/js/xpconnect/src/XPCMaps.h b/js/xpconnect/src/XPCMaps.h
index 9464d73ba12a..cf29a49ded21 100644
--- a/js/xpconnect/src/XPCMaps.h
+++ b/js/xpconnect/src/XPCMaps.h
@@ -88,7 +88,7 @@ private:
     static void KeyMarkCallback(JSTracer *trc, JSObject *key, void *data) {
         JSObject2WrappedJSMap* self = static_cast<JSObject2WrappedJSMap*>(data);
         JSObject *prior = key;
-        JS_CallObjectTracer(trc, &key, "XPCJSRuntime::mWrappedJSMap key");
+        JS_CallUnbarrieredObjectTracer(trc, &key, "XPCJSRuntime::mWrappedJSMap key");
         self->mTable.rekeyIfMoved(prior, key);
     }
 
@@ -704,7 +704,7 @@ private:
         UnbarrieredMap &table = reinterpret_cast<UnbarrieredMap &>(self->mTable);
 
         JSObject *prior = key;
-        JS_CallObjectTracer(trc, &key, "XPCWrappedNativeScope::mWaiverWrapperMap key");
+        JS_CallUnbarrieredObjectTracer(trc, &key, "XPCWrappedNativeScope::mWaiverWrapperMap key");
         table.rekeyIfMoved(prior, key);
     }
 
diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp
index 9887b2af1a70..245c56225adf 100644
--- a/js/xpconnect/src/XPCVariant.cpp
+++ b/js/xpconnect/src/XPCVariant.cpp
@@ -70,7 +70,7 @@ void XPCTraceableVariant::TraceJS(JSTracer* trc)
 {
     MOZ_ASSERT(mJSVal.isMarkable());
     trc->setTracingDetails(GetTraceName, this, 0);
-    JS_CallHeapValueTracer(trc, &mJSVal, "XPCTraceableVariant::mJSVal");
+    JS_CallValueTracer(trc, &mJSVal, "XPCTraceableVariant::mJSVal");
 }
 
 // static
diff --git a/js/xpconnect/src/XPCWrappedJS.cpp b/js/xpconnect/src/XPCWrappedJS.cpp
index 35af471c36b6..20b4d7579aea 100644
--- a/js/xpconnect/src/XPCWrappedJS.cpp
+++ b/js/xpconnect/src/XPCWrappedJS.cpp
@@ -286,7 +286,7 @@ nsXPCWrappedJS::TraceJS(JSTracer* trc)
 {
     MOZ_ASSERT(mRefCnt >= 2 && IsValid(), "must be strongly referenced");
     trc->setTracingDetails(GetTraceName, this, 0);
-    JS_CallHeapObjectTracer(trc, &mJSObj, "nsXPCWrappedJS::mJSObj");
+    JS_CallObjectTracer(trc, &mJSObj, "nsXPCWrappedJS::mJSObj");
 }
 
 // static
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index 496c4593b102..bf901b278484 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2655,7 +2655,7 @@ void
 XPCJSObjectHolder::TraceJS(JSTracer *trc)
 {
     trc->setTracingDetails(GetTraceName, this, 0);
-    JS_CallHeapObjectTracer(trc, &mJSObj, "XPCJSObjectHolder::mJSObj");
+    JS_CallObjectTracer(trc, &mJSObj, "XPCJSObjectHolder::mJSObj");
 }
 
 // static
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 9c039b8ff8ea..3b205485c4f8 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -800,17 +800,17 @@ struct JsGcTracer : public TraceCallbacks
   virtual void Trace(JS::Heap<JS::Value>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapValueTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallValueTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
   virtual void Trace(JS::Heap<jsid>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapIdTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallIdTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
   virtual void Trace(JS::Heap<JSObject*>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapObjectTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallObjectTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
   virtual void Trace(JS::TenuredHeap<JSObject*>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
@@ -820,17 +820,17 @@ struct JsGcTracer : public TraceCallbacks
   virtual void Trace(JS::Heap<JSString*>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapStringTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallStringTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
   virtual void Trace(JS::Heap<JSScript*>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapScriptTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallScriptTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
   virtual void Trace(JS::Heap<JSFunction*>* aPtr, const char* aName,
                      void* aClosure) const MOZ_OVERRIDE
   {
-    JS_CallHeapFunctionTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
+    JS_CallFunctionTracer(static_cast<JSTracer*>(aClosure), aPtr, aName);
   }
 };
 
diff --git a/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp b/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp
index d7a57efecc07..8599fba1ed40 100644
--- a/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp
+++ b/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp
@@ -28,7 +28,7 @@ TraceArray(JSTracer* trc, void* data)
 {
   ArrayT* array = static_cast<ArrayT *>(data);
   for (unsigned i = 0; i < array->Length(); ++i)
-    JS_CallHeapObjectTracer(trc, &array->ElementAt(i), "array-element");
+    JS_CallObjectTracer(trc, &array->ElementAt(i), "array-element");
 }
 
 /*

From ee54c3ad08e4ad5d9caaf07b5453f925b0dd738d Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 13 Aug 2014 10:05:33 +0100
Subject: [PATCH 64/89] Bug 995284 - Make the GC more deterministic in the
 shell r=terrence

---
 js/src/gc/GCRuntime.h | 15 ++++++++---
 js/src/jsapi.cpp      |  4 ++-
 js/src/jsgc.cpp       | 60 ++++++++++++++++++++++++-------------------
 js/src/jsgc.h         |  3 ---
 js/src/jsgcinlines.h  |  2 +-
 5 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index 4bded5b5c09a..4a8dee8fc4ea 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -274,7 +274,8 @@ class GCRuntime
 
     bool triggerGC(JS::gcreason::Reason reason);
     bool triggerZoneGC(Zone *zone, JS::gcreason::Reason reason);
-    void maybeGC(Zone *zone);
+    bool maybeGC(Zone *zone);
+    void maybePeriodicFullGC();
     void minorGC(JS::gcreason::Reason reason);
     void minorGC(JSContext *cx, JS::gcreason::Reason reason);
     void gcIfNeeded(JSContext *cx);
@@ -487,7 +488,7 @@ class GCRuntime
     void getNextZoneGroup();
     void endMarkingZoneGroup();
     void beginSweepingZoneGroup();
-    bool releaseObservedTypes();
+    bool shouldReleaseObservedTypes();
     void endSweepingZoneGroup();
     bool sweepPhase(SliceBudget &sliceBudget);
     void endSweepPhase(JSGCInvocationKind gckind, bool lastGC);
@@ -567,7 +568,6 @@ class GCRuntime
     bool                  chunkAllocationSinceLastGC;
     int64_t               nextFullGCTime;
     int64_t               lastGCTime;
-    int64_t               jitReleaseTime;
 
     JSGCMode              mode;
 
@@ -589,6 +589,12 @@ class GCRuntime
      */
     volatile uintptr_t    isNeeded;
 
+    /* Incremented at the start of every major GC. */
+    uint64_t              majorGCNumber;
+
+    /* The major GC number at which to release observed type information. */
+    uint64_t              jitReleaseNumber;
+
     /* Incremented on every GC slice. */
     uint64_t              number;
 
@@ -624,6 +630,9 @@ class GCRuntime
     /* Whether any sweeping will take place in the separate GC helper thread. */
     bool                  sweepOnBackgroundThread;
 
+    /* Whether observed type information is being released in the current GC. */
+    bool                  releaseObservedTypes;
+
     /* Whether any black->gray edges were found during marking. */
     bool                  foundBlackGrayEdges;
 
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 4361ee3d86da..c2d15765045b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1879,7 +1879,9 @@ JS_GC(JSRuntime *rt)
 JS_PUBLIC_API(void)
 JS_MaybeGC(JSContext *cx)
 {
-    MaybeGC(cx);
+    GCRuntime &gc = cx->runtime()->gc;
+    if (!gc.maybeGC(cx->zone()))
+        gc.maybePeriodicFullGC();
 }
 
 JS_PUBLIC_API(void)
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index f85a1ee7d9c2..2d7f2dbdcba5 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1112,12 +1112,13 @@ GCRuntime::GCRuntime(JSRuntime *rt) :
     chunkAllocationSinceLastGC(false),
     nextFullGCTime(0),
     lastGCTime(0),
-    jitReleaseTime(0),
     mode(JSGC_MODE_INCREMENTAL),
     decommitThreshold(32 * 1024 * 1024),
     cleanUpEverything(false),
     grayBitsValid(false),
     isNeeded(0),
+    majorGCNumber(0),
+    jitReleaseNumber(0),
     number(0),
     startNumber(0),
     isFull(false),
@@ -1248,8 +1249,11 @@ GCRuntime::initZeal()
 
 #endif
 
-/* Lifetime for type sets attached to scripts containing observed types. */
-static const int64_t JIT_SCRIPT_RELEASE_TYPES_INTERVAL = 60 * 1000 * 1000;
+/*
+ * Lifetime in number of major GCs for type sets attached to scripts containing
+ * observed types.
+ */
+static const uint64_t JIT_SCRIPT_RELEASE_TYPES_PERIOD = 20;
 
 bool
 GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
@@ -1276,9 +1280,7 @@ GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
     tunables.setParameter(JSGC_MAX_BYTES, maxbytes);
     setMaxMallocBytes(maxbytes);
 
-#ifndef JS_MORE_DETERMINISTIC
-    jitReleaseTime = PRMJ_Now() + JIT_SCRIPT_RELEASE_TYPES_INTERVAL;
-#endif
+    jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
 
 #ifdef JSGC_GENERATIONAL
     if (!nursery.init(maxNurseryBytes))
@@ -2415,13 +2417,7 @@ GCRuntime::triggerZoneGC(Zone *zone, JS::gcreason::Reason reason)
     return true;
 }
 
-void
-js::MaybeGC(JSContext *cx)
-{
-    cx->runtime()->gc.maybeGC(cx->zone());
-}
-
-void
+bool
 GCRuntime::maybeGC(Zone *zone)
 {
     JS_ASSERT(CurrentThreadCanAccessRuntime(rt));
@@ -2430,13 +2426,13 @@ GCRuntime::maybeGC(Zone *zone)
     if (zealMode == ZealAllocValue || zealMode == ZealPokeValue) {
         JS::PrepareForFullGC(rt);
         GC(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return;
+        return true;
     }
 #endif
 
     if (isNeeded) {
         GCSlice(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return;
+        return true;
     }
 
     double factor = schedulingState.inHighFrequencyGCMode() ? 0.85 : 0.9;
@@ -2447,15 +2443,25 @@ GCRuntime::maybeGC(Zone *zone)
     {
         PrepareZoneForGC(zone);
         GCSlice(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return;
+        return true;
     }
 
-#ifndef JS_MORE_DETERMINISTIC
+    return false;
+}
+
+void
+GCRuntime::maybePeriodicFullGC()
+{
     /*
+     * Trigger a periodic full GC.
+     *
+     * This is a source of non-determinism, but is not called from the shell.
+     *
      * Access to the counters and, on 32 bit, setting gcNextFullGCTime below
      * is not atomic and a race condition could trigger or suppress the GC. We
      * tolerate this.
      */
+#ifndef JS_MORE_DETERMINISTIC
     int64_t now = PRMJ_Now();
     if (nextFullGCTime && nextFullGCTime <= now) {
         if (chunkAllocationSinceLastGC ||
@@ -2881,7 +2887,7 @@ GCHelperState::onBackgroundThread()
 }
 
 bool
-GCRuntime::releaseObservedTypes()
+GCRuntime::shouldReleaseObservedTypes()
 {
     bool releaseTypes = false;
 
@@ -2890,13 +2896,12 @@ GCRuntime::releaseObservedTypes()
         releaseTypes = true;
 #endif
 
-#ifndef JS_MORE_DETERMINISTIC
-    int64_t now = PRMJ_Now();
-    if (now >= jitReleaseTime)
+    MOZ_ASSERT(majorGCNumber <= jitReleaseNumber);
+    if (majorGCNumber == jitReleaseNumber)
         releaseTypes = true;
+
     if (releaseTypes)
-        jitReleaseTime = now + JIT_SCRIPT_RELEASE_TYPES_INTERVAL;
-#endif
+        jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
 
     return releaseTypes;
 }
@@ -4157,10 +4162,9 @@ GCRuntime::beginSweepingZoneGroup()
             zone->discardJitCode(&fop);
         }
 
-        bool releaseTypes = releaseObservedTypes();
         for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
             gcstats::AutoSCC scc(stats, zoneGroupIndex);
-            c->sweep(&fop, releaseTypes && !c->zone()->isPreservingCode());
+            c->sweep(&fop, releaseObservedTypes && !c->zone()->isPreservingCode());
         }
 
         for (GCZoneGroupIter zone(rt); !zone.done(); zone.next()) {
@@ -4174,7 +4178,7 @@ GCRuntime::beginSweepingZoneGroup()
             // code and new script information in the zone, the only things
             // whose correctness depends on the type constraints.
             bool oom = false;
-            zone->sweep(&fop, releaseTypes && !zone->isPreservingCode(), &oom);
+            zone->sweep(&fop, releaseObservedTypes && !zone->isPreservingCode(), &oom);
 
             if (oom) {
                 zone->setPreservingCode(false);
@@ -4264,6 +4268,8 @@ GCRuntime::beginSweepPhase(bool lastGC)
 
     sweepOnBackgroundThread = !lastGC && !TraceEnabled() && CanUseExtraThreads();
 
+    releaseObservedTypes = shouldReleaseObservedTypes();
+
 #ifdef DEBUG
     for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
         JS_ASSERT(!c->gcIncomingGrayPointers);
@@ -4986,6 +4992,8 @@ GCRuntime::gcCycle(bool incremental, int64_t budget, JSGCInvocationKind gckind,
     interFrameGC = true;
 
     number++;
+    if (incrementalState == NO_INCREMENTAL)
+        majorGCNumber++;
 
     // It's ok if threads other than the main thread have suppressGC set, as
     // they are operating on zones which will not be collected from here.
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 3f3f4265b88b..71ae41121c7e 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -971,9 +971,6 @@ TriggerGC(JSRuntime *rt, JS::gcreason::Reason reason);
 extern bool
 TriggerZoneGC(Zone *zone, JS::gcreason::Reason reason);
 
-extern void
-MaybeGC(JSContext *cx);
-
 extern void
 ReleaseAllJITCode(FreeOp *op);
 
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 2ae37ea6aba7..8e764d08d0d6 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -691,7 +691,7 @@ AllocateObjectForCacheHit(JSContext *cx, AllocKind kind, InitialHeap heap)
 
     JSObject *obj = AllocateObject<NoGC>(cx, kind, 0, heap);
     if (!obj && allowGC) {
-        MaybeGC(cx);
+        cx->runtime()->gc.maybeGC(cx->zone());
         return nullptr;
     }
 

From bebf82b3f533622a7c128f2594fbad9c691fb7cf Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Wed, 13 Aug 2014 11:18:00 +0200
Subject: [PATCH 65/89] Bug 1021716: SIMD x86-x64: Implement
 MSimdExtractElement; r=sunfish

---
 js/src/assembler/assembler/X86Assembler.h     | 23 ++++++++++-
 js/src/jit/IonTypes.h                         |  9 ++++
 js/src/jit/LIR-Common.h                       | 38 +++++++++++++++++
 js/src/jit/LOpcodes.h                         |  2 +
 js/src/jit/Lowering.cpp                       | 22 ++++++++++
 js/src/jit/Lowering.h                         |  1 +
 js/src/jit/MIR.h                              | 41 +++++++++++++++++++
 js/src/jit/MOpcodes.h                         |  1 +
 js/src/jit/ParallelSafetyAnalysis.cpp         |  1 +
 js/src/jit/arm/CodeGenerator-arm.h            |  5 +++
 js/src/jit/shared/Assembler-x86-shared.h      |  8 ++++
 .../jit/shared/CodeGenerator-x86-shared.cpp   | 37 +++++++++++++++++
 js/src/jit/shared/CodeGenerator-x86-shared.h  |  4 ++
 js/src/jit/shared/MacroAssembler-x86-shared.h | 29 +++++++++++++
 14 files changed, 220 insertions(+), 1 deletion(-)

diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index d81c15674455..9afd4662a246 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -312,6 +312,7 @@ private:
         OP2_MOVD_VdEd       = 0x6E,
         OP2_MOVDQ_VsdWsd    = 0x6F,
         OP2_MOVDQ_VdqWdq    = 0x6F,
+        OP2_PSHUFD_VdqWdqIb = 0x70,
         OP2_PSRLDQ_Vd       = 0x73,
         OP2_PCMPEQW         = 0x75,
         OP2_MOVD_EdVd       = 0x7E,
@@ -325,7 +326,8 @@ private:
         OP2_MOVZX_GvEb      = 0xB6,
         OP2_MOVZX_GvEw      = 0xB7,
         OP2_XADD_EvGv       = 0xC1,
-        OP2_PEXTRW_GdUdIb   = 0xC5
+        OP2_PEXTRW_GdUdIb   = 0xC5,
+        OP2_SHUFPS_VpsWpsIb = 0xC6
     } TwoByteOpcodeID;
 
     typedef enum {
@@ -2587,6 +2589,25 @@ public:
         m_formatter.twoByteOp(OP2_MOVD_VdEd, (RegisterID)dst, src);
     }
 
+    void pshufd_irr(uint32_t mask, XMMRegisterID src, XMMRegisterID dst)
+    {
+        JS_ASSERT(mask < 256);
+        spew("pshufd      0x%x, %s, %s",
+             mask, nameFPReg(src), nameFPReg(dst));
+        m_formatter.prefix(PRE_SSE_66);
+        m_formatter.twoByteOp(OP2_PSHUFD_VdqWdqIb, (RegisterID)dst, (RegisterID)src);
+        m_formatter.immediate8(uint8_t(mask));
+    }
+
+    void shufps_irr(uint32_t mask, XMMRegisterID src, XMMRegisterID dst)
+    {
+        JS_ASSERT(mask < 256);
+        spew("shufps     0x%x, %s, %s",
+             mask, nameFPReg(src), nameFPReg(dst));
+        m_formatter.twoByteOp(OP2_SHUFPS_VpsWpsIb, (RegisterID)dst, (RegisterID)src);
+        m_formatter.immediate8(uint8_t(mask));
+    }
+
     void psrldq_ir(int shift, XMMRegisterID dest)
     {
         spew("psrldq     $%d, %s",
diff --git a/js/src/jit/IonTypes.h b/js/src/jit/IonTypes.h
index 78ba1c8548cd..f5aaf8c4f7ff 100644
--- a/js/src/jit/IonTypes.h
+++ b/js/src/jit/IonTypes.h
@@ -451,6 +451,15 @@ SimdTypeToScalarType(MIRType type)
     MOZ_ASSUME_UNREACHABLE("unexpected SIMD kind");
 }
 
+// Indicates a lane in a SIMD register: X for the first lane, Y for the second,
+// Z for the third (if any), W for the fourth (if any).
+enum SimdLane {
+    LaneX = 0x0,
+    LaneY = 0x1,
+    LaneZ = 0x2,
+    LaneW = 0x3
+};
+
 #ifdef DEBUG
 
 // Track the pipeline of opcodes which has produced a snapshot.
diff --git a/js/src/jit/LIR-Common.h b/js/src/jit/LIR-Common.h
index 987632e67189..37c7e0c3bd89 100644
--- a/js/src/jit/LIR-Common.h
+++ b/js/src/jit/LIR-Common.h
@@ -128,6 +128,44 @@ class LMoveGroup : public LInstructionHelper<0, 0, 0>
     }
 };
 
+// Extracts an element from a given SIMD int32x4 lane.
+class LSimdExtractElementI : public LInstructionHelper<1, 1, 0>
+{
+    SimdLane lane_;
+
+  public:
+    LIR_HEADER(SimdExtractElementI);
+
+    LSimdExtractElementI(const LAllocation &base, SimdLane lane) : lane_(lane) {
+        setOperand(0, base);
+    }
+    const LAllocation *getBase() {
+        return getOperand(0);
+    }
+    SimdLane lane() const {
+        return lane_;
+    }
+};
+
+// Extracts an element from a given SIMD float32x4 lane.
+class LSimdExtractElementF : public LInstructionHelper<1, 1, 0>
+{
+    SimdLane lane_;
+
+  public:
+    LIR_HEADER(SimdExtractElementF);
+
+    LSimdExtractElementF(const LAllocation &base, SimdLane lane) : lane_(lane) {
+        setOperand(0, base);
+    }
+    const LAllocation *getBase() {
+        return getOperand(0);
+    }
+    SimdLane lane() const {
+        return lane_;
+    }
+};
+
 // Constant 32-bit integer.
 class LInteger : public LInstructionHelper<1, 0, 0>
 {
diff --git a/js/src/jit/LOpcodes.h b/js/src/jit/LOpcodes.h
index 1579a234ee84..f16b6126c94f 100644
--- a/js/src/jit/LOpcodes.h
+++ b/js/src/jit/LOpcodes.h
@@ -16,6 +16,8 @@
     _(Pointer)                      \
     _(Double)                       \
     _(Float32)                      \
+    _(SimdExtractElementI)          \
+    _(SimdExtractElementF)          \
     _(Value)                        \
     _(CloneLiteral)                 \
     _(Parameter)                    \
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index fce4423b67cd..28a8563eb685 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -3638,6 +3638,28 @@ LIRGenerator::visitRecompileCheck(MRecompileCheck *ins)
     return assignSafepoint(lir, ins);
 }
 
+bool
+LIRGenerator::visitSimdExtractElement(MSimdExtractElement *ins)
+{
+    JS_ASSERT(IsSimdType(ins->input()->type()));
+    JS_ASSERT(!IsSimdType(ins->type()));
+
+    if (ins->input()->type() == MIRType_Int32x4) {
+        // Note: there could be int16x8 in the future, which doesn't use the
+        // same instruction. We either need to pass the arity or create new LIns.
+        LUse use = useRegisterAtStart(ins->input());
+        return define(new(alloc()) LSimdExtractElementI(use, ins->lane()), ins);
+    }
+
+    if (ins->input()->type() == MIRType_Float32x4) {
+        LUse use = useRegisterAtStart(ins->input());
+        return define(new(alloc()) LSimdExtractElementF(use, ins->lane()), ins);
+    }
+
+    MOZ_ASSUME_UNREACHABLE("Unknown SIMD kind when extracting element");
+    return false;
+}
+
 static void
 SpewResumePoint(MBasicBlock *block, MInstruction *ins, MResumePoint *resumePoint)
 {
diff --git a/js/src/jit/Lowering.h b/js/src/jit/Lowering.h
index 786e88350ae8..4cb3ea77d46c 100644
--- a/js/src/jit/Lowering.h
+++ b/js/src/jit/Lowering.h
@@ -263,6 +263,7 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitGetDOMProperty(MGetDOMProperty *ins);
     bool visitGetDOMMember(MGetDOMMember *ins);
     bool visitRecompileCheck(MRecompileCheck *ins);
+    bool visitSimdExtractElement(MSimdExtractElement *ins);
 };
 
 } // namespace jit
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 55ffe11102a4..f0b95f43f06a 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -1233,6 +1233,47 @@ class MConstant : public MNullaryInstruction
     ALLOW_CLONE(MConstant)
 };
 
+// Extracts a lane element from a given vector type, given by its lane symbol.
+class MSimdExtractElement : public MUnaryInstruction
+{
+  protected:
+    SimdLane lane_;
+
+    MSimdExtractElement(MDefinition *obj, MIRType type, SimdLane lane)
+      : MUnaryInstruction(obj), lane_(lane)
+    {
+        JS_ASSERT(IsSimdType(obj->type()));
+        JS_ASSERT(uint32_t(lane) < SimdTypeToLength(obj->type()));
+        JS_ASSERT(!IsSimdType(type));
+        JS_ASSERT(SimdTypeToScalarType(obj->type()) == type);
+        setResultType(type);
+    }
+
+  public:
+    INSTRUCTION_HEADER(SimdExtractElement);
+    static MSimdExtractElement *NewAsmJS(TempAllocator &alloc, MDefinition *obj, MIRType type,
+                                         SimdLane lane)
+    {
+        return new(alloc) MSimdExtractElement(obj, type, lane);
+    }
+
+    SimdLane lane() const {
+        return lane_;
+    }
+
+    AliasSet getAliasSet() const {
+        return AliasSet::None();
+    }
+    bool congruentTo(const MDefinition *ins) const {
+        if (!ins->isSimdExtractElement())
+            return false;
+        const MSimdExtractElement *other = ins->toSimdExtractElement();
+        if (other->lane_ != lane_)
+            return false;
+        return congruentIfOperandsEqual(other);
+    }
+};
+
 // Deep clone a constant JSObject.
 class MCloneLiteral
   : public MUnaryInstruction,
diff --git a/js/src/jit/MOpcodes.h b/js/src/jit/MOpcodes.h
index 4c07b46640bf..bd6a5bbc101e 100644
--- a/js/src/jit/MOpcodes.h
+++ b/js/src/jit/MOpcodes.h
@@ -12,6 +12,7 @@ namespace jit {
 
 #define MIR_OPCODE_LIST(_)                                                  \
     _(Constant)                                                             \
+    _(SimdExtractElement)                                                   \
     _(CloneLiteral)                                                         \
     _(Parameter)                                                            \
     _(Callee)                                                               \
diff --git a/js/src/jit/ParallelSafetyAnalysis.cpp b/js/src/jit/ParallelSafetyAnalysis.cpp
index 9b5291450fe4..3f0379c6b8b9 100644
--- a/js/src/jit/ParallelSafetyAnalysis.cpp
+++ b/js/src/jit/ParallelSafetyAnalysis.cpp
@@ -112,6 +112,7 @@ class ParallelSafetyVisitor : public MDefinitionVisitor
     // obviously safe for now.  We can loosen as we need.
 
     SAFE_OP(Constant)
+    SAFE_OP(SimdExtractElement)
     UNSAFE_OP(CloneLiteral)
     SAFE_OP(Parameter)
     SAFE_OP(Callee)
diff --git a/js/src/jit/arm/CodeGenerator-arm.h b/js/src/jit/arm/CodeGenerator-arm.h
index 68c3332b13b1..ca2e3e0030a3 100644
--- a/js/src/jit/arm/CodeGenerator-arm.h
+++ b/js/src/jit/arm/CodeGenerator-arm.h
@@ -224,6 +224,11 @@ class CodeGeneratorARM : public CodeGeneratorShared
     bool visitUDiv(LUDiv *ins);
     bool visitUMod(LUMod *ins);
     bool visitSoftUDivOrMod(LSoftUDivOrMod *ins);
+
+  public:
+    // Unimplemented SIMD instructions
+    bool visitSimdExtractElementI(LSimdExtractElementI *ins) { MOZ_ASSUME_UNREACHABLE("NYI"); }
+    bool visitSimdExtractElementF(LSimdExtractElementF *ins) { MOZ_ASSUME_UNREACHABLE("NYI"); }
 };
 
 typedef CodeGeneratorARM CodeGeneratorSpecific;
diff --git a/js/src/jit/shared/Assembler-x86-shared.h b/js/src/jit/shared/Assembler-x86-shared.h
index 152693e8ac7a..9b4b43c3feef 100644
--- a/js/src/jit/shared/Assembler-x86-shared.h
+++ b/js/src/jit/shared/Assembler-x86-shared.h
@@ -1463,6 +1463,14 @@ class AssemblerX86Shared : public AssemblerShared
         JS_ASSERT(HasSSE2());
         masm.movd_rr(src.code(), dest.code());
     }
+    void pshufd(uint32_t mask, FloatRegister src, FloatRegister dest) {
+        JS_ASSERT(HasSSE2());
+        masm.pshufd_irr(mask, src.code(), dest.code());
+    }
+    void shufps(uint32_t mask, FloatRegister src, FloatRegister dest) {
+        JS_ASSERT(HasSSE2());
+        masm.shufps_irr(mask, src.code(), dest.code());
+    }
     void addsd(FloatRegister src, FloatRegister dest) {
         JS_ASSERT(HasSSE2());
         masm.addsd_rr(src.code(), dest.code());
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.cpp b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
index d3ba4683b275..0b8f9e6c78cc 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
@@ -2053,6 +2053,43 @@ CodeGeneratorX86Shared::visitNegF(LNegF *ins)
     return true;
 }
 
+bool
+CodeGeneratorX86Shared::visitSimdExtractElementI(LSimdExtractElementI *ins)
+{
+    FloatRegister input = ToFloatRegister(ins->input());
+    Register output = ToRegister(ins->output());
+
+    SimdLane lane = ins->lane();
+    if (lane == LaneX) {
+        // The value we want to extract is in the low double-word
+        masm.moveLowInt32(input, output);
+    } else {
+        uint32_t mask = MacroAssembler::ComputeShuffleMask(lane);
+        masm.shuffleInt32(mask, input, ScratchSimdReg);
+        masm.moveLowInt32(ScratchSimdReg, output);
+    }
+    return true;
+}
+
+bool
+CodeGeneratorX86Shared::visitSimdExtractElementF(LSimdExtractElementF *ins)
+{
+    FloatRegister input = ToFloatRegister(ins->input());
+    FloatRegister output = ToFloatRegister(ins->output());
+
+    SimdLane lane = ins->lane();
+    if (lane == LaneX) {
+        // The value we want to extract is in the low double-word
+        if (input != output)
+            masm.moveFloat32(input, output);
+    } else {
+        uint32_t mask = MacroAssembler::ComputeShuffleMask(lane);
+        masm.shuffleFloat32(mask, input, output);
+    }
+    masm.canonicalizeFloat(output);
+    return true;
+}
+
 bool
 CodeGeneratorX86Shared::visitForkJoinGetSlice(LForkJoinGetSlice *ins)
 {
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.h b/js/src/jit/shared/CodeGenerator-x86-shared.h
index 1278c95e6b46..6d33809f36bb 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.h
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.h
@@ -204,6 +204,10 @@ class CodeGeneratorX86Shared : public CodeGeneratorShared
     bool visitNegD(LNegD *lir);
     bool visitNegF(LNegF *lir);
 
+    // SIMD operators
+    bool visitSimdExtractElementI(LSimdExtractElementI *lir);
+    bool visitSimdExtractElementF(LSimdExtractElementF *lir);
+
     // Out of line visitors.
     bool visitOutOfLineBailout(OutOfLineBailout *ool);
     bool visitOutOfLineUndoALUOperation(OutOfLineUndoALUOperation *ool);
diff --git a/js/src/jit/shared/MacroAssembler-x86-shared.h b/js/src/jit/shared/MacroAssembler-x86-shared.h
index 66baa19d51d0..10b6437b3e7d 100644
--- a/js/src/jit/shared/MacroAssembler-x86-shared.h
+++ b/js/src/jit/shared/MacroAssembler-x86-shared.h
@@ -499,6 +499,35 @@ class MacroAssemblerX86Shared : public Assembler
         movups(src, Operand(dest));
     }
 
+    static uint32_t ComputeShuffleMask(SimdLane x, SimdLane y = LaneX,
+                                       SimdLane z = LaneX, SimdLane w = LaneX)
+    {
+        uint32_t r = (uint32_t(w) << 6) |
+                     (uint32_t(z) << 4) |
+                     (uint32_t(y) << 2) |
+                     uint32_t(x);
+        JS_ASSERT(r < 256);
+        return r;
+    }
+
+    void shuffleInt32(uint32_t mask, FloatRegister src, FloatRegister dest) {
+        pshufd(mask, src, dest);
+    }
+    void moveLowInt32(FloatRegister src, Register dest) {
+        movd(src, dest);
+    }
+
+    void shuffleFloat32(uint32_t mask, FloatRegister src, FloatRegister dest) {
+        // The shuffle instruction on x86 is such that it moves 2 words from
+        // the dest and 2 words from the src operands. To simplify things, just
+        // clobber the output with the input and apply the instruction
+        // afterwards.
+        // Note: this is useAtStart-safe because src isn't read afterwards.
+        if (src != dest)
+            moveAlignedFloat32x4(src, dest);
+        shufps(mask, dest, dest);
+    }
+
     void moveFloatAsDouble(Register src, FloatRegister dest) {
         movd(src, dest);
         cvtss2sd(dest, dest);

From cd5a3cc5236324e3e1e0363bc892276bafd97946 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Wed, 13 Aug 2014 11:18:09 +0200
Subject: [PATCH 66/89] Bug 1021716: Use movhlps for extracting lane Z of a
 float32x4 register; r=sunfish

---
 js/src/assembler/assembler/X86Assembler.h      | 8 ++++++++
 js/src/jit/shared/Assembler-x86-shared.h       | 4 ++++
 js/src/jit/shared/CodeGenerator-x86-shared.cpp | 2 ++
 js/src/jit/shared/MacroAssembler-x86-shared.h  | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index 9afd4662a246..767bafc3d867 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -288,6 +288,7 @@ private:
         OP2_MOVPS_VpsWps    = 0x10,
         OP2_MOVSD_WsdVsd    = 0x11,
         OP2_MOVPS_WpsVps    = 0x11,
+        OP2_MOVHLPS_VqUq    = 0x12,
         OP2_UNPCKLPS_VsdWsd = 0x14,
         OP2_MOVAPD_VsdWsd   = 0x28,
         OP2_MOVAPS_VsdWsd   = 0x28,
@@ -2608,6 +2609,13 @@ public:
         m_formatter.immediate8(uint8_t(mask));
     }
 
+    void movhlps_rr(XMMRegisterID src, XMMRegisterID dst)
+    {
+        spew("movhlps     %s, %s",
+             nameFPReg(src), nameFPReg(dst));
+        m_formatter.twoByteOp(OP2_MOVHLPS_VqUq, (RegisterID)dst, (RegisterID)src);
+    }
+
     void psrldq_ir(int shift, XMMRegisterID dest)
     {
         spew("psrldq     $%d, %s",
diff --git a/js/src/jit/shared/Assembler-x86-shared.h b/js/src/jit/shared/Assembler-x86-shared.h
index 9b4b43c3feef..bce51a09839a 100644
--- a/js/src/jit/shared/Assembler-x86-shared.h
+++ b/js/src/jit/shared/Assembler-x86-shared.h
@@ -1467,6 +1467,10 @@ class AssemblerX86Shared : public AssemblerShared
         JS_ASSERT(HasSSE2());
         masm.pshufd_irr(mask, src.code(), dest.code());
     }
+    void movhlps(FloatRegister src, FloatRegister dest) {
+        JS_ASSERT(HasSSE2());
+        masm.movhlps_rr(src.code(), dest.code());
+    }
     void shufps(uint32_t mask, FloatRegister src, FloatRegister dest) {
         JS_ASSERT(HasSSE2());
         masm.shufps_irr(mask, src.code(), dest.code());
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.cpp b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
index 0b8f9e6c78cc..077ca7c61d56 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
@@ -2082,6 +2082,8 @@ CodeGeneratorX86Shared::visitSimdExtractElementF(LSimdExtractElementF *ins)
         // The value we want to extract is in the low double-word
         if (input != output)
             masm.moveFloat32(input, output);
+    } else if (lane == LaneZ) {
+        masm.moveHighPairToLowPairFloat32(input, output);
     } else {
         uint32_t mask = MacroAssembler::ComputeShuffleMask(lane);
         masm.shuffleFloat32(mask, input, output);
diff --git a/js/src/jit/shared/MacroAssembler-x86-shared.h b/js/src/jit/shared/MacroAssembler-x86-shared.h
index 10b6437b3e7d..6c49f9900162 100644
--- a/js/src/jit/shared/MacroAssembler-x86-shared.h
+++ b/js/src/jit/shared/MacroAssembler-x86-shared.h
@@ -517,6 +517,9 @@ class MacroAssemblerX86Shared : public Assembler
         movd(src, dest);
     }
 
+    void moveHighPairToLowPairFloat32(FloatRegister src, FloatRegister dest) {
+        movhlps(src, dest);
+    }
     void shuffleFloat32(uint32_t mask, FloatRegister src, FloatRegister dest) {
         // The shuffle instruction on x86 is such that it moves 2 words from
         // the dest and 2 words from the src operands. To simplify things, just

From c9b30cafe31b2dea0d25c3783ba63962c0bf1bd8 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Wed, 13 Aug 2014 18:21:45 +0900
Subject: [PATCH 67/89] Bug 1052147 - Initialize AnimationPlayer::mPlayState to
 running state; r=dbaron

The assertion in nsTimeStamp::operator >= occasionally fails due to a null RHS
timestamp when called from AnimationPlayer::GetCurrentTimeDuration, which, in
turn, is called from AnimationPlayer::SetSource.

The issue appears to be that we're not correctly initializing
AnimationPlayer.mPlayState. This value can be running (0) or paused (1) but we
only ever compare against the paused state (i.e. every other value is
effectively treated as running). If we don't initialize this we can end
up in the paused state but with mPauseStart not set to a valid (non-null)
TimeStamp. This creates an inconsistent state since we assume that when we're
paused mPauseStart is non-null, hence the assertion fails.

This gets tickled because, since bug 1040543, we call
AnimationPlayer::SetSource from nsAnimationManager::BuildAnimations *before* we
set mPlayState and mPauseStart.

This patch initializes mPlayState to the running state so we don't accidentally
end up in an inconsistent state.

It also removes some (now unnecessary) initialization of mPlayState and
mPauseStart from nsTransitionManager::ConsiderStartingTransition.

In future we could also consider reworking nsAnimationManager::BuildAnimations
so that we call SetSource on the new animation player *after* setting up its
play state. That may be more correct and would further avoid this problem but
may not be necessary since all that code is likely to change in the near future.
---
 dom/animation/AnimationPlayer.h      | 3 ++-
 layout/style/nsTransitionManager.cpp | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dom/animation/AnimationPlayer.h b/dom/animation/AnimationPlayer.h
index 99d8f7622779..56a8ae640b77 100644
--- a/dom/animation/AnimationPlayer.h
+++ b/dom/animation/AnimationPlayer.h
@@ -32,7 +32,8 @@ protected:
 
 public:
   explicit AnimationPlayer(AnimationTimeline* aTimeline)
-    : mIsRunningOnCompositor(false)
+    : mPlayState(NS_STYLE_ANIMATION_PLAY_STATE_RUNNING)
+    , mIsRunningOnCompositor(false)
     , mTimeline(aTimeline)
   {
     SetIsDOMBinding();
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 609f5b573145..d1e7df72e36f 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -516,8 +516,6 @@ nsTransitionManager::ConsiderStartingTransition(
 
   nsRefPtr<dom::AnimationPlayer> player = new dom::AnimationPlayer(timeline);
   player->mStartTime = timeline->GetCurrentTimeStamp();
-  player->mPlayState = NS_STYLE_ANIMATION_PLAY_STATE_RUNNING;
-  player->mPauseStart = TimeStamp();
   player->SetSource(pt);
 
   if (!aElementTransitions) {

From 67926429617b360fc12ab6c66ef57b73f10ba383 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Wed, 13 Aug 2014 04:39:47 -0500
Subject: [PATCH 68/89] Bug 1047842 - Pass WM_GETTEXTLENGTH messages in ipc
 wait for notify calls to DefWindowProc. r=bent

---
 ipc/glue/WindowsMessageLoop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp
index 3de93a765b14..bb7fbb420000 100644
--- a/ipc/glue/WindowsMessageLoop.cpp
+++ b/ipc/glue/WindowsMessageLoop.cpp
@@ -296,7 +296,8 @@ ProcessOrDeferMessage(HWND hwnd,
     case WM_GETTEXT:
     case WM_NCHITTEST:
     case WM_STYLECHANGING:  // Intentional fall-through.
-    case WM_WINDOWPOSCHANGING: { 
+    case WM_WINDOWPOSCHANGING:
+    case WM_GETTEXTLENGTH: {
       return DefWindowProc(hwnd, uMsg, wParam, lParam);
     }
 

From dc108c90b973dcf89c5974ae836118f17a3071e8 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Tue, 12 Aug 2014 14:06:00 -0500
Subject: [PATCH 69/89] Bug 1052395 - Improve ipc debug output for unhandled
 nonqueued Windows messages. r=bent

---
 ipc/glue/WindowsMessageLoop.cpp |  28 ++-
 widget/windows/WinUtils.cpp     | 339 +++++++++++++++++++++++++++++++
 widget/windows/WinUtils.h       |   7 +
 widget/windows/nsWindowDbg.cpp  | 349 +-------------------------------
 widget/windows/nsWindowDbg.h    |   2 -
 widget/windows/nsWindowDefs.h   |  13 ++
 6 files changed, 387 insertions(+), 351 deletions(-)

diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp
index bb7fbb420000..fbc9c102993c 100644
--- a/ipc/glue/WindowsMessageLoop.cpp
+++ b/ipc/glue/WindowsMessageLoop.cpp
@@ -14,6 +14,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsIXULAppInfo.h"
+#include "WinUtils.h"
 
 #include "mozilla/PaintTracker.h"
 
@@ -169,10 +170,31 @@ static void
 DumpNeuteredMessage(HWND hwnd, UINT uMsg)
 {
 #ifdef DEBUG
-  nsAutoCString log("Received \"nonqueued\" message ");
-  log.AppendInt(uMsg);
+  nsAutoCString log("Received \"nonqueued\" ");
+  // classify messages
+  if (uMsg < WM_USER) {
+    int idx = 0;
+    while (mozilla::widget::gAllEvents[idx].mId != (long)uMsg &&
+           mozilla::widget::gAllEvents[idx].mStr != nullptr) {
+      idx++;
+    }
+    if (mozilla::widget::gAllEvents[idx].mStr) {
+      log.AppendPrintf("ui message \"%s\"", mozilla::widget::gAllEvents[idx].mStr);
+    } else {
+      log.AppendPrintf("ui message (0x%X)", uMsg);
+    }
+  } else if (uMsg >= WM_USER && uMsg < WM_APP) {
+    log.AppendPrintf("WM_USER message (0x%X)", uMsg);
+  } else if (uMsg >= WM_APP && uMsg < 0xC000) {
+    log.AppendPrintf("WM_APP message (0x%X)", uMsg);
+  } else if (uMsg >= 0xC000 && uMsg < 0x10000) {
+    log.AppendPrintf("registered windows message (0x%X)", uMsg);
+  } else {
+    log.AppendPrintf("system message (0x%X)", uMsg);
+  }
+
   log.AppendLiteral(" during a synchronous IPC message for window ");
-  log.AppendInt((int64_t)hwnd);
+  log.AppendPrintf("0x%X", hwnd);
 
   wchar_t className[256] = { 0 };
   if (GetClassNameW(hwnd, className, sizeof(className) - 1) > 0) {
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 4d6ac9680d23..92f4006de812 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -59,6 +59,345 @@ using namespace mozilla::gfx;
 
 namespace mozilla {
 namespace widget {
+
+#define ENTRY(_msg) { #_msg, _msg }
+EventMsgInfo gAllEvents[] = {
+  ENTRY(WM_NULL),
+  ENTRY(WM_CREATE),
+  ENTRY(WM_DESTROY),
+  ENTRY(WM_MOVE),
+  ENTRY(WM_SIZE),
+  ENTRY(WM_ACTIVATE),
+  ENTRY(WM_SETFOCUS),
+  ENTRY(WM_KILLFOCUS),
+  ENTRY(WM_ENABLE),
+  ENTRY(WM_SETREDRAW),
+  ENTRY(WM_SETTEXT),
+  ENTRY(WM_GETTEXT),
+  ENTRY(WM_GETTEXTLENGTH),
+  ENTRY(WM_PAINT),
+  ENTRY(WM_CLOSE),
+  ENTRY(WM_QUERYENDSESSION),
+  ENTRY(WM_QUIT),
+  ENTRY(WM_QUERYOPEN),
+  ENTRY(WM_ERASEBKGND),
+  ENTRY(WM_SYSCOLORCHANGE),
+  ENTRY(WM_ENDSESSION),
+  ENTRY(WM_SHOWWINDOW),
+  ENTRY(WM_SETTINGCHANGE),
+  ENTRY(WM_DEVMODECHANGE),
+  ENTRY(WM_ACTIVATEAPP),
+  ENTRY(WM_FONTCHANGE),
+  ENTRY(WM_TIMECHANGE),
+  ENTRY(WM_CANCELMODE),
+  ENTRY(WM_SETCURSOR),
+  ENTRY(WM_MOUSEACTIVATE),
+  ENTRY(WM_CHILDACTIVATE),
+  ENTRY(WM_QUEUESYNC),
+  ENTRY(WM_GETMINMAXINFO),
+  ENTRY(WM_PAINTICON),
+  ENTRY(WM_ICONERASEBKGND),
+  ENTRY(WM_NEXTDLGCTL),
+  ENTRY(WM_SPOOLERSTATUS),
+  ENTRY(WM_DRAWITEM),
+  ENTRY(WM_MEASUREITEM),
+  ENTRY(WM_DELETEITEM),
+  ENTRY(WM_VKEYTOITEM),
+  ENTRY(WM_CHARTOITEM),
+  ENTRY(WM_SETFONT),
+  ENTRY(WM_GETFONT),
+  ENTRY(WM_SETHOTKEY),
+  ENTRY(WM_GETHOTKEY),
+  ENTRY(WM_QUERYDRAGICON),
+  ENTRY(WM_COMPAREITEM),
+  ENTRY(WM_GETOBJECT),
+  ENTRY(WM_COMPACTING),
+  ENTRY(WM_COMMNOTIFY),
+  ENTRY(WM_WINDOWPOSCHANGING),
+  ENTRY(WM_WINDOWPOSCHANGED),
+  ENTRY(WM_POWER),
+  ENTRY(WM_COPYDATA),
+  ENTRY(WM_CANCELJOURNAL),
+  ENTRY(WM_NOTIFY),
+  ENTRY(WM_INPUTLANGCHANGEREQUEST),
+  ENTRY(WM_INPUTLANGCHANGE),
+  ENTRY(WM_TCARD),
+  ENTRY(WM_HELP),
+  ENTRY(WM_USERCHANGED),
+  ENTRY(WM_NOTIFYFORMAT),
+  ENTRY(WM_CONTEXTMENU),
+  ENTRY(WM_STYLECHANGING),
+  ENTRY(WM_STYLECHANGED),
+  ENTRY(WM_DISPLAYCHANGE),
+  ENTRY(WM_GETICON),
+  ENTRY(WM_SETICON),
+  ENTRY(WM_NCCREATE),
+  ENTRY(WM_NCDESTROY),
+  ENTRY(WM_NCCALCSIZE),
+  ENTRY(WM_NCHITTEST),
+  ENTRY(WM_NCPAINT),
+  ENTRY(WM_NCACTIVATE),
+  ENTRY(WM_GETDLGCODE),
+  ENTRY(WM_SYNCPAINT),
+  ENTRY(WM_NCMOUSEMOVE),
+  ENTRY(WM_NCLBUTTONDOWN),
+  ENTRY(WM_NCLBUTTONUP),
+  ENTRY(WM_NCLBUTTONDBLCLK),
+  ENTRY(WM_NCRBUTTONDOWN),
+  ENTRY(WM_NCRBUTTONUP),
+  ENTRY(WM_NCRBUTTONDBLCLK),
+  ENTRY(WM_NCMBUTTONDOWN),
+  ENTRY(WM_NCMBUTTONUP),
+  ENTRY(WM_NCMBUTTONDBLCLK),
+  ENTRY(EM_GETSEL),
+  ENTRY(EM_SETSEL),
+  ENTRY(EM_GETRECT),
+  ENTRY(EM_SETRECT),
+  ENTRY(EM_SETRECTNP),
+  ENTRY(EM_SCROLL),
+  ENTRY(EM_LINESCROLL),
+  ENTRY(EM_SCROLLCARET),
+  ENTRY(EM_GETMODIFY),
+  ENTRY(EM_SETMODIFY),
+  ENTRY(EM_GETLINECOUNT),
+  ENTRY(EM_LINEINDEX),
+  ENTRY(EM_SETHANDLE),
+  ENTRY(EM_GETHANDLE),
+  ENTRY(EM_GETTHUMB),
+  ENTRY(EM_LINELENGTH),
+  ENTRY(EM_REPLACESEL),
+  ENTRY(EM_GETLINE),
+  ENTRY(EM_LIMITTEXT),
+  ENTRY(EM_CANUNDO),
+  ENTRY(EM_UNDO),
+  ENTRY(EM_FMTLINES),
+  ENTRY(EM_LINEFROMCHAR),
+  ENTRY(EM_SETTABSTOPS),
+  ENTRY(EM_SETPASSWORDCHAR),
+  ENTRY(EM_EMPTYUNDOBUFFER),
+  ENTRY(EM_GETFIRSTVISIBLELINE),
+  ENTRY(EM_SETREADONLY),
+  ENTRY(EM_SETWORDBREAKPROC),
+  ENTRY(EM_GETWORDBREAKPROC),
+  ENTRY(EM_GETPASSWORDCHAR),
+  ENTRY(EM_SETMARGINS),
+  ENTRY(EM_GETMARGINS),
+  ENTRY(EM_GETLIMITTEXT),
+  ENTRY(EM_POSFROMCHAR),
+  ENTRY(EM_CHARFROMPOS),
+  ENTRY(EM_SETIMESTATUS),
+  ENTRY(EM_GETIMESTATUS),
+  ENTRY(SBM_SETPOS),
+  ENTRY(SBM_GETPOS),
+  ENTRY(SBM_SETRANGE),
+  ENTRY(SBM_SETRANGEREDRAW),
+  ENTRY(SBM_GETRANGE),
+  ENTRY(SBM_ENABLE_ARROWS),
+  ENTRY(SBM_SETSCROLLINFO),
+  ENTRY(SBM_GETSCROLLINFO),
+  ENTRY(WM_KEYDOWN),
+  ENTRY(WM_KEYUP),
+  ENTRY(WM_CHAR),
+  ENTRY(WM_DEADCHAR),
+  ENTRY(WM_SYSKEYDOWN),
+  ENTRY(WM_SYSKEYUP),
+  ENTRY(WM_SYSCHAR),
+  ENTRY(WM_SYSDEADCHAR),
+  ENTRY(WM_KEYLAST),
+  ENTRY(WM_IME_STARTCOMPOSITION),
+  ENTRY(WM_IME_ENDCOMPOSITION),
+  ENTRY(WM_IME_COMPOSITION),
+  ENTRY(WM_INITDIALOG),
+  ENTRY(WM_COMMAND),
+  ENTRY(WM_SYSCOMMAND),
+  ENTRY(WM_TIMER),
+  ENTRY(WM_HSCROLL),
+  ENTRY(WM_VSCROLL),
+  ENTRY(WM_INITMENU),
+  ENTRY(WM_INITMENUPOPUP),
+  ENTRY(WM_MENUSELECT),
+  ENTRY(WM_MENUCHAR),
+  ENTRY(WM_ENTERIDLE),
+  ENTRY(WM_MENURBUTTONUP),
+  ENTRY(WM_MENUDRAG),
+  ENTRY(WM_MENUGETOBJECT),
+  ENTRY(WM_UNINITMENUPOPUP),
+  ENTRY(WM_MENUCOMMAND),
+  ENTRY(WM_CHANGEUISTATE),
+  ENTRY(WM_UPDATEUISTATE),
+  ENTRY(WM_CTLCOLORMSGBOX),
+  ENTRY(WM_CTLCOLOREDIT),
+  ENTRY(WM_CTLCOLORLISTBOX),
+  ENTRY(WM_CTLCOLORBTN),
+  ENTRY(WM_CTLCOLORDLG),
+  ENTRY(WM_CTLCOLORSCROLLBAR),
+  ENTRY(WM_CTLCOLORSTATIC),
+  ENTRY(CB_GETEDITSEL),
+  ENTRY(CB_LIMITTEXT),
+  ENTRY(CB_SETEDITSEL),
+  ENTRY(CB_ADDSTRING),
+  ENTRY(CB_DELETESTRING),
+  ENTRY(CB_DIR),
+  ENTRY(CB_GETCOUNT),
+  ENTRY(CB_GETCURSEL),
+  ENTRY(CB_GETLBTEXT),
+  ENTRY(CB_GETLBTEXTLEN),
+  ENTRY(CB_INSERTSTRING),
+  ENTRY(CB_RESETCONTENT),
+  ENTRY(CB_FINDSTRING),
+  ENTRY(CB_SELECTSTRING),
+  ENTRY(CB_SETCURSEL),
+  ENTRY(CB_SHOWDROPDOWN),
+  ENTRY(CB_GETITEMDATA),
+  ENTRY(CB_SETITEMDATA),
+  ENTRY(CB_GETDROPPEDCONTROLRECT),
+  ENTRY(CB_SETITEMHEIGHT),
+  ENTRY(CB_GETITEMHEIGHT),
+  ENTRY(CB_SETEXTENDEDUI),
+  ENTRY(CB_GETEXTENDEDUI),
+  ENTRY(CB_GETDROPPEDSTATE),
+  ENTRY(CB_FINDSTRINGEXACT),
+  ENTRY(CB_SETLOCALE),
+  ENTRY(CB_GETLOCALE),
+  ENTRY(CB_GETTOPINDEX),
+  ENTRY(CB_SETTOPINDEX),
+  ENTRY(CB_GETHORIZONTALEXTENT),
+  ENTRY(CB_SETHORIZONTALEXTENT),
+  ENTRY(CB_GETDROPPEDWIDTH),
+  ENTRY(CB_SETDROPPEDWIDTH),
+  ENTRY(CB_INITSTORAGE),
+  ENTRY(CB_MSGMAX),
+  ENTRY(LB_ADDSTRING),
+  ENTRY(LB_INSERTSTRING),
+  ENTRY(LB_DELETESTRING),
+  ENTRY(LB_SELITEMRANGEEX),
+  ENTRY(LB_RESETCONTENT),
+  ENTRY(LB_SETSEL),
+  ENTRY(LB_SETCURSEL),
+  ENTRY(LB_GETSEL),
+  ENTRY(LB_GETCURSEL),
+  ENTRY(LB_GETTEXT),
+  ENTRY(LB_GETTEXTLEN),
+  ENTRY(LB_GETCOUNT),
+  ENTRY(LB_SELECTSTRING),
+  ENTRY(LB_DIR),
+  ENTRY(LB_GETTOPINDEX),
+  ENTRY(LB_FINDSTRING),
+  ENTRY(LB_GETSELCOUNT),
+  ENTRY(LB_GETSELITEMS),
+  ENTRY(LB_SETTABSTOPS),
+  ENTRY(LB_GETHORIZONTALEXTENT),
+  ENTRY(LB_SETHORIZONTALEXTENT),
+  ENTRY(LB_SETCOLUMNWIDTH),
+  ENTRY(LB_ADDFILE),
+  ENTRY(LB_SETTOPINDEX),
+  ENTRY(LB_GETITEMRECT),
+  ENTRY(LB_GETITEMDATA),
+  ENTRY(LB_SETITEMDATA),
+  ENTRY(LB_SELITEMRANGE),
+  ENTRY(LB_SETANCHORINDEX),
+  ENTRY(LB_GETANCHORINDEX),
+  ENTRY(LB_SETCARETINDEX),
+  ENTRY(LB_GETCARETINDEX),
+  ENTRY(LB_SETITEMHEIGHT),
+  ENTRY(LB_GETITEMHEIGHT),
+  ENTRY(LB_FINDSTRINGEXACT),
+  ENTRY(LB_SETLOCALE),
+  ENTRY(LB_GETLOCALE),
+  ENTRY(LB_SETCOUNT),
+  ENTRY(LB_INITSTORAGE),
+  ENTRY(LB_ITEMFROMPOINT),
+  ENTRY(LB_MSGMAX),
+  ENTRY(WM_MOUSEMOVE),
+  ENTRY(WM_LBUTTONDOWN),
+  ENTRY(WM_LBUTTONUP),
+  ENTRY(WM_LBUTTONDBLCLK),
+  ENTRY(WM_RBUTTONDOWN),
+  ENTRY(WM_RBUTTONUP),
+  ENTRY(WM_RBUTTONDBLCLK),
+  ENTRY(WM_MBUTTONDOWN),
+  ENTRY(WM_MBUTTONUP),
+  ENTRY(WM_MBUTTONDBLCLK),
+  ENTRY(WM_MOUSEWHEEL),
+  ENTRY(WM_MOUSEHWHEEL),
+  ENTRY(WM_PARENTNOTIFY),
+  ENTRY(WM_ENTERMENULOOP),
+  ENTRY(WM_EXITMENULOOP),
+  ENTRY(WM_NEXTMENU),
+  ENTRY(WM_SIZING),
+  ENTRY(WM_CAPTURECHANGED),
+  ENTRY(WM_MOVING),
+  ENTRY(WM_POWERBROADCAST),
+  ENTRY(WM_DEVICECHANGE),
+  ENTRY(WM_MDICREATE),
+  ENTRY(WM_MDIDESTROY),
+  ENTRY(WM_MDIACTIVATE),
+  ENTRY(WM_MDIRESTORE),
+  ENTRY(WM_MDINEXT),
+  ENTRY(WM_MDIMAXIMIZE),
+  ENTRY(WM_MDITILE),
+  ENTRY(WM_MDICASCADE),
+  ENTRY(WM_MDIICONARRANGE),
+  ENTRY(WM_MDIGETACTIVE),
+  ENTRY(WM_MDISETMENU),
+  ENTRY(WM_ENTERSIZEMOVE),
+  ENTRY(WM_EXITSIZEMOVE),
+  ENTRY(WM_DROPFILES),
+  ENTRY(WM_MDIREFRESHMENU),
+  ENTRY(WM_IME_SETCONTEXT),
+  ENTRY(WM_IME_NOTIFY),
+  ENTRY(WM_IME_CONTROL),
+  ENTRY(WM_IME_COMPOSITIONFULL),
+  ENTRY(WM_IME_SELECT),
+  ENTRY(WM_IME_CHAR),
+  ENTRY(WM_IME_REQUEST),
+  ENTRY(WM_IME_KEYDOWN),
+  ENTRY(WM_IME_KEYUP),
+  ENTRY(WM_NCMOUSEHOVER),
+  ENTRY(WM_MOUSEHOVER),
+  ENTRY(WM_MOUSELEAVE),
+  ENTRY(WM_CUT),
+  ENTRY(WM_COPY),
+  ENTRY(WM_PASTE),
+  ENTRY(WM_CLEAR),
+  ENTRY(WM_UNDO),
+  ENTRY(WM_RENDERFORMAT),
+  ENTRY(WM_RENDERALLFORMATS),
+  ENTRY(WM_DESTROYCLIPBOARD),
+  ENTRY(WM_DRAWCLIPBOARD),
+  ENTRY(WM_PAINTCLIPBOARD),
+  ENTRY(WM_VSCROLLCLIPBOARD),
+  ENTRY(WM_SIZECLIPBOARD),
+  ENTRY(WM_ASKCBFORMATNAME),
+  ENTRY(WM_CHANGECBCHAIN),
+  ENTRY(WM_HSCROLLCLIPBOARD),
+  ENTRY(WM_QUERYNEWPALETTE),
+  ENTRY(WM_PALETTEISCHANGING),
+  ENTRY(WM_PALETTECHANGED),
+  ENTRY(WM_HOTKEY),
+  ENTRY(WM_PRINT),
+  ENTRY(WM_PRINTCLIENT),
+  ENTRY(WM_THEMECHANGED),
+  ENTRY(WM_HANDHELDFIRST),
+  ENTRY(WM_HANDHELDLAST),
+  ENTRY(WM_AFXFIRST),
+  ENTRY(WM_AFXLAST),
+  ENTRY(WM_PENWINFIRST),
+  ENTRY(WM_PENWINLAST),
+  ENTRY(WM_APP),
+  ENTRY(WM_DWMCOMPOSITIONCHANGED),
+  ENTRY(WM_DWMNCRENDERINGCHANGED),
+  ENTRY(WM_DWMCOLORIZATIONCOLORCHANGED),
+  ENTRY(WM_DWMWINDOWMAXIMIZEDCHANGE),
+  ENTRY(WM_DWMSENDICONICTHUMBNAIL),
+  ENTRY(WM_DWMSENDICONICLIVEPREVIEWBITMAP),
+  ENTRY(WM_TABLET_QUERYSYSTEMGESTURESTATUS),
+  ENTRY(WM_GESTURE),
+  ENTRY(WM_GESTURENOTIFY),
+  ENTRY(WM_GETTITLEBARINFOEX),
+  {nullptr, 0x0}
+};
+#undef ENTRY
 
 #ifdef MOZ_PLACES
 NS_IMPL_ISUPPORTS(myDownloadObserver, nsIDownloadObserver)
diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h
index e00e44cd2593..2dedd9b525e0 100644
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -72,6 +72,13 @@ struct nsIntRect;
 namespace mozilla {
 namespace widget {
 
+// Windows message debugging data
+typedef struct {
+  const char * mStr;
+  UINT         mId;
+} EventMsgInfo;
+extern EventMsgInfo gAllEvents[];
+
 // More complete QS definitions for MsgWaitForMultipleObjects() and
 // GetQueueStatus() that include newer win8 specific defines.
 
diff --git a/widget/windows/nsWindowDbg.cpp b/widget/windows/nsWindowDbg.cpp
index b1a655eac4de..2e94c3e28f41 100644
--- a/widget/windows/nsWindowDbg.cpp
+++ b/widget/windows/nsWindowDbg.cpp
@@ -8,18 +8,14 @@
  */
 
 #include "nsWindowDbg.h"
+#include "WinUtils.h"
+
+using namespace mozilla::widget;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gWindowsLog;
 #endif
 
-#if defined(POPUP_ROLLUP_DEBUG_OUTPUT) || defined(EVENT_DEBUG_OUTPUT) || 1
-
-typedef struct {
-  const char * mStr;
-  long         mId;
-} EventMsgInfo;
-
 #if defined(POPUP_ROLLUP_DEBUG_OUTPUT)
 MSGFEventMsgInfo gMSGFEvents[] = {
   "MSGF_DIALOGBOX",      0,
@@ -32,343 +28,6 @@ MSGFEventMsgInfo gMSGFEvents[] = {
   nullptr, 0};
 #endif
 
-EventMsgInfo gAllEvents[] = {
-  {"WM_NULL",                             0x0000},
-  {"WM_CREATE",                           0x0001},
-  {"WM_DESTROY",                          0x0002},
-  {"WM_MOVE",                             0x0003},
-  {"WM_SIZE",                             0x0005},
-  {"WM_ACTIVATE",                         0x0006},
-  {"WM_SETFOCUS",                         0x0007},
-  {"WM_KILLFOCUS",                        0x0008},
-  {"WM_ENABLE",                           0x000A},
-  {"WM_SETREDRAW",                        0x000B},
-  {"WM_SETTEXT",                          0x000C},
-  {"WM_GETTEXT",                          0x000D},
-  {"WM_GETTEXTLENGTH",                    0x000E},
-  {"WM_PAINT",                            0x000F},
-  {"WM_CLOSE",                            0x0010},
-  {"WM_QUERYENDSESSION",                  0x0011},
-  {"WM_QUIT",                             0x0012},
-  {"WM_QUERYOPEN",                        0x0013},
-  {"WM_ERASEBKGND",                       0x0014},
-  {"WM_SYSCOLORCHANGE",                   0x0015},
-  {"WM_ENDSESSION",                       0x0016},
-  {"WM_SHOWWINDOW",                       0x0018},
-  {"WM_SETTINGCHANGE",                    0x001A},
-  {"WM_DEVMODECHANGE",                    0x001B},
-  {"WM_ACTIVATEAPP",                      0x001C},
-  {"WM_FONTCHANGE",                       0x001D},
-  {"WM_TIMECHANGE",                       0x001E},
-  {"WM_CANCELMODE",                       0x001F},
-  {"WM_SETCURSOR",                        0x0020},
-  {"WM_MOUSEACTIVATE",                    0x0021},
-  {"WM_CHILDACTIVATE",                    0x0022},
-  {"WM_QUEUESYNC",                        0x0023},
-  {"WM_GETMINMAXINFO",                    0x0024},
-  {"WM_PAINTICON",                        0x0026},
-  {"WM_ICONERASEBKGND",                   0x0027},
-  {"WM_NEXTDLGCTL",                       0x0028},
-  {"WM_SPOOLERSTATUS",                    0x002A},
-  {"WM_DRAWITEM",                         0x002B},
-  {"WM_MEASUREITEM",                      0x002C},
-  {"WM_DELETEITEM",                       0x002D},
-  {"WM_VKEYTOITEM",                       0x002E},
-  {"WM_CHARTOITEM",                       0x002F},
-  {"WM_SETFONT",                          0x0030},
-  {"WM_GETFONT",                          0x0031},
-  {"WM_SETHOTKEY",                        0x0032},
-  {"WM_GETHOTKEY",                        0x0033},
-  {"WM_QUERYDRAGICON",                    0x0037},
-  {"WM_COMPAREITEM",                      0x0039},
-  {"WM_GETOBJECT",                        0x003D},
-  {"WM_COMPACTING",                       0x0041},
-  {"WM_COMMNOTIFY",                       0x0044},
-  {"WM_WINDOWPOSCHANGING",                0x0046},
-  {"WM_WINDOWPOSCHANGED",                 0x0047},
-  {"WM_POWER",                            0x0048},
-  {"WM_COPYDATA",                         0x004A},
-  {"WM_CANCELJOURNAL",                    0x004B},
-  {"WM_NOTIFY",                           0x004E},
-  {"WM_INPUTLANGCHANGEREQUEST",           0x0050},
-  {"WM_INPUTLANGCHANGE",                  0x0051},
-  {"WM_TCARD",                            0x0052},
-  {"WM_HELP",                             0x0053},
-  {"WM_USERCHANGED",                      0x0054},
-  {"WM_NOTIFYFORMAT",                     0x0055},
-  {"WM_CONTEXTMENU",                      0x007B},
-  {"WM_STYLECHANGING",                    0x007C},
-  {"WM_STYLECHANGED",                     0x007D},
-  {"WM_DISPLAYCHANGE",                    0x007E},
-  {"WM_GETICON",                          0x007F},
-  {"WM_SETICON",                          0x0080},
-  {"WM_NCCREATE",                         0x0081},
-  {"WM_NCDESTROY",                        0x0082},
-  {"WM_NCCALCSIZE",                       0x0083},
-  {"WM_NCHITTEST",                        0x0084},
-  {"WM_NCPAINT",                          0x0085},
-  {"WM_NCACTIVATE",                       0x0086},
-  {"WM_GETDLGCODE",                       0x0087},
-  {"WM_SYNCPAINT",                        0x0088},
-  {"WM_NCMOUSEMOVE",                      0x00A0},
-  {"WM_NCLBUTTONDOWN",                    0x00A1},
-  {"WM_NCLBUTTONUP",                      0x00A2},
-  {"WM_NCLBUTTONDBLCLK",                  0x00A3},
-  {"WM_NCRBUTTONDOWN",                    0x00A4},
-  {"WM_NCRBUTTONUP",                      0x00A5},
-  {"WM_NCRBUTTONDBLCLK",                  0x00A6},
-  {"WM_NCMBUTTONDOWN",                    0x00A7},
-  {"WM_NCMBUTTONUP",                      0x00A8},
-  {"WM_NCMBUTTONDBLCLK",                  0x00A9},
-  {"EM_GETSEL",                           0x00B0},
-  {"EM_SETSEL",                           0x00B1},
-  {"EM_GETRECT",                          0x00B2},
-  {"EM_SETRECT",                          0x00B3},
-  {"EM_SETRECTNP",                        0x00B4},
-  {"EM_SCROLL",                           0x00B5},
-  {"EM_LINESCROLL",                       0x00B6},
-  {"EM_SCROLLCARET",                      0x00B7},
-  {"EM_GETMODIFY",                        0x00B8},
-  {"EM_SETMODIFY",                        0x00B9},
-  {"EM_GETLINECOUNT",                     0x00BA},
-  {"EM_LINEINDEX",                        0x00BB},
-  {"EM_SETHANDLE",                        0x00BC},
-  {"EM_GETHANDLE",                        0x00BD},
-  {"EM_GETTHUMB",                         0x00BE},
-  {"EM_LINELENGTH",                       0x00C1},
-  {"EM_REPLACESEL",                       0x00C2},
-  {"EM_GETLINE",                          0x00C4},
-  {"EM_LIMITTEXT",                        0x00C5},
-  {"EM_CANUNDO",                          0x00C6},
-  {"EM_UNDO",                             0x00C7},
-  {"EM_FMTLINES",                         0x00C8},
-  {"EM_LINEFROMCHAR",                     0x00C9},
-  {"EM_SETTABSTOPS",                      0x00CB},
-  {"EM_SETPASSWORDCHAR",                  0x00CC},
-  {"EM_EMPTYUNDOBUFFER",                  0x00CD},
-  {"EM_GETFIRSTVISIBLELINE",              0x00CE},
-  {"EM_SETREADONLY",                      0x00CF},
-  {"EM_SETWORDBREAKPROC",                 0x00D0},
-  {"EM_GETWORDBREAKPROC",                 0x00D1},
-  {"EM_GETPASSWORDCHAR",                  0x00D2},
-  {"EM_SETMARGINS",                       0x00D3},
-  {"EM_GETMARGINS",                       0x00D4},
-  {"EM_GETLIMITTEXT",                     0x00D5},
-  {"EM_POSFROMCHAR",                      0x00D6},
-  {"EM_CHARFROMPOS",                      0x00D7},
-  {"EM_SETIMESTATUS",                     0x00D8},
-  {"EM_GETIMESTATUS",                     0x00D9},
-  {"SBM_SETPOS",                          0x00E0},
-  {"SBM_GETPOS",                          0x00E1},
-  {"SBM_SETRANGE",                        0x00E2},
-  {"SBM_SETRANGEREDRAW",                  0x00E6},
-  {"SBM_GETRANGE",                        0x00E3},
-  {"SBM_ENABLE_ARROWS",                   0x00E4},
-  {"SBM_SETSCROLLINFO",                   0x00E9},
-  {"SBM_GETSCROLLINFO",                   0x00EA},
-  {"WM_KEYDOWN",                          0x0100},
-  {"WM_KEYUP",                            0x0101},
-  {"WM_CHAR",                             0x0102},
-  {"WM_DEADCHAR",                         0x0103},
-  {"WM_SYSKEYDOWN",                       0x0104},
-  {"WM_SYSKEYUP",                         0x0105},
-  {"WM_SYSCHAR",                          0x0106},
-  {"WM_SYSDEADCHAR",                      0x0107},
-  {"WM_KEYLAST",                          0x0108},
-  {"WM_IME_STARTCOMPOSITION",             0x010D},
-  {"WM_IME_ENDCOMPOSITION",               0x010E},
-  {"WM_IME_COMPOSITION",                  0x010F},
-  {"WM_INITDIALOG",                       0x0110},
-  {"WM_COMMAND",                          0x0111},
-  {"WM_SYSCOMMAND",                       0x0112},
-  {"WM_TIMER",                            0x0113},
-  {"WM_HSCROLL",                          0x0114},
-  {"WM_VSCROLL",                          0x0115},
-  {"WM_INITMENU",                         0x0116},
-  {"WM_INITMENUPOPUP",                    0x0117},
-  {"WM_MENUSELECT",                       0x011F},
-  {"WM_MENUCHAR",                         0x0120},
-  {"WM_ENTERIDLE",                        0x0121},
-  {"WM_MENURBUTTONUP",                    0x0122},
-  {"WM_MENUDRAG",                         0x0123},
-  {"WM_MENUGETOBJECT",                    0x0124},
-  {"WM_UNINITMENUPOPUP",                  0x0125},
-  {"WM_MENUCOMMAND",                      0x0126},
-  {"WM_CHANGEUISTATE",                    0x0127},
-  {"WM_UPDATEUISTATE",                    0x0128},
-  {"WM_CTLCOLORMSGBOX",                   0x0132},
-  {"WM_CTLCOLOREDIT",                     0x0133},
-  {"WM_CTLCOLORLISTBOX",                  0x0134},
-  {"WM_CTLCOLORBTN",                      0x0135},
-  {"WM_CTLCOLORDLG",                      0x0136},
-  {"WM_CTLCOLORSCROLLBAR",                0x0137},
-  {"WM_CTLCOLORSTATIC",                   0x0138},
-  {"CB_GETEDITSEL",                       0x0140},
-  {"CB_LIMITTEXT",                        0x0141},
-  {"CB_SETEDITSEL",                       0x0142},
-  {"CB_ADDSTRING",                        0x0143},
-  {"CB_DELETESTRING",                     0x0144},
-  {"CB_DIR",                              0x0145},
-  {"CB_GETCOUNT",                         0x0146},
-  {"CB_GETCURSEL",                        0x0147},
-  {"CB_GETLBTEXT",                        0x0148},
-  {"CB_GETLBTEXTLEN",                     0x0149},
-  {"CB_INSERTSTRING",                     0x014A},
-  {"CB_RESETCONTENT",                     0x014B},
-  {"CB_FINDSTRING",                       0x014C},
-  {"CB_SELECTSTRING",                     0x014D},
-  {"CB_SETCURSEL",                        0x014E},
-  {"CB_SHOWDROPDOWN",                     0x014F},
-  {"CB_GETITEMDATA",                      0x0150},
-  {"CB_SETITEMDATA",                      0x0151},
-  {"CB_GETDROPPEDCONTROLRECT",            0x0152},
-  {"CB_SETITEMHEIGHT",                    0x0153},
-  {"CB_GETITEMHEIGHT",                    0x0154},
-  {"CB_SETEXTENDEDUI",                    0x0155},
-  {"CB_GETEXTENDEDUI",                    0x0156},
-  {"CB_GETDROPPEDSTATE",                  0x0157},
-  {"CB_FINDSTRINGEXACT",                  0x0158},
-  {"CB_SETLOCALE",                        0x0159},
-  {"CB_GETLOCALE",                        0x015A},
-  {"CB_GETTOPINDEX",                      0x015b},
-  {"CB_SETTOPINDEX",                      0x015c},
-  {"CB_GETHORIZONTALEXTENT",              0x015d},
-  {"CB_SETHORIZONTALEXTENT",              0x015e},
-  {"CB_GETDROPPEDWIDTH",                  0x015f},
-  {"CB_SETDROPPEDWIDTH",                  0x0160},
-  {"CB_INITSTORAGE",                      0x0161},
-  {"CB_MSGMAX",                           0x0162},
-  {"LB_ADDSTRING",                        0x0180},
-  {"LB_INSERTSTRING",                     0x0181},
-  {"LB_DELETESTRING",                     0x0182},
-  {"LB_SELITEMRANGEEX",                   0x0183},
-  {"LB_RESETCONTENT",                     0x0184},
-  {"LB_SETSEL",                           0x0185},
-  {"LB_SETCURSEL",                        0x0186},
-  {"LB_GETSEL",                           0x0187},
-  {"LB_GETCURSEL",                        0x0188},
-  {"LB_GETTEXT",                          0x0189},
-  {"LB_GETTEXTLEN",                       0x018A},
-  {"LB_GETCOUNT",                         0x018B},
-  {"LB_SELECTSTRING",                     0x018C},
-  {"LB_DIR",                              0x018D},
-  {"LB_GETTOPINDEX",                      0x018E},
-  {"LB_FINDSTRING",                       0x018F},
-  {"LB_GETSELCOUNT",                      0x0190},
-  {"LB_GETSELITEMS",                      0x0191},
-  {"LB_SETTABSTOPS",                      0x0192},
-  {"LB_GETHORIZONTALEXTENT",              0x0193},
-  {"LB_SETHORIZONTALEXTENT",              0x0194},
-  {"LB_SETCOLUMNWIDTH",                   0x0195},
-  {"LB_ADDFILE",                          0x0196},
-  {"LB_SETTOPINDEX",                      0x0197},
-  {"LB_GETITEMRECT",                      0x0198},
-  {"LB_GETITEMDATA",                      0x0199},
-  {"LB_SETITEMDATA",                      0x019A},
-  {"LB_SELITEMRANGE",                     0x019B},
-  {"LB_SETANCHORINDEX",                   0x019C},
-  {"LB_GETANCHORINDEX",                   0x019D},
-  {"LB_SETCARETINDEX",                    0x019E},
-  {"LB_GETCARETINDEX",                    0x019F},
-  {"LB_SETITEMHEIGHT",                    0x01A0},
-  {"LB_GETITEMHEIGHT",                    0x01A1},
-  {"LB_FINDSTRINGEXACT",                  0x01A2},
-  {"LB_SETLOCALE",                        0x01A5},
-  {"LB_GETLOCALE",                        0x01A6},
-  {"LB_SETCOUNT",                         0x01A7},
-  {"LB_INITSTORAGE",                      0x01A8},
-  {"LB_ITEMFROMPOINT",                    0x01A9},
-  {"LB_MSGMAX",                           0x01B0},
-  {"WM_MOUSEMOVE",                        0x0200},
-  {"WM_LBUTTONDOWN",                      0x0201},
-  {"WM_LBUTTONUP",                        0x0202},
-  {"WM_LBUTTONDBLCLK",                    0x0203},
-  {"WM_RBUTTONDOWN",                      0x0204},
-  {"WM_RBUTTONUP",                        0x0205},
-  {"WM_RBUTTONDBLCLK",                    0x0206},
-  {"WM_MBUTTONDOWN",                      0x0207},
-  {"WM_MBUTTONUP",                        0x0208},
-  {"WM_MBUTTONDBLCLK",                    0x0209},
-  {"WM_MOUSEWHEEL",                       0x020A},
-  {"WM_MOUSEHWHEEL",                      0x020E},
-  {"WM_PARENTNOTIFY",                     0x0210},
-  {"WM_ENTERMENULOOP",                    0x0211},
-  {"WM_EXITMENULOOP",                     0x0212},
-  {"WM_NEXTMENU",                         0x0213},
-  {"WM_SIZING",                           0x0214},
-  {"WM_CAPTURECHANGED",                   0x0215},
-  {"WM_MOVING",                           0x0216},
-  {"WM_POWERBROADCAST",                   0x0218},
-  {"WM_DEVICECHANGE",                     0x0219},
-  {"WM_MDICREATE",                        0x0220},
-  {"WM_MDIDESTROY",                       0x0221},
-  {"WM_MDIACTIVATE",                      0x0222},
-  {"WM_MDIRESTORE",                       0x0223},
-  {"WM_MDINEXT",                          0x0224},
-  {"WM_MDIMAXIMIZE",                      0x0225},
-  {"WM_MDITILE",                          0x0226},
-  {"WM_MDICASCADE",                       0x0227},
-  {"WM_MDIICONARRANGE",                   0x0228},
-  {"WM_MDIGETACTIVE",                     0x0229},
-  {"WM_MDISETMENU",                       0x0230},
-  {"WM_ENTERSIZEMOVE",                    0x0231},
-  {"WM_EXITSIZEMOVE",                     0x0232},
-  {"WM_DROPFILES",                        0x0233},
-  {"WM_MDIREFRESHMENU",                   0x0234},
-  {"WM_IME_SETCONTEXT",                   0x0281},
-  {"WM_IME_NOTIFY",                       0x0282},
-  {"WM_IME_CONTROL",                      0x0283},
-  {"WM_IME_COMPOSITIONFULL",              0x0284},
-  {"WM_IME_SELECT",                       0x0285},
-  {"WM_IME_CHAR",                         0x0286},
-  {"WM_IME_REQUEST",                      0x0288},
-  {"WM_IME_KEYDOWN",                      0x0290},
-  {"WM_IME_KEYUP",                        0x0291},
-  {"WM_NCMOUSEHOVER",                     0x02A0},
-  {"WM_MOUSEHOVER",                       0x02A1},
-  {"WM_MOUSELEAVE",                       0x02A3},
-  {"WM_CUT",                              0x0300},
-  {"WM_COPY",                             0x0301},
-  {"WM_PASTE",                            0x0302},
-  {"WM_CLEAR",                            0x0303},
-  {"WM_UNDO",                             0x0304},
-  {"WM_RENDERFORMAT",                     0x0305},
-  {"WM_RENDERALLFORMATS",                 0x0306},
-  {"WM_DESTROYCLIPBOARD",                 0x0307},
-  {"WM_DRAWCLIPBOARD",                    0x0308},
-  {"WM_PAINTCLIPBOARD",                   0x0309},
-  {"WM_VSCROLLCLIPBOARD",                 0x030A},
-  {"WM_SIZECLIPBOARD",                    0x030B},
-  {"WM_ASKCBFORMATNAME",                  0x030C},
-  {"WM_CHANGECBCHAIN",                    0x030D},
-  {"WM_HSCROLLCLIPBOARD",                 0x030E},
-  {"WM_QUERYNEWPALETTE",                  0x030F},
-  {"WM_PALETTEISCHANGING",                0x0310},
-  {"WM_PALETTECHANGED",                   0x0311},
-  {"WM_HOTKEY",                           0x0312},
-  {"WM_PRINT",                            0x0317},
-  {"WM_PRINTCLIENT",                      0x0318},
-  {"WM_THEMECHANGED",                     0x031A},
-  {"WM_HANDHELDFIRST",                    0x0358},
-  {"WM_HANDHELDLAST",                     0x035F},
-  {"WM_AFXFIRST",                         0x0360},
-  {"WM_AFXLAST",                          0x037F},
-  {"WM_PENWINFIRST",                      0x0380},
-  {"WM_PENWINLAST",                       0x038F},
-  {"WM_APP",                              0x8000},
-  {"WM_DWMCOMPOSITIONCHANGED",            0x031E},
-  {"WM_DWMNCRENDERINGCHANGED",            0x031F},
-  {"WM_DWMCOLORIZATIONCOLORCHANGED",      0x0320},
-  {"WM_DWMWINDOWMAXIMIZEDCHANGE",         0x0321},
-  {"WM_DWMSENDICONICTHUMBNAIL",           0x0323},
-  {"WM_DWMSENDICONICLIVEPREVIEWBITMAP",   0x0326},
-  {"WM_TABLET_QUERYSYSTEMGESTURESTATUS",  0x02CC},
-  {"WM_GESTURE",                          0x0119},
-  {"WM_GESTURENOTIFY",                    0x011A},
-  {"WM_GETTITLEBARINFOEX",                0x033F},
-  {nullptr, 0x0}
-};
-
 static long gEventCounter = 0;
 static long gLastEventMsg = 0;
 
@@ -388,8 +47,6 @@ void PrintEvent(UINT msg, bool aShowAllEvents, bool aShowMouseMoves)
   }
 }
 
-#endif // defined(POPUP_ROLLUP_DEBUG_OUTPUT) || defined(EVENT_DEBUG_OUTPUT)
-
 #ifdef DEBUG
 void DDError(const char *msg, HRESULT hr)
 {
diff --git a/widget/windows/nsWindowDbg.h b/widget/windows/nsWindowDbg.h
index ce1f4b866687..5c1a1ef47a95 100644
--- a/widget/windows/nsWindowDbg.h
+++ b/widget/windows/nsWindowDbg.h
@@ -34,9 +34,7 @@
 #define SHOW_MOUSEMOVE_EVENTS   false
 #endif // defined(EVENT_DEBUG_OUTPUT)
 
-#if defined(POPUP_ROLLUP_DEBUG_OUTPUT) || defined(EVENT_DEBUG_OUTPUT) || 1
 void PrintEvent(UINT msg, bool aShowAllEvents, bool aShowMouseMoves);
-#endif // defined(POPUP_ROLLUP_DEBUG_OUTPUT) || defined(EVENT_DEBUG_OUTPUT)
 
 #if defined(POPUP_ROLLUP_DEBUG_OUTPUT)
 typedef struct {
diff --git a/widget/windows/nsWindowDefs.h b/widget/windows/nsWindowDefs.h
index e8f0aa0ad63a..aebc1cd92d2f 100644
--- a/widget/windows/nsWindowDefs.h
+++ b/widget/windows/nsWindowDefs.h
@@ -90,6 +90,19 @@
 #define MAPVK_VK_TO_VSC_EX                4
 #endif
 
+#ifndef WM_DWMCOMPOSITIONCHANGED
+#define WM_DWMCOMPOSITIONCHANGED          0x031E
+#endif
+#ifndef WM_DWMNCRENDERINGCHANGED
+#define WM_DWMNCRENDERINGCHANGED          0x031F
+#endif
+#ifndef WM_DWMCOLORIZATIONCOLORCHANGED
+#define WM_DWMCOLORIZATIONCOLORCHANGED    0x0320
+#endif
+#ifndef WM_DWMWINDOWMAXIMIZEDCHANGE
+#define WM_DWMWINDOWMAXIMIZEDCHANGE       0x0321
+#endif
+
 // ConstrainPosition window positioning slop value
 #define kWindowPositionSlop               20
 

From 341eabaef5407cf3161eaef6cd575a6133c92e12 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 23:15:29 -0700
Subject: [PATCH 70/89] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/a5e18021bfd4
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #22771 from jmcanterafonseca/fix_export_settings

Bug 1050843 - [B2G][Contacts] Export contacts buttons are overlaying Set...

========

https://hg.mozilla.org/integration/gaia-central/rev/9574473333c5
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1050843 - [B2G][Contacts] Export contacts buttons are overlaying Settings menu page

========

https://hg.mozilla.org/integration/gaia-central/rev/ad7d5a90d0a1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #22778 from ADLR-es/fix-bug-1051538

Bug 1051538 - Linking contact never ends

========

https://hg.mozilla.org/integration/gaia-central/rev/df1d4e22e5a5
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1051538 - Linking contact never ends
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e6e347e96850..870456923da6 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "6aedf00bf4f58882d1f011f0cb4ebcb07c41f369", 
+    "revision": "a5e18021bfd43c764a2a28a49c6a14f1c057aba8", 
     "repo_path": "/integration/gaia-central"
 }

From 4d1016cde3ff281e7e851edc3893f66287964c6b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 23:17:36 -0700
Subject: [PATCH 71/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ae148d483e52..ffa7016a56d2 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 210eb2c16b03..7f377b296723 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b5cdae4d5f98..bb9b874a4f95 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ae148d483e52..ffa7016a56d2 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index edd2179ad0a1..01d65cb71de3 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 2c6dc4c9481c..a634c8fb65f7 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 74016809b6f5..6da3e47ccea0 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 8d8965fa6dac..4ad9fcd240fc 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 83aca4778887..de552a3d97bf 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd8c70eb624d1b0f56cbf56f52dcf3f6d24365ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 4269c205f5fd3a79e8882bfb4633dd5ee1b2e68e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 23:30:26 -0700
Subject: [PATCH 72/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/39f8b51560ab
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #21997 from azasypkin/bug-1041124-messages-manager-events

Bug 1041124 - [Messages][Refactoring] Make use of EventDispatcher in MessageManager. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/46ed5ddb4704
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1041124 - [Messages][Refactoring] Make use of EventDispatcher in MessageManager. r=julien
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 870456923da6..6c5201b11da7 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "a5e18021bfd43c764a2a28a49c6a14f1c057aba8", 
+    "revision": "39f8b51560ab77b7333e8d6340697df19a5fa58a", 
     "repo_path": "/integration/gaia-central"
 }

From 12d9e495385053b0d5c59b71fbb4030ace1444e5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 12 Aug 2014 23:37:24 -0700
Subject: [PATCH 73/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ffa7016a56d2..5dac58dad944 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7f377b296723..95cbdfb4b14a 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index bb9b874a4f95..e18b2dc80bbe 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ffa7016a56d2..5dac58dad944 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 01d65cb71de3..8eb817a6b698 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index a634c8fb65f7..a88975c9b86d 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 6da3e47ccea0..63a3dd8c607a 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 4ad9fcd240fc..55f9d37e4a52 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index de552a3d97bf..42cf6a5fe1b0 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="68e16451134c2ea7855621be9e49f1c405a883d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 40932e55b4c9fa1097e4fdae76df3674fce33cef Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 00:00:26 -0700
Subject: [PATCH 74/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9f88434e3a0e
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Merge pull request #22387 from begeeben/1029944_switch_modaldialog_and_appmodaldialog

Bug 1029944 - Switch ModalDialog and AppModalDialog from using strings to using l10nIds, r= Zibi Braniecki [:gandalf]

* Replace mozL10n.get(l10nId) calls with node.setAttribute('data-l10n-id', l10nId) in ModalDialog and its use cases.
* Fix jshint errors.
* Update ModalDialog test.

========

https://hg.mozilla.org/integration/gaia-central/rev/032c743be685
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1029944 - Switch ModalDialog and AppModalDialog from using strings to using l10nIds

* Replace mozL10n.get(l10nId) calls with node.setAttribute('data-l10n-id', l10nId) in ModalDialog and its use cases.
* Fix jshint errors.
* Update ModalDialog test.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6c5201b11da7..ac5659ccebaf 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "39f8b51560ab77b7333e8d6340697df19a5fa58a", 
+    "revision": "9f88434e3a0e3183fb8600b6e5a39928fc5d03f1", 
     "repo_path": "/integration/gaia-central"
 }

From 029ad10b455d066dfb0ce256545e3cfe5e833e70 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 00:01:57 -0700
Subject: [PATCH 75/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5dac58dad944..5faf3bf20c09 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 95cbdfb4b14a..76a35326f0b2 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e18b2dc80bbe..c4f046ddba99 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5dac58dad944..5faf3bf20c09 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 8eb817a6b698..86014a470b30 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index a88975c9b86d..576c7605cae1 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 63a3dd8c607a..47539d771fb8 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 55f9d37e4a52..52c59650954f 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 42cf6a5fe1b0..8d29553d1aa1 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7f88caf0681e488dfd496377e05de2ed5bee4c6b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 082e3849a867d131ef9bb36545320090c3456587 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Wed, 13 Aug 2014 16:33:37 +0900
Subject: [PATCH 76/89] Backed out changeset 5b8f52a76065 (bug 1050660) due to
 mochitest-2 failure on Linux

---
 dom/browser-element/BrowserElementParent.jsm | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/dom/browser-element/BrowserElementParent.jsm b/dom/browser-element/BrowserElementParent.jsm
index 1baf02c13913..517d4d361f33 100644
--- a/dom/browser-element/BrowserElementParent.jsm
+++ b/dom/browser-element/BrowserElementParent.jsm
@@ -68,8 +68,6 @@ this.BrowserElementParentBuilder = {
 function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
   debug("Creating new BrowserElementParent object for " + frameLoader);
   this._domRequestCounter = 0;
-  this._domRequestReady = false;
-  this._pendingAPICalls = [];
   this._pendingDOMRequests = {};
   this._pendingSetInputMethodActive = [];
   this._hasRemoteFrame = hasRemoteFrame;
@@ -96,7 +94,7 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
 
   let defineNoReturnMethod = function(name, fn) {
     XPCNativeWrapper.unwrap(self._frameElement)[name] = function method() {
-      if (!self._domRequestReady) {
+      if (!self._mm) {
         // Remote browser haven't been created, we just queue the API call.
         let args = Array.slice(arguments);
         args.unshift(self);
@@ -177,6 +175,7 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) {
   } else {
     // if we are a pending frame, we setup message manager after
     // observing remote-browser-frame-shown
+    this._pendingAPICalls = [];
     Services.obs.addObserver(this, 'remote-browser-frame-shown', /* ownsWeak = */ true);
   }
 }
@@ -349,13 +348,6 @@ BrowserElementParent.prototype = {
       this._ownerVisibilityChange();
     }
 
-    if (!this._domRequestReady) {
-      // At least, one message listener such as for hello is registered.
-      // So we can use sendAsyncMessage now.
-      this._domRequestReady = true;
-      this._runPendingAPICall();
-    }
-
     return {
       name: this._frameElement.getAttribute('name'),
       fullscreenAllowed:
@@ -517,7 +509,7 @@ BrowserElementParent.prototype = {
         Services.DOMRequest.fireErrorAsync(req, "fail");
       }
     };
-    if (this._domRequestReady) {
+    if (this._mm) {
       send();
     } else {
       // Child haven't been loaded.
@@ -783,7 +775,7 @@ BrowserElementParent.prototype = {
       if (self._nextPaintListeners.push(listener) == 1)
         self._sendAsyncMsg('activate-next-paint-listener');
     };
-    if (!this._domRequestReady) {
+    if (!this._mm) {
       this._pendingAPICalls.push(run);
     } else {
       run();
@@ -806,7 +798,7 @@ BrowserElementParent.prototype = {
       if (self._nextPaintListeners.length == 0)
         self._sendAsyncMsg('deactivate-next-paint-listener');
     };
-    if (!this._domRequestReady) {
+    if (!this._mm) {
       this._pendingAPICalls.push(run);
     } else {
       run();
@@ -894,6 +886,7 @@ BrowserElementParent.prototype = {
         if (!this._mm) {
           this._setupMessageListener();
           this._registerAppManifest();
+          this._runPendingAPICall();
         }
         Services.obs.removeObserver(this, 'remote-browser-frame-shown');
       }

From 257c6023f678673dc81cb3c7ef4796daee17771e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 01:10:28 -0700
Subject: [PATCH 77/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/186e3a258ac3
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #22785 from viorelaioia/bug_1052414

Bug 1052414 - Move the import of PlivoUtil to the test methods to avoid ...

========

https://hg.mozilla.org/integration/gaia-central/rev/97d1b691a9ae
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1052414 - Move the import of PlivoUtil to the test methods to avoid import errors when plivo is not present
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ac5659ccebaf..e4d0e6bcacdc 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "9f88434e3a0e3183fb8600b6e5a39928fc5d03f1", 
+    "revision": "186e3a258ac33de13629e4ad8fb9d9370185fe20", 
     "repo_path": "/integration/gaia-central"
 }

From 777906760c7ae439033b7f595f9f73ca075d2247 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 01:11:53 -0700
Subject: [PATCH 78/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5faf3bf20c09..2129e3db229c 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 76a35326f0b2..098a03ae810e 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index c4f046ddba99..735c7835b3d2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5faf3bf20c09..2129e3db229c 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 86014a470b30..71469dd02d91 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 576c7605cae1..c9a8df381de2 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 47539d771fb8..29c99f097911 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 52c59650954f..f12040593c3d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 8d29553d1aa1..974e0f34c4bd 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0998aa91aa8fca667a9224b160a52e37c71e5ac2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 326e13002c39faf8a68519a8eacdd3355e79e56a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 01:25:27 -0700
Subject: [PATCH 79/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ad30572b2dc5
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #22700 from RudyLu/keyboard/Bug1022609

Bug 1022609 - Define 2 different symbol panels that includes ',' or not.
r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/a3683b34d93a
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1022609 - Define 2 different symbol panels that includes ',' or not.
 - Modify each layout to define supportsSwitching.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e4d0e6bcacdc..a4d40cac43e6 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "186e3a258ac33de13629e4ad8fb9d9370185fe20", 
+    "revision": "ad30572b2dc50ef262f3b6694ed41dc122087a05", 
     "repo_path": "/integration/gaia-central"
 }

From f43f82c3d5cb4be7978c33cb70f2ed87b239ee18 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 01:31:15 -0700
Subject: [PATCH 80/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 2129e3db229c..9f80b0f394b6 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 098a03ae810e..bc8fcc3d5f1f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 735c7835b3d2..237f6f4c7b2a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 2129e3db229c..9f80b0f394b6 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 71469dd02d91..b49f1c05b240 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index c9a8df381de2..f12beb7678e2 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 29c99f097911..4365cb324ec5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f12040593c3d..e8257d0c1793 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 974e0f34c4bd..4a2bccafd1ac 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="20d70b5f932531f7f651b6b3c0abb07e66a1c5cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 8a8dc051ca06cda06d32ef32f136ff07c1b5b67d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 02:10:27 -0700
Subject: [PATCH 81/89] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c522a7ea5e5b
Author: gaye <gaye@mozilla.com>
Desc: Bug 1052941 - test-agent sinon fail r=julien
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a4d40cac43e6..e427f65547bd 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "ad30572b2dc50ef262f3b6694ed41dc122087a05", 
+    "revision": "c522a7ea5e5bd1ab9ba0669d9550660c393f16a2", 
     "repo_path": "/integration/gaia-central"
 }

From 506a5b469d20cef68b4e1a92f2c46e4ccfa35abb Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 02:16:17 -0700
Subject: [PATCH 82/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 9f80b0f394b6..40e8f3f3d0e5 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index bc8fcc3d5f1f..8b014592b5ac 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 237f6f4c7b2a..222d0881e59b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9f80b0f394b6..40e8f3f3d0e5 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index b49f1c05b240..65f666805295 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index f12beb7678e2..768ad7209eaa 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 4365cb324ec5..bea45a06f319 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e8257d0c1793..9d069c886521 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 4a2bccafd1ac..4b6f51f39e11 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="517253f887a093d31a5ff35bd31df1ae483c89a2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ded61cb118fc5896c54ed908495a939ccd87f07b Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Wed, 13 Aug 2014 11:00:31 +0100
Subject: [PATCH 83/89] bug 1052535 - fix errors in Unicode Joining_Type data
 for Mandaic. r=jdaggett

---
 gfx/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
index d41d6ce598ed..17100497ecb8 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
@@ -70,7 +70,7 @@ static const uint8_t joining_table[] =
 
   /* Mandaic */
 
-  /* 0840 */ R,D,D,D,D,D,R,D,D,R,D,D,D,D,D,R,D,D,D,D,R,D,U,U,U,X,X,X,X,X,X,X,
+  /* 0840 */ R,D,D,D,D,D,R,R,D,R,D,D,D,D,D,D,D,D,D,D,R,D,U,U,U,X,X,X,X,X,X,X,
   /* 0860 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
   /* 0880 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
 

From 95678b9bbb763285dcf08d43cdcb5e66638c8a45 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Wed, 13 Aug 2014 11:26:33 +0200
Subject: [PATCH 84/89] Bug 1051527 - BackgroundClipState::mHasRounded corners
 is used uninitialised.  r=matt.woodrow.

--HG--
extra : rebase_source : e21c5b9fb2c6ad380f7179d43292bbca032f9c5f
---
 layout/base/nsCSSRendering.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 4c2e5c10d219..44bb0db50f01 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -2684,6 +2684,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   if (aBGClipRect) {
     clipState.mBGClipArea = *aBGClipRect;
     clipState.mCustomClip = true;
+    clipState.mHasRoundedCorners = false;
     SetupDirtyRects(clipState.mBGClipArea, aDirtyRect, appUnitsPerPixel,
                     &clipState.mDirtyRect, &clipState.mDirtyRectGfx);
   } else {

From 60b62a869a0a2e741f5b67ce4acbf608f6a7acfa Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Wed, 13 Aug 2014 11:18:01 +0100
Subject: [PATCH 85/89] Backed out changeset f6970e7f17e1 (bug 995284) for
 crashes on OS X and Windows; CLOSED TREE

---
 js/src/gc/GCRuntime.h | 15 +++--------
 js/src/jsapi.cpp      |  4 +--
 js/src/jsgc.cpp       | 60 +++++++++++++++++++------------------------
 js/src/jsgc.h         |  3 +++
 js/src/jsgcinlines.h  |  2 +-
 5 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index 4a8dee8fc4ea..4bded5b5c09a 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -274,8 +274,7 @@ class GCRuntime
 
     bool triggerGC(JS::gcreason::Reason reason);
     bool triggerZoneGC(Zone *zone, JS::gcreason::Reason reason);
-    bool maybeGC(Zone *zone);
-    void maybePeriodicFullGC();
+    void maybeGC(Zone *zone);
     void minorGC(JS::gcreason::Reason reason);
     void minorGC(JSContext *cx, JS::gcreason::Reason reason);
     void gcIfNeeded(JSContext *cx);
@@ -488,7 +487,7 @@ class GCRuntime
     void getNextZoneGroup();
     void endMarkingZoneGroup();
     void beginSweepingZoneGroup();
-    bool shouldReleaseObservedTypes();
+    bool releaseObservedTypes();
     void endSweepingZoneGroup();
     bool sweepPhase(SliceBudget &sliceBudget);
     void endSweepPhase(JSGCInvocationKind gckind, bool lastGC);
@@ -568,6 +567,7 @@ class GCRuntime
     bool                  chunkAllocationSinceLastGC;
     int64_t               nextFullGCTime;
     int64_t               lastGCTime;
+    int64_t               jitReleaseTime;
 
     JSGCMode              mode;
 
@@ -589,12 +589,6 @@ class GCRuntime
      */
     volatile uintptr_t    isNeeded;
 
-    /* Incremented at the start of every major GC. */
-    uint64_t              majorGCNumber;
-
-    /* The major GC number at which to release observed type information. */
-    uint64_t              jitReleaseNumber;
-
     /* Incremented on every GC slice. */
     uint64_t              number;
 
@@ -630,9 +624,6 @@ class GCRuntime
     /* Whether any sweeping will take place in the separate GC helper thread. */
     bool                  sweepOnBackgroundThread;
 
-    /* Whether observed type information is being released in the current GC. */
-    bool                  releaseObservedTypes;
-
     /* Whether any black->gray edges were found during marking. */
     bool                  foundBlackGrayEdges;
 
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index c2d15765045b..4361ee3d86da 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1879,9 +1879,7 @@ JS_GC(JSRuntime *rt)
 JS_PUBLIC_API(void)
 JS_MaybeGC(JSContext *cx)
 {
-    GCRuntime &gc = cx->runtime()->gc;
-    if (!gc.maybeGC(cx->zone()))
-        gc.maybePeriodicFullGC();
+    MaybeGC(cx);
 }
 
 JS_PUBLIC_API(void)
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 2d7f2dbdcba5..f85a1ee7d9c2 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1112,13 +1112,12 @@ GCRuntime::GCRuntime(JSRuntime *rt) :
     chunkAllocationSinceLastGC(false),
     nextFullGCTime(0),
     lastGCTime(0),
+    jitReleaseTime(0),
     mode(JSGC_MODE_INCREMENTAL),
     decommitThreshold(32 * 1024 * 1024),
     cleanUpEverything(false),
     grayBitsValid(false),
     isNeeded(0),
-    majorGCNumber(0),
-    jitReleaseNumber(0),
     number(0),
     startNumber(0),
     isFull(false),
@@ -1249,11 +1248,8 @@ GCRuntime::initZeal()
 
 #endif
 
-/*
- * Lifetime in number of major GCs for type sets attached to scripts containing
- * observed types.
- */
-static const uint64_t JIT_SCRIPT_RELEASE_TYPES_PERIOD = 20;
+/* Lifetime for type sets attached to scripts containing observed types. */
+static const int64_t JIT_SCRIPT_RELEASE_TYPES_INTERVAL = 60 * 1000 * 1000;
 
 bool
 GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
@@ -1280,7 +1276,9 @@ GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
     tunables.setParameter(JSGC_MAX_BYTES, maxbytes);
     setMaxMallocBytes(maxbytes);
 
-    jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
+#ifndef JS_MORE_DETERMINISTIC
+    jitReleaseTime = PRMJ_Now() + JIT_SCRIPT_RELEASE_TYPES_INTERVAL;
+#endif
 
 #ifdef JSGC_GENERATIONAL
     if (!nursery.init(maxNurseryBytes))
@@ -2417,7 +2415,13 @@ GCRuntime::triggerZoneGC(Zone *zone, JS::gcreason::Reason reason)
     return true;
 }
 
-bool
+void
+js::MaybeGC(JSContext *cx)
+{
+    cx->runtime()->gc.maybeGC(cx->zone());
+}
+
+void
 GCRuntime::maybeGC(Zone *zone)
 {
     JS_ASSERT(CurrentThreadCanAccessRuntime(rt));
@@ -2426,13 +2430,13 @@ GCRuntime::maybeGC(Zone *zone)
     if (zealMode == ZealAllocValue || zealMode == ZealPokeValue) {
         JS::PrepareForFullGC(rt);
         GC(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return true;
+        return;
     }
 #endif
 
     if (isNeeded) {
         GCSlice(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return true;
+        return;
     }
 
     double factor = schedulingState.inHighFrequencyGCMode() ? 0.85 : 0.9;
@@ -2443,25 +2447,15 @@ GCRuntime::maybeGC(Zone *zone)
     {
         PrepareZoneForGC(zone);
         GCSlice(rt, GC_NORMAL, JS::gcreason::MAYBEGC);
-        return true;
+        return;
     }
 
-    return false;
-}
-
-void
-GCRuntime::maybePeriodicFullGC()
-{
+#ifndef JS_MORE_DETERMINISTIC
     /*
-     * Trigger a periodic full GC.
-     *
-     * This is a source of non-determinism, but is not called from the shell.
-     *
      * Access to the counters and, on 32 bit, setting gcNextFullGCTime below
      * is not atomic and a race condition could trigger or suppress the GC. We
      * tolerate this.
      */
-#ifndef JS_MORE_DETERMINISTIC
     int64_t now = PRMJ_Now();
     if (nextFullGCTime && nextFullGCTime <= now) {
         if (chunkAllocationSinceLastGC ||
@@ -2887,7 +2881,7 @@ GCHelperState::onBackgroundThread()
 }
 
 bool
-GCRuntime::shouldReleaseObservedTypes()
+GCRuntime::releaseObservedTypes()
 {
     bool releaseTypes = false;
 
@@ -2896,12 +2890,13 @@ GCRuntime::shouldReleaseObservedTypes()
         releaseTypes = true;
 #endif
 
-    MOZ_ASSERT(majorGCNumber <= jitReleaseNumber);
-    if (majorGCNumber == jitReleaseNumber)
+#ifndef JS_MORE_DETERMINISTIC
+    int64_t now = PRMJ_Now();
+    if (now >= jitReleaseTime)
         releaseTypes = true;
-
     if (releaseTypes)
-        jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
+        jitReleaseTime = now + JIT_SCRIPT_RELEASE_TYPES_INTERVAL;
+#endif
 
     return releaseTypes;
 }
@@ -4162,9 +4157,10 @@ GCRuntime::beginSweepingZoneGroup()
             zone->discardJitCode(&fop);
         }
 
+        bool releaseTypes = releaseObservedTypes();
         for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
             gcstats::AutoSCC scc(stats, zoneGroupIndex);
-            c->sweep(&fop, releaseObservedTypes && !c->zone()->isPreservingCode());
+            c->sweep(&fop, releaseTypes && !c->zone()->isPreservingCode());
         }
 
         for (GCZoneGroupIter zone(rt); !zone.done(); zone.next()) {
@@ -4178,7 +4174,7 @@ GCRuntime::beginSweepingZoneGroup()
             // code and new script information in the zone, the only things
             // whose correctness depends on the type constraints.
             bool oom = false;
-            zone->sweep(&fop, releaseObservedTypes && !zone->isPreservingCode(), &oom);
+            zone->sweep(&fop, releaseTypes && !zone->isPreservingCode(), &oom);
 
             if (oom) {
                 zone->setPreservingCode(false);
@@ -4268,8 +4264,6 @@ GCRuntime::beginSweepPhase(bool lastGC)
 
     sweepOnBackgroundThread = !lastGC && !TraceEnabled() && CanUseExtraThreads();
 
-    releaseObservedTypes = shouldReleaseObservedTypes();
-
 #ifdef DEBUG
     for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
         JS_ASSERT(!c->gcIncomingGrayPointers);
@@ -4992,8 +4986,6 @@ GCRuntime::gcCycle(bool incremental, int64_t budget, JSGCInvocationKind gckind,
     interFrameGC = true;
 
     number++;
-    if (incrementalState == NO_INCREMENTAL)
-        majorGCNumber++;
 
     // It's ok if threads other than the main thread have suppressGC set, as
     // they are operating on zones which will not be collected from here.
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 71ae41121c7e..3f3f4265b88b 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -971,6 +971,9 @@ TriggerGC(JSRuntime *rt, JS::gcreason::Reason reason);
 extern bool
 TriggerZoneGC(Zone *zone, JS::gcreason::Reason reason);
 
+extern void
+MaybeGC(JSContext *cx);
+
 extern void
 ReleaseAllJITCode(FreeOp *op);
 
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 8e764d08d0d6..2ae37ea6aba7 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -691,7 +691,7 @@ AllocateObjectForCacheHit(JSContext *cx, AllocKind kind, InitialHeap heap)
 
     JSObject *obj = AllocateObject<NoGC>(cx, kind, 0, heap);
     if (!obj && allowGC) {
-        cx->runtime()->gc.maybeGC(cx->zone());
+        MaybeGC(cx);
         return nullptr;
     }
 

From d1b18597255e1b6eb1c590f6e1a845dfb42646fb Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 03:50:29 -0700
Subject: [PATCH 86/89] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9775a3cd2b97
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #22824 from vsireesha246/Bug_1050650_Video_Thumbnail_Style_Change

Bug 1050650 - [Video]Extra space in thumbnail select screen r=john hu

========

https://hg.mozilla.org/integration/gaia-central/rev/e65dcf87515d
Author: varada.sireesha <varada.sireesha@lge.com>
Desc: Bug 1050650 - [Video]Extra space in thumbnail select screen
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e427f65547bd..e1acb446c0ae 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "c522a7ea5e5bd1ab9ba0669d9550660c393f16a2", 
+    "revision": "9775a3cd2b9719b34329bc472e6e59685f65c28d", 
     "repo_path": "/integration/gaia-central"
 }

From 6f8f975842c9867b2d851004bea2bb730dc36266 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 03:56:13 -0700
Subject: [PATCH 87/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 40e8f3f3d0e5..0089e53e4e66 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 8b014592b5ac..2c3b5c96ecb8 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 222d0881e59b..ca0481ebb510 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 40e8f3f3d0e5..0089e53e4e66 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 65f666805295..24222d8dbd19 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 768ad7209eaa..052033119e71 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index bea45a06f319..32e620471ab5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 9d069c886521..a6b1e20dcd36 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 4b6f51f39e11..bf893465dfa9 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0918e40d19e2bc1e8cc6be70f864aca64dbe3b3d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 65aa64f753302b0bbc9aee936c8826d257b2dc65 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 04:05:28 -0700
Subject: [PATCH 88/89] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/c3b71e7993bb
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #22811 from crh0716/1052557

Bug 1052557 - Remove the redundant href atribute r=eragonj

========

https://hg.mozilla.org/integration/gaia-central/rev/91f3b2106718
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1052557 - Remove the redundant href atribute

========

https://hg.mozilla.org/integration/gaia-central/rev/829d30377032
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #22611 from bubuhuang/bug-1033186

Bug 1033186 - Bosnian keyboard layout.
r=rudylu.

========

https://hg.mozilla.org/integration/gaia-central/rev/108acd844032
Author: Bruce Huang <bruhuang@gmail.com>
Desc: Bug 1033186 - Bosnian keyboard layout

Add Bosnian key layout, label “Bs”

Update menuLabel to “Bosanski”
Remove redundant symbol UI defintion

Add as default layout for Bosnian
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e1acb446c0ae..9d346c0f8d0a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "9775a3cd2b9719b34329bc472e6e59685f65c28d", 
+    "revision": "c3b71e7993bb9ed0f45994f70552601e0466f0e3", 
     "repo_path": "/integration/gaia-central"
 }

From 8d435aef0d96f907770eac3cae0d681d8188ab10 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 13 Aug 2014 04:11:15 -0700
Subject: [PATCH 89/89] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 0089e53e4e66..ca8abf8ee841 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2c3b5c96ecb8..edb0fa309c30 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index ca0481ebb510..cbf1fea1d834 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 0089e53e4e66..ca8abf8ee841 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 24222d8dbd19..96ec004587c3 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 052033119e71..fd055f5da55d 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 32e620471ab5..ffa01defc74c 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index a6b1e20dcd36..84490b006a64 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index bf893465dfa9..db8aae58fcef 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fff6ba5877dbcfd9488826a36191385f8804fb2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2864a8d4413746a5359bbcc5042ef776ed06009a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3bb61a27cd2941b2ba9b616a11aaa44269210396"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>