From 3b7df37af2d1fa4acaca1a16113aa87619215ff3 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Fri, 25 Jul 2014 12:42:40 -0700
Subject: [PATCH 001/128] Bug 1044130 - Make pico destructors private. r=smaug

---
 content/media/webspeech/synth/pico/nsPicoService.cpp | 9 +++++----
 content/media/webspeech/synth/pico/nsPicoService.h   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/content/media/webspeech/synth/pico/nsPicoService.cpp b/content/media/webspeech/synth/pico/nsPicoService.cpp
index 0860e5c29a0..a4a93f1d6e2 100644
--- a/content/media/webspeech/synth/pico/nsPicoService.cpp
+++ b/content/media/webspeech/synth/pico/nsPicoService.cpp
@@ -195,8 +195,6 @@ public:
   PicoVoice(const nsAString& aLanguage)
     : mLanguage(aLanguage) {}
 
-  ~PicoVoice() {}
-
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PicoVoice)
 
   // Voice language, in BCB-47 syntax
@@ -207,6 +205,9 @@ public:
 
   // Speaker resource file
   nsCString mSgFile;
+
+private:
+    ~PicoVoice() {}
 };
 
 class PicoCallbackRunnable : public nsRunnable,
@@ -226,8 +227,6 @@ public:
     , mVoice(aVoice)
     , mService(aService) { }
 
-  ~PicoCallbackRunnable() { }
-
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSISPEECHTASKCALLBACK
 
@@ -236,6 +235,8 @@ public:
   bool IsCurrentTask() { return mService->mCurrentTask == mTask; }
 
 private:
+  ~PicoCallbackRunnable() { }
+
   void DispatchSynthDataRunnable(already_AddRefed<SharedBuffer>&& aBuffer,
                                  size_t aBufferSize);
 
diff --git a/content/media/webspeech/synth/pico/nsPicoService.h b/content/media/webspeech/synth/pico/nsPicoService.h
index 5dae1a8004f..bebadbe3ec4 100644
--- a/content/media/webspeech/synth/pico/nsPicoService.h
+++ b/content/media/webspeech/synth/pico/nsPicoService.h
@@ -37,8 +37,6 @@ public:
 
   nsPicoService();
 
-  virtual ~nsPicoService();
-
   static nsPicoService* GetInstance();
 
   static already_AddRefed<nsPicoService> GetInstanceForService();
@@ -47,6 +45,8 @@ public:
 
 private:
 
+  virtual ~nsPicoService();
+
   void Init();
 
   void RegisterVoices();

From 9a1d57457c2716830ed5e232c2ea4585e9f93805 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Fri, 25 Jul 2014 08:27:43 -0400
Subject: [PATCH 002/128] Bug 973096 - When computing the hit test area for an
 APZC, remove the visible regions of layers obscuring it. r=botond

---
 gfx/layers/apz/src/APZCTreeManager.cpp        | 51 ++++++++++++++++---
 gfx/layers/apz/src/APZCTreeManager.h          |  4 +-
 gfx/layers/apz/src/AsyncPanZoomController.h   | 10 ++--
 .../gtest/TestAsyncPanZoomController.cpp      | 15 +++---
 4 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index 85a4767a671..82de0f3010b 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -141,7 +141,7 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
                                 aCompositor ? aCompositor->RootLayerTreeId() : 0,
                                 gfx3DMatrix(), nullptr, nullptr,
                                 aIsFirstPaint, aOriginatingLayersId,
-                                paintLogger, &apzcsToDestroy);
+                                paintLogger, &apzcsToDestroy, nsIntRegion());
     mApzcTreeLog << "[end]\n";
   }
 
@@ -160,10 +160,13 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
                                              bool aIsFirstPaint,
                                              uint64_t aOriginatingLayersId,
                                              const APZPaintLogHelper& aPaintLogger,
-                                             nsTArray< nsRefPtr<AsyncPanZoomController> >* aApzcsToDestroy)
+                                             nsTArray< nsRefPtr<AsyncPanZoomController> >* aApzcsToDestroy,
+                                             const nsIntRegion& aObscured)
 {
   mTreeLock.AssertCurrentThreadOwns();
 
+  gfx3DMatrix transform = gfx::To3DMatrix(aLayer->GetTransform());
+
   ContainerLayer* container = aLayer->AsContainerLayer();
   AsyncPanZoomController* apzc = nullptr;
   mApzcTreeLog << aLayer->Name() << '\t';
@@ -244,9 +247,17 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
                                       * metrics.mDevPixelsPerCSSPixel
                                       * metrics.GetParentResolution());
         }
-        gfx3DMatrix transform = gfx::To3DMatrix(aLayer->GetTransform());
 
-        apzc->SetLayerHitTestData(visible, aTransform, transform);
+        // Not sure what rounding option is the most correct here, but if we ever
+        // figure it out we can change this. For now I'm rounding in to minimize
+        // the chances of getting a complex region.
+        ParentLayerIntRect roundedVisible = RoundedIn(visible);
+        nsIntRegion unobscured;
+        unobscured.Sub(nsIntRect(roundedVisible.x, roundedVisible.y,
+                                 roundedVisible.width, roundedVisible.height),
+                       aObscured);
+
+        apzc->SetLayerHitTestData(unobscured, aTransform, transform);
         APZCTM_LOG("Setting rect(%f %f %f %f) as visible region for APZC %p\n", visible.x, visible.y,
                                                                               visible.width, visible.height,
                                                                               apzc);
@@ -311,10 +322,28 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
     aTransform = gfx3DMatrix();
   } else {
     // Multiply child layer transforms on the left so they get applied first
-    aTransform = gfx::To3DMatrix(aLayer->GetTransform()) * aTransform;
+    aTransform = transform * aTransform;
   }
 
   uint64_t childLayersId = (aLayer->AsRefLayer() ? aLayer->AsRefLayer()->GetReferentId() : aLayersId);
+
+  nsIntRegion obscured;
+  if (aLayersId == childLayersId) {
+    // If the child layer is in the same process, transform
+    // aObscured from aLayer's ParentLayerPixels to aLayer's LayerPixels,
+    // which are the children layers' ParentLayerPixels.
+    // If we cross a process boundary, we assume that we can start with
+    // an empty obscured region because nothing in the parent process will
+    // obscure the child process. This may be false. However, not doing this
+    // definitely runs into a problematic case where the B2G notification
+    // bar and the keyboard get merged into a single layer that obscures
+    // all child processes, even though visually they do not. We'd probably
+    // have to check for mask layers and so on in order to properly handle
+    // that case.
+    obscured = aObscured;
+    obscured.Transform(transform.Inverse());
+  }
+
   // If there's no APZC at this level, any APZCs for our child layers will
   // have our siblings as siblings.
   AsyncPanZoomController* next = apzc ? nullptr : aNextSibling;
@@ -322,7 +351,17 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
     gfx::TreeAutoIndent indent(mApzcTreeLog);
     next = UpdatePanZoomControllerTree(aCompositor, child, childLayersId, aTransform, aParent, next,
                                        aIsFirstPaint, aOriginatingLayersId,
-                                       aPaintLogger, aApzcsToDestroy);
+                                       aPaintLogger, aApzcsToDestroy, obscured);
+
+    // Each layer obscures its previous siblings, so we augment the obscured
+    // region as we loop backwards through the children.
+    nsIntRegion childRegion = child->GetVisibleRegion();
+    childRegion.Transform(gfx::To3DMatrix(child->GetTransform()));
+    if (child->GetClipRect()) {
+      childRegion.AndWith(*child->GetClipRect());
+    }
+
+    obscured.OrWith(childRegion);
   }
 
   // Return the APZC that should be the sibling of other APZCs as we continue
diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h
index ec7ff5bb65e..449c52dc46d 100644
--- a/gfx/layers/apz/src/APZCTreeManager.h
+++ b/gfx/layers/apz/src/APZCTreeManager.h
@@ -22,6 +22,7 @@
 #include "mozilla/gfx/Logging.h"        // for gfx::TreeLog
 
 class gfx3DMatrix;
+class nsIntRegion;
 
 namespace mozilla {
 class InputData;
@@ -363,7 +364,8 @@ private:
                                                       bool aIsFirstPaint,
                                                       uint64_t aOriginatingLayersId,
                                                       const APZPaintLogHelper& aPaintLogger,
-                                                      nsTArray< nsRefPtr<AsyncPanZoomController> >* aApzcsToDestroy);
+                                                      nsTArray< nsRefPtr<AsyncPanZoomController> >* aApzcsToDestroy,
+                                                      const nsIntRegion& aObscured);
 
 private:
   /* Whenever walking or mutating the tree rooted at mRootApzc, mTreeLock must be held.
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index d35ab7cca94..db09163d102 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -21,6 +21,7 @@
 #include "Axis.h"
 #include "TaskThrottler.h"
 #include "gfx3DMatrix.h"
+#include "nsRegion.h"
 
 #include "base/message_loop.h"
 
@@ -941,9 +942,9 @@ private:
    * hit-testing to see which APZC instance should handle touch events.
    */
 public:
-  void SetLayerHitTestData(const ParentLayerRect& aRect, const gfx3DMatrix& aTransformToLayer,
+  void SetLayerHitTestData(const nsIntRegion& aRegion, const gfx3DMatrix& aTransformToLayer,
                            const gfx3DMatrix& aTransformForLayer) {
-    mVisibleRect = aRect;
+    mVisibleRegion = aRegion;
     mAncestorTransform = aTransformToLayer;
     mCSSTransform = aTransformForLayer;
     UpdateTransformScale();
@@ -958,7 +959,8 @@ public:
   }
 
   bool VisibleRegionContains(const ParentLayerPoint& aPoint) const {
-    return mVisibleRect.Contains(aPoint);
+    ParentLayerIntPoint point = RoundedToInt(aPoint);
+    return mVisibleRegion.Contains(point.x, point.y);
   }
 
   bool IsOverscrolled() const {
@@ -969,7 +971,7 @@ private:
   /* This is the visible region of the layer that this APZC corresponds to, in
    * that layer's screen pixels (the same coordinate system in which this APZC
    * receives events in ReceiveInputEvent()). */
-  ParentLayerRect mVisibleRect;
+  nsIntRegion mVisibleRegion;
   /* This is the cumulative CSS transform for all the layers between the parent
    * APZC and this one (not inclusive) */
   gfx3DMatrix mAncestorTransform;
diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp
index 930ad4286cb..fa6660bed05 100644
--- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp
+++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp
@@ -1545,15 +1545,18 @@ TEST_F(APZCTreeManagerTester, HitTesting1) {
   SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 1);
   manager->UpdatePanZoomControllerTree(nullptr, root, false, 0, paintSequenceNumber++);
   EXPECT_NE(root->AsContainerLayer()->GetAsyncPanZoomController(), layers[3]->AsContainerLayer()->GetAsyncPanZoomController());
-  hit = GetTargetAPZC(manager, ScreenPoint(15, 15), transformToApzc, transformToGecko);
+  hit = GetTargetAPZC(manager, ScreenPoint(25, 25), transformToApzc, transformToGecko);
   EXPECT_EQ(layers[3]->AsContainerLayer()->GetAsyncPanZoomController(), hit.get());
-  // expect hit point at LayerIntPoint(15, 15)
-  EXPECT_EQ(gfxPoint(15, 15), transformToApzc.Transform(gfxPoint(15, 15)));
-  EXPECT_EQ(gfxPoint(15, 15), transformToGecko.Transform(gfxPoint(15, 15)));
+  // expect hit point at LayerIntPoint(25, 25)
+  EXPECT_EQ(gfxPoint(25, 25), transformToApzc.Transform(gfxPoint(25, 25)));
+  EXPECT_EQ(gfxPoint(25, 25), transformToGecko.Transform(gfxPoint(25, 25)));
+
+  // At this point, layers[4] obscures layers[3] at the point (15, 15) so
+  // hitting there should hit the root APZC
+  hit = GetTargetAPZC(manager, ScreenPoint(15, 15), transformToApzc, transformToGecko);
+  EXPECT_EQ(root->AsContainerLayer()->GetAsyncPanZoomController(), hit.get());
 
   // Now test hit testing when we have two scrollable layers
-  hit = GetTargetAPZC(manager, ScreenPoint(15, 15), transformToApzc, transformToGecko);
-  EXPECT_EQ(layers[3]->AsContainerLayer()->GetAsyncPanZoomController(), hit.get());
   SetScrollableFrameMetrics(layers[4], FrameMetrics::START_SCROLL_ID + 2);
   manager->UpdatePanZoomControllerTree(nullptr, root, false, 0, paintSequenceNumber++);
   hit = GetTargetAPZC(manager, ScreenPoint(15, 15), transformToApzc, transformToGecko);

From bcab2ebb06bee94a0392e473ab4fc44bc377dafd Mon Sep 17 00:00:00 2001
From: Milan Sreckovic <milan@mozilla.com>
Date: Fri, 25 Jul 2014 15:49:47 -0400
Subject: [PATCH 003/128] Bug 1043603: Expose tile pool size and pool shrink
 timeout as prefs. r=clord

---
 gfx/layers/client/ClientLayerManager.cpp      |  6 +++++-
 gfx/layers/client/SimpleTextureClientPool.cpp |  8 +++++--
 gfx/layers/client/SimpleTextureClientPool.h   | 18 +++++++++-------
 gfx/layers/client/TextureClientPool.cpp       | 10 ++++++---
 gfx/layers/client/TextureClientPool.h         | 21 ++++++++++++-------
 gfx/thebes/gfxPrefs.h                         |  2 ++
 6 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp
index 349c7d95577..0792a46d3d9 100644
--- a/gfx/layers/client/ClientLayerManager.cpp
+++ b/gfx/layers/client/ClientLayerManager.cpp
@@ -6,7 +6,7 @@
 #include "ClientLayerManager.h"
 #include "CompositorChild.h"            // for CompositorChild
 #include "GeckoProfiler.h"              // for PROFILER_LABEL
-#include "gfxPrefs.h"                   // for gfxPrefs::LayersTileWidth/Height
+#include "gfxPrefs.h"                   // for gfxPrefs::LayersTile...
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc
 #include "mozilla/Hal.h"
 #include "mozilla/dom/ScreenOrientation.h"  // for ScreenOrientation
@@ -572,6 +572,8 @@ ClientLayerManager::GetTexturePool(SurfaceFormat aFormat)
   mTexturePools.AppendElement(
       new TextureClientPool(aFormat, IntSize(gfxPrefs::LayersTileWidth(),
                                              gfxPrefs::LayersTileHeight()),
+                            gfxPrefs::LayersTileMaxPoolSize(),
+                            gfxPrefs::LayersTileShrinkPoolTimeout(),
                             mForwarder));
 
   return mTexturePools.LastElement();
@@ -586,6 +588,8 @@ ClientLayerManager::GetSimpleTileTexturePool(SurfaceFormat aFormat)
   if (mSimpleTilePools[index].get() == nullptr) {
     mSimpleTilePools[index] = new SimpleTextureClientPool(aFormat, IntSize(gfxPrefs::LayersTileWidth(),
                                                                            gfxPrefs::LayersTileHeight()),
+                                                          gfxPrefs::LayersTileMaxPoolSize(),
+                                                          gfxPrefs::LayersTileShrinkPoolTimeout(),
                                                           mForwarder);
   }
 
diff --git a/gfx/layers/client/SimpleTextureClientPool.cpp b/gfx/layers/client/SimpleTextureClientPool.cpp
index 1dcb5ed1f69..8dc03e46635 100644
--- a/gfx/layers/client/SimpleTextureClientPool.cpp
+++ b/gfx/layers/client/SimpleTextureClientPool.cpp
@@ -49,9 +49,13 @@ SimpleTextureClientPool::WaitForCompositorRecycleCallback(TextureClient* aClient
 }
 
 SimpleTextureClientPool::SimpleTextureClientPool(gfx::SurfaceFormat aFormat, gfx::IntSize aSize,
+                                                 uint32_t aMaxTextureClients,
+                                                 uint32_t aShrinkTimeoutMsec,
                                                  ISurfaceAllocator *aAllocator)
   : mFormat(aFormat)
   , mSize(aSize)
+  , mMaxTextureClients(aMaxTextureClients)
+  , mShrinkTimeoutMsec(aShrinkTimeoutMsec)
   , mSurfaceAllocator(aAllocator)
 {
   mTimer = do_CreateInstance("@mozilla.org/timer;1");
@@ -100,7 +104,7 @@ SimpleTextureClientPool::ReturnTextureClient(TextureClient *aClient)
   }
 
   // If we haven't hit our max cached client limit, add this one
-  if (mAvailableTextureClients.size() < sMaxTextureClients) {
+  if (mAvailableTextureClients.size() < mMaxTextureClients) {
     mAvailableTextureClients.push(aClient);
     RECYCLE_LOG("%s recycled %p (have %d)\n", (mFormat == SurfaceFormat::B8G8R8A8?"poolA":"poolX"), aClient, mAvailableTextureClients.size());
   } else {
@@ -110,7 +114,7 @@ SimpleTextureClientPool::ReturnTextureClient(TextureClient *aClient)
   // Kick off the pool shrinking timer if there are still more unused texture
   // clients than our desired minimum cache size.
   if (mAvailableTextureClients.size() > sMinCacheSize) {
-    mTimer->InitWithFuncCallback(SimpleTextureClientPool::ShrinkCallback, this, sShrinkTimeout,
+    mTimer->InitWithFuncCallback(SimpleTextureClientPool::ShrinkCallback, this, mShrinkTimeoutMsec,
                                  nsITimer::TYPE_ONE_SHOT);
   }
 
diff --git a/gfx/layers/client/SimpleTextureClientPool.h b/gfx/layers/client/SimpleTextureClientPool.h
index ccdf2295a4e..4057588acf9 100644
--- a/gfx/layers/client/SimpleTextureClientPool.h
+++ b/gfx/layers/client/SimpleTextureClientPool.h
@@ -32,6 +32,8 @@ public:
   NS_INLINE_DECL_REFCOUNTING(SimpleTextureClientPool)
 
   SimpleTextureClientPool(gfx::SurfaceFormat aFormat, gfx::IntSize aSize,
+                          uint32_t aMaxTextureClients,
+                          uint32_t aShrinkTimeoutMsec,
                           ISurfaceAllocator *aAllocator);
 
   /**
@@ -49,18 +51,10 @@ public:
   void Clear();
 
 private:
-  // The time in milliseconds before the pool will be shrunk to the minimum
-  // size after returning a client.
-  static const uint32_t sShrinkTimeout = 3000;
-
   // The minimum size of the pool (the number of tiles that will be kept after
   // shrinking).
   static const uint32_t sMinCacheSize = 16;
 
-  // This is the number of cached texture clients we don't want to exceed, even
-  // temporarily (pre-shrink)
-  static const uint32_t sMaxTextureClients = 50;
-
   static void ShrinkCallback(nsITimer *aTimer, void *aClosure);
   static void RecycleCallback(TextureClient* aClient, void* aClosure);
   static void WaitForCompositorRecycleCallback(TextureClient* aClient, void* aClosure);
@@ -68,6 +62,14 @@ private:
   gfx::SurfaceFormat mFormat;
   gfx::IntSize mSize;
 
+  // This is the number of cached texture clients we don't want to exceed, even
+  // temporarily (pre-shrink)
+  uint32_t mMaxTextureClients;
+
+  // The time in milliseconds before the pool will be shrunk to the minimum
+  // size after returning a client.
+  uint32_t mShrinkTimeoutMsec;
+
   // We use a std::stack and make sure to use it the following way:
   //   new (available to be used) elements are push()'d to the front
   //   requests are served from the front via pop()
diff --git a/gfx/layers/client/TextureClientPool.cpp b/gfx/layers/client/TextureClientPool.cpp
index 9086ccb289a..4836c87b2ac 100644
--- a/gfx/layers/client/TextureClientPool.cpp
+++ b/gfx/layers/client/TextureClientPool.cpp
@@ -21,9 +21,13 @@ ShrinkCallback(nsITimer *aTimer, void *aClosure)
 }
 
 TextureClientPool::TextureClientPool(gfx::SurfaceFormat aFormat, gfx::IntSize aSize,
+                                     uint32_t aMaxTextureClients,
+                                     uint32_t aShrinkTimeoutMsec,
                                      ISurfaceAllocator *aAllocator)
   : mFormat(aFormat)
   , mSize(aSize)
+  , mMaxTextureClients(aMaxTextureClients)
+  , mShrinkTimeoutMsec(aShrinkTimeoutMsec)
   , mOutstandingClients(0)
   , mSurfaceAllocator(aAllocator)
 {
@@ -82,7 +86,7 @@ TextureClientPool::ReturnTextureClient(TextureClient *aClient)
   // Kick off the pool shrinking timer if there are still more unused texture
   // clients than our desired minimum cache size.
   if (mTextureClients.size() > sMinCacheSize) {
-    mTimer->InitWithFuncCallback(ShrinkCallback, this, sShrinkTimeout,
+    mTimer->InitWithFuncCallback(ShrinkCallback, this, mShrinkTimeoutMsec,
                                  nsITimer::TYPE_ONE_SHOT);
   }
 }
@@ -103,7 +107,7 @@ TextureClientPool::ShrinkToMaximumSize()
   // maximum, or zero if we have too many outstanding texture clients.
   // We cull from the deferred TextureClients first, as we can't reuse those
   // until they get returned.
-  while (totalClientsOutstanding > sMaxTextureClients) {
+  while (totalClientsOutstanding > mMaxTextureClients) {
     if (mTextureClientsDeferred.size()) {
       mOutstandingClients--;
       mTextureClientsDeferred.pop();
@@ -111,7 +115,7 @@ TextureClientPool::ShrinkToMaximumSize()
       if (!mTextureClients.size()) {
         // Getting here means we're over our desired number of TextureClients
         // with none in the pool. This can happen for pathological cases, or
-        // it could mean that sMaxTextureClients needs adjusting for whatever
+        // it could mean that mMaxTextureClients needs adjusting for whatever
         // device we're running on.
         break;
       }
diff --git a/gfx/layers/client/TextureClientPool.h b/gfx/layers/client/TextureClientPool.h
index ff2c707bce6..94b4bdad41c 100644
--- a/gfx/layers/client/TextureClientPool.h
+++ b/gfx/layers/client/TextureClientPool.h
@@ -26,6 +26,8 @@ public:
   NS_INLINE_DECL_REFCOUNTING(TextureClientPool)
 
   TextureClientPool(gfx::SurfaceFormat aFormat, gfx::IntSize aSize,
+                    uint32_t aMaxTextureClients,
+                    uint32_t aShrinkTimeoutMsec,
                     ISurfaceAllocator *aAllocator);
 
   /**
@@ -53,7 +55,7 @@ public:
 
   /**
    * Attempt to shrink the pool so that there are no more than
-   * sMaxTextureClients clients outstanding.
+   * mMaxTextureClients clients outstanding.
    */
   void ShrinkToMaximumSize();
 
@@ -84,20 +86,23 @@ public:
   gfx::SurfaceFormat GetFormat() { return mFormat; }
 
 private:
-  // The time in milliseconds before the pool will be shrunk to the minimum
-  // size after returning a client.
-  static const uint32_t sShrinkTimeout = 1000;
-
   // The minimum size of the pool (the number of tiles that will be kept after
   // shrinking).
   static const uint32_t sMinCacheSize = 0;
 
+  /// Format is passed to the TextureClient for buffer creation.
+  gfx::SurfaceFormat mFormat;
+
+  /// The width and height of the tiles to be used.
+  gfx::IntSize mSize;
+
   // The maximum number of texture clients managed by this pool that we want
   // to remain active.
-  static const uint32_t sMaxTextureClients = 50;
+  uint32_t mMaxTextureClients;
 
-  gfx::SurfaceFormat mFormat;
-  gfx::IntSize mSize;
+  // The time in milliseconds before the pool will be shrunk to the minimum
+  // size after returning a client.
+  uint32_t mShrinkTimeoutMsec;
 
   uint32_t mOutstandingClients;
 
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 964e812df24..5786e630b48 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -230,6 +230,8 @@ private:
   // they are often the same size as the screen, especially for width.
   DECL_GFX_PREF(Once, "layers.tile-width",                     LayersTileWidth, int32_t, 256);
   DECL_GFX_PREF(Once, "layers.tile-height",                    LayersTileHeight, int32_t, 256);
+  DECL_GFX_PREF(Once, "layers.tile-max-pool-size",             LayersTileMaxPoolSize, uint32_t, (uint32_t)50);
+  DECL_GFX_PREF(Once, "layers.tile-shrink-pool-timeout",       LayersTileShrinkPoolTimeout, uint32_t, (uint32_t)1000);
   DECL_GFX_PREF(Once, "layers.overzealous-gralloc-unlocking",  OverzealousGrallocUnlocking, bool, false);
   DECL_GFX_PREF(Once, "layers.force-shmem-tiles",              ForceShmemTiles, bool, false);
   DECL_GFX_PREF(Live, "layers.frame-counter",                  DrawFrameCounter, bool, false);

From a7860c00843e456150f3e59bd47a3e3728f66410 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 25 Jul 2014 13:03:00 -0700
Subject: [PATCH 004/128] Back out part of bug 950745 for crashes

---
 dom/events/EventDispatcher.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index baf7a987aca..4a24b361e86 100644
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -401,10 +401,6 @@ EventDispatcher::Dispatch(nsISupports* aTarget,
                  NS_ERROR_DOM_INVALID_STATE_ERR);
   NS_ASSERTION(!aTargets || !aEvent->message, "Wrong parameters!");
 
-#ifdef NIGHTLY_BUILD
-  MOZ_RELEASE_ASSERT(!mozilla::ipc::ProcessingUrgentMessages());
-#endif
-
   // If we're dispatching an already created DOMEvent object, make
   // sure it is initialized!
   // If aTargets is non-null, the event isn't going to be dispatched.

From a34a42e399e8537b2eaeececf4861382173549a9 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Fri, 25 Jul 2014 16:17:36 -0400
Subject: [PATCH 005/128] Bug 687194 - Update content processes when dynamic
 chrome registration occurs. r=mossop

---
 chrome/RegistryMessageUtils.h      |  21 ++++++
 chrome/nsChromeRegistryChrome.cpp  | 109 ++++++++++++++++++++++++-----
 chrome/nsChromeRegistryChrome.h    |  14 +++-
 chrome/nsChromeRegistryContent.cpp |  14 +++-
 chrome/nsChromeRegistryContent.h   |  13 ++--
 dom/ipc/ContentChild.cpp           |  29 +++++++-
 dom/ipc/ContentChild.h             |   4 +-
 dom/ipc/PContent.ipdl              |   9 ++-
 8 files changed, 179 insertions(+), 34 deletions(-)

diff --git a/chrome/RegistryMessageUtils.h b/chrome/RegistryMessageUtils.h
index 3a4a4672ec4..31b015c526b 100644
--- a/chrome/RegistryMessageUtils.h
+++ b/chrome/RegistryMessageUtils.h
@@ -13,6 +13,12 @@ struct SerializedURI
 {
   nsCString spec;
   nsCString charset;
+
+  bool operator ==(const SerializedURI& rhs) const
+  {
+      return spec.Equals(rhs.spec) &&
+             charset.Equals(rhs.charset);
+  }
 };
 
 struct ChromePackage
@@ -22,6 +28,15 @@ struct ChromePackage
   SerializedURI localeBaseURI;
   SerializedURI skinBaseURI;
   uint32_t flags;
+
+  bool operator ==(const ChromePackage& rhs) const
+  {
+    return package.Equals(rhs.package) &&
+           contentBaseURI == rhs.contentBaseURI &&
+           localeBaseURI == rhs.localeBaseURI &&
+           skinBaseURI == rhs.skinBaseURI &&
+           flags == rhs.flags;
+  }
 };
 
 struct ResourceMapping
@@ -34,6 +49,12 @@ struct OverrideMapping
 {
   SerializedURI originalURI;
   SerializedURI overrideURI;
+
+  bool operator==(const OverrideMapping& rhs) const
+  {
+      return originalURI == rhs.originalURI &&
+             overrideURI == rhs.overrideURI;
+  }
 };
 
 namespace IPC {
diff --git a/chrome/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp
index 3f089ae09ca..bd508d21e07 100644
--- a/chrome/nsChromeRegistryChrome.cpp
+++ b/chrome/nsChromeRegistryChrome.cpp
@@ -1,9 +1,10 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sts=2 sw=2 et tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/PContentParent.h"
+#include "mozilla/dom/ContentParent.h"
 #include "RegistryMessageUtils.h"
 #include "nsResProtocolHandler.h"
 
@@ -24,6 +25,7 @@
 #include "nsXPCOMCIDInternal.h"
 
 #include "mozilla/LookAndFeel.h"
+#include "mozilla/unused.h"
 
 #include "nsICommandLine.h"
 #include "nsILocaleService.h"
@@ -44,6 +46,8 @@
 #define PACKAGE_OVERRIDE_BRANCH "chrome.override_package."
 
 using namespace mozilla;
+using mozilla::dom::ContentParent;
+using mozilla::dom::PContentParent;
 
 static PLDHashOperator
 RemoveAll(PLDHashTable *table, PLDHashEntryHdr *entry, uint32_t number, void *arg)
@@ -99,6 +103,7 @@ LanguagesMatch(const nsACString& a, const nsACString& b)
 
 nsChromeRegistryChrome::nsChromeRegistryChrome()
   : mProfileLoaded(false)
+  , mDynamicRegistration(true)
 {
   mPackagesHash.ops = nullptr;
 }
@@ -389,7 +394,13 @@ nsChromeRegistryChrome::CheckForNewChrome()
   mStyleHash.Clear();
   mOverrideTable.Clear();
 
+  mDynamicRegistration = false;
+
   nsComponentManagerImpl::gComponentManager->RereadChromeManifests();
+
+  mDynamicRegistration = true;
+
+  SendRegisteredChrome(nullptr);
   return NS_OK;
 }
 
@@ -476,9 +487,39 @@ nsChromeRegistryChrome::SendRegisteredChrome(
 
   mOverrideTable.EnumerateRead(&EnumerateOverride, &overrides);
 
-  bool success = aParent->SendRegisterChrome(packages, resources, overrides,
-                                             mSelectedLocale);
-  NS_ENSURE_TRUE_VOID(success);
+  if (aParent) {
+    bool success = aParent->SendRegisterChrome(packages, resources, overrides,
+                                               mSelectedLocale, false);
+    NS_ENSURE_TRUE_VOID(success);
+  } else {
+    nsTArray<ContentParent*> parents;
+    ContentParent::GetAll(parents);
+    if (!parents.Length())
+      return;
+
+    for (PRUint32 i = 0; i < parents.Length(); i++) {
+      DebugOnly<bool> success =
+        parents[i]->SendRegisterChrome(packages, resources, overrides,
+                                       mSelectedLocale, true);
+      NS_WARN_IF_FALSE(success, "couldn't reset a child's registered chrome");
+    }
+  }
+}
+
+/* static */ void
+nsChromeRegistryChrome::ChromePackageFromPackageEntry(PackageEntry* aPackage,
+                                                      ChromePackage* aChromePackage,
+                                                      const nsCString& aSelectedLocale,
+                                                      const nsCString& aSelectedSkin)
+{
+  SerializeURI(aPackage->baseURI, aChromePackage->contentBaseURI);
+  SerializeURI(aPackage->locales.GetBase(aSelectedLocale,
+                                         nsProviderArray::LOCALE),
+               aChromePackage->localeBaseURI);
+  SerializeURI(aPackage->skins.GetBase(aSelectedSkin, nsProviderArray::ANY),
+               aChromePackage->skinBaseURI);
+  aChromePackage->package = aPackage->package;
+  aChromePackage->flags = aPackage->flags;
 }
 
 PLDHashOperator
@@ -490,21 +531,9 @@ nsChromeRegistryChrome::CollectPackages(PLDHashTable *table,
   EnumerationArgs* args = static_cast<EnumerationArgs*>(arg);
   PackageEntry* package = static_cast<PackageEntry*>(entry);
 
-  SerializedURI contentURI, localeURI, skinURI;
-
-  SerializeURI(package->baseURI, contentURI);
-  SerializeURI(package->locales.GetBase(args->selectedLocale,
-                                        nsProviderArray::LOCALE), localeURI);
-  SerializeURI(package->skins.GetBase(args->selectedSkin, nsProviderArray::ANY),
-               skinURI);
-  
-  ChromePackage chromePackage = {
-    package->package,
-    contentURI,
-    localeURI,
-    skinURI,
-    package->flags
-  };
+  ChromePackage chromePackage;
+  ChromePackageFromPackageEntry(package, &chromePackage,
+                                args->selectedLocale, args->selectedSkin);
   args->packages.AppendElement(chromePackage);
   return (PLDHashOperator)PL_DHASH_NEXT;
 }
@@ -789,6 +818,19 @@ EnsureLowerCase(char *aBuf)
   }
 }
 
+static void
+SendManifestEntry(const ChromeRegistryItem &aItem)
+{
+  nsTArray<ContentParent*> parents;
+  ContentParent::GetAll(parents);
+  if (!parents.Length())
+    return;
+
+  for (uint32_t i = 0; i < parents.Length(); i++) {
+    unused << parents[i]->SendRegisterChromeItem(aItem);
+  }
+}
+
 void
 nsChromeRegistryChrome::ManifestContent(ManifestProcessingContext& cx, int lineno,
                                         char *const * argv, bool platform,
@@ -826,6 +868,12 @@ nsChromeRegistryChrome::ManifestContent(ManifestProcessingContext& cx, int linen
     entry->flags |= PLATFORM_PACKAGE;
   if (contentaccessible)
     entry->flags |= CONTENT_ACCESSIBLE;
+
+  if (mDynamicRegistration) {
+    ChromePackage chromePackage;
+    ChromePackageFromPackageEntry(entry, &chromePackage, mSelectedLocale, mSelectedSkin);
+    SendManifestEntry(chromePackage);
+  }
 }
 
 void
@@ -861,6 +909,12 @@ nsChromeRegistryChrome::ManifestLocale(ManifestProcessingContext& cx, int lineno
     return;
 
   entry->locales.SetBase(nsDependentCString(provider), resolved);
+
+  if (mDynamicRegistration) {
+    ChromePackage chromePackage;
+    ChromePackageFromPackageEntry(entry, &chromePackage, mSelectedLocale, mSelectedSkin);
+    SendManifestEntry(chromePackage);
+  }
 }
 
 void
@@ -896,6 +950,12 @@ nsChromeRegistryChrome::ManifestSkin(ManifestProcessingContext& cx, int lineno,
     return;
 
   entry->skins.SetBase(nsDependentCString(provider), resolved);
+
+  if (mDynamicRegistration) {
+    ChromePackage chromePackage;
+    ChromePackageFromPackageEntry(entry, &chromePackage, mSelectedLocale, mSelectedSkin);
+    SendManifestEntry(chromePackage);
+  }
 }
 
 void
@@ -970,6 +1030,17 @@ nsChromeRegistryChrome::ManifestOverride(ManifestProcessingContext& cx, int line
     return;
   }
   mOverrideTable.Put(chromeuri, resolveduri);
+
+  if (mDynamicRegistration) {
+    SerializedURI serializedChrome;
+    SerializedURI serializedOverride;
+
+    SerializeURI(chromeuri, serializedChrome);
+    SerializeURI(resolveduri, serializedOverride);
+
+    OverrideMapping override = { serializedChrome, serializedOverride };
+    SendManifestEntry(override);
+  }
 }
 
 void
diff --git a/chrome/nsChromeRegistryChrome.h b/chrome/nsChromeRegistryChrome.h
index f9340d32fc8..2c581ab4055 100644
--- a/chrome/nsChromeRegistryChrome.h
+++ b/chrome/nsChromeRegistryChrome.h
@@ -18,6 +18,7 @@ class PContentParent;
 }
 
 class nsIPrefBranch;
+struct ChromePackage;
 
 class nsChromeRegistryChrome : public nsChromeRegistry
 {
@@ -44,10 +45,18 @@ class nsChromeRegistryChrome : public nsChromeRegistry
   NS_IMETHOD GetStyleOverlays(nsIURI *aURI,
                               nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
 #endif
-  
+
+  // If aChild is non-null then it is a new child to notify. If aChild is
+  // null, then we have installed new chrome and we are resetting all of our
+  // children's registered chrome.
   void SendRegisteredChrome(mozilla::dom::PContentParent* aChild);
 
  private:
+  struct PackageEntry;
+  static void ChromePackageFromPackageEntry(PackageEntry* aPackage,
+                                            ChromePackage* aChromePackage,
+                                            const nsCString& aSelectedLocale,
+                                            const nsCString& aSelectedSkin);
   static PLDHashOperator CollectPackages(PLDHashTable *table,
                                          PLDHashEntryHdr *entry,
                                          uint32_t number, void *arg);
@@ -155,7 +164,8 @@ class nsChromeRegistryChrome : public nsChromeRegistry
   OverlayListHash mStyleHash;
 
   bool mProfileLoaded;
-  
+  bool mDynamicRegistration;
+
   nsCString mSelectedLocale;
   nsCString mSelectedSkin;
 
diff --git a/chrome/nsChromeRegistryContent.cpp b/chrome/nsChromeRegistryContent.cpp
index 7452b45da3b..3ea6f42ffcb 100644
--- a/chrome/nsChromeRegistryContent.cpp
+++ b/chrome/nsChromeRegistryContent.cpp
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sts=2 sw=2 et tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -18,11 +19,18 @@ nsChromeRegistryContent::RegisterRemoteChrome(
     const InfallibleTArray<ChromePackage>& aPackages,
     const InfallibleTArray<ResourceMapping>& aResources,
     const InfallibleTArray<OverrideMapping>& aOverrides,
-    const nsACString& aLocale)
+    const nsACString& aLocale,
+    bool aReset)
 {
-  NS_ABORT_IF_FALSE(mLocale == nsDependentCString(""),
+  NS_ABORT_IF_FALSE(aReset || mLocale.IsEmpty(),
                     "RegisterChrome twice?");
 
+  if (aReset) {
+    mPackagesHash.Clear();
+    mOverrideTable.Clear();
+    // XXX Can't clear resources.
+  }
+
   for (uint32_t i = aPackages.Length(); i > 0; ) {
     --i;
     RegisterPackage(aPackages[i]);
@@ -106,7 +114,7 @@ nsChromeRegistryContent::RegisterResource(const ResourceMapping& aResource)
     nsresult rv = NS_NewURI(getter_AddRefs(resolvedURI),
                             aResource.resolvedURI.spec,
                             aResource.resolvedURI.charset.get(),
-                            nullptr, io);                 
+                            nullptr, io);
     if (NS_FAILED(rv))
       return;
   }
diff --git a/chrome/nsChromeRegistryContent.h b/chrome/nsChromeRegistryContent.h
index c2d3ae788d3..9320806d7b1 100644
--- a/chrome/nsChromeRegistryContent.h
+++ b/chrome/nsChromeRegistryContent.h
@@ -17,11 +17,12 @@ class nsChromeRegistryContent : public nsChromeRegistry
 {
  public:
   nsChromeRegistryContent();
-  
+
   void RegisterRemoteChrome(const InfallibleTArray<ChromePackage>& aPackages,
                             const InfallibleTArray<ResourceMapping>& aResources,
                             const InfallibleTArray<OverrideMapping>& aOverrides,
-                            const nsACString& aLocale);
+                            const nsACString& aLocale,
+                            bool aReset);
 
   NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
                                   nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
@@ -38,6 +39,10 @@ class nsChromeRegistryContent : public nsChromeRegistry
   NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL,
                             nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
 
+  void RegisterPackage(const ChromePackage& aPackage);
+  void RegisterOverride(const OverrideMapping& aOverride);
+  void RegisterResource(const ResourceMapping& aResource);
+
  private:
   struct PackageEntry
   {
@@ -49,10 +54,6 @@ class nsChromeRegistryContent : public nsChromeRegistry
     nsCOMPtr<nsIURI> skinBaseURI;
     uint32_t         flags;
   };
-  
-  void RegisterPackage(const ChromePackage& aPackage);
-  void RegisterResource(const ResourceMapping& aResource);
-  void RegisterOverride(const OverrideMapping& aOverride);
 
   nsresult UpdateSelectedLocale() MOZ_OVERRIDE;
   nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 86a7fdc25b5..c9808a08be4 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1374,12 +1374,37 @@ bool
 ContentChild::RecvRegisterChrome(const InfallibleTArray<ChromePackage>& packages,
                                  const InfallibleTArray<ResourceMapping>& resources,
                                  const InfallibleTArray<OverrideMapping>& overrides,
-                                 const nsCString& locale)
+                                 const nsCString& locale,
+                                 const bool& reset)
 {
     nsCOMPtr<nsIChromeRegistry> registrySvc = nsChromeRegistry::GetService();
     nsChromeRegistryContent* chromeRegistry =
         static_cast<nsChromeRegistryContent*>(registrySvc.get());
-    chromeRegistry->RegisterRemoteChrome(packages, resources, overrides, locale);
+    chromeRegistry->RegisterRemoteChrome(packages, resources, overrides,
+                                         locale, reset);
+    return true;
+}
+
+bool
+ContentChild::RecvRegisterChromeItem(const ChromeRegistryItem& item)
+{
+    nsCOMPtr<nsIChromeRegistry> registrySvc = nsChromeRegistry::GetService();
+    nsChromeRegistryContent* chromeRegistry =
+        static_cast<nsChromeRegistryContent*>(registrySvc.get());
+    switch (item.type()) {
+        case ChromeRegistryItem::TChromePackage:
+            chromeRegistry->RegisterPackage(item.get_ChromePackage());
+            break;
+
+        case ChromeRegistryItem::TOverrideMapping:
+            chromeRegistry->RegisterOverride(item.get_OverrideMapping());
+            break;
+
+        default:
+            MOZ_ASSERT(false, "bad chrome item");
+            return false;
+    }
+
     return true;
 }
 
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index 829ff93f37d..6906e6fa6fa 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -240,7 +240,9 @@ public:
     virtual bool RecvRegisterChrome(const InfallibleTArray<ChromePackage>& packages,
                                     const InfallibleTArray<ResourceMapping>& resources,
                                     const InfallibleTArray<OverrideMapping>& overrides,
-                                    const nsCString& locale) MOZ_OVERRIDE;
+                                    const nsCString& locale,
+                                    const bool& reset) MOZ_OVERRIDE;
+    virtual bool RecvRegisterChromeItem(const ChromeRegistryItem& item) MOZ_OVERRIDE;
 
     virtual mozilla::jsipc::PJavaScriptChild* AllocPJavaScriptChild() MOZ_OVERRIDE;
     virtual bool DeallocPJavaScriptChild(mozilla::jsipc::PJavaScriptChild*) MOZ_OVERRIDE;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index e3581bec1a3..f3dd651bffb 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -57,6 +57,12 @@ using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 using mozilla::hal::ProcessPriority from "mozilla/HalTypes.h";
 using gfxIntSize from "nsSize.h";
 
+union ChromeRegistryItem
+{
+    ChromePackage;
+    OverrideMapping;
+};
+
 namespace mozilla {
 namespace dom {
 
@@ -381,7 +387,8 @@ child:
     PTestShell();
 
     RegisterChrome(ChromePackage[] packages, ResourceMapping[] resources,
-                   OverrideMapping[] overrides, nsCString locale);
+                   OverrideMapping[] overrides, nsCString locale, bool reset);
+    RegisterChromeItem(ChromeRegistryItem item);
 
     async SetOffline(bool offline);
 

From a853ecd8273a575bf64f76388d23ee6364f5e99f Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Fri, 25 Jul 2014 11:01:35 -0500
Subject: [PATCH 006/128] Bug 1043453 - OdinMonkey: fix bugs in interrupt
 handling (r=dougc)

--HG--
extra : rebase_source : 79fc33173590bde7e80f2960115361cb21c27cba
---
 js/src/jit/AsmJSLink.cpp   |  2 +-
 js/src/jit/AsmJSModule.cpp | 24 +++++++++++++-----------
 js/src/jit/AsmJSModule.h   |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/js/src/jit/AsmJSLink.cpp b/js/src/jit/AsmJSLink.cpp
index 2dba60ed8c0..e06b076e862 100644
--- a/js/src/jit/AsmJSLink.cpp
+++ b/js/src/jit/AsmJSLink.cpp
@@ -374,7 +374,7 @@ CallAsmJS(JSContext *cx, unsigned argc, Value *vp)
     // stack since this would leave the module in a state where profiling is
     // enabled but the stack isn't unwindable.
     if (module.profilingEnabled() != cx->runtime()->spsProfiler.enabled() && !module.active())
-        module.setProfilingEnabled(cx->runtime()->spsProfiler.enabled());
+        module.setProfilingEnabled(cx->runtime()->spsProfiler.enabled(), cx);
 
     // An exported function points to the code as well as the exported
     // function's signature, which implies the dynamic coercions performed on
diff --git a/js/src/jit/AsmJSModule.cpp b/js/src/jit/AsmJSModule.cpp
index cbe1e92c72c..d29542e5dee 100644
--- a/js/src/jit/AsmJSModule.cpp
+++ b/js/src/jit/AsmJSModule.cpp
@@ -457,11 +457,11 @@ AsmJSReportOverRecursed()
     js_ReportOverRecursed(cx);
 }
 
-static void
+static bool
 AsmJSHandleExecutionInterrupt()
 {
     JSContext *cx = PerThreadData::innermostAsmJSActivation()->cx();
-    HandleExecutionInterrupt(cx);
+    return HandleExecutionInterrupt(cx);
 }
 
 static int32_t
@@ -1446,11 +1446,12 @@ AsmJSModule::deserialize(ExclusiveContext *cx, const uint8_t *cursor)
     return cursor;
 }
 
-// When a module is cloned, we memcpy its executable code. If, right before or
-// during the clone, another thread calls AsmJSModule::protectCode() then the
-// executable code will become inaccessible. In theory, we could take away only
-// PROT_EXEC, but this seems to break emulators.
-class AutoUnprotectCodeForClone
+// At any time, the executable code of an asm.js module can be protected (as
+// part of RequestInterruptForAsmJSCode). When we touch the executable outside
+// of executing it (which the AsmJSFaultHandler will correctly handle), we need
+// to guard against this by unprotecting the code (if it has been protected) and
+// preventing it from being protected while we are touching it.
+class AutoUnprotectCode
 {
     JSRuntime *rt_;
     JSRuntime::AutoLockForInterrupt lock_;
@@ -1458,7 +1459,7 @@ class AutoUnprotectCodeForClone
     const bool protectedBefore_;
 
   public:
-    AutoUnprotectCodeForClone(JSContext *cx, const AsmJSModule &module)
+    AutoUnprotectCode(JSContext *cx, const AsmJSModule &module)
       : rt_(cx->runtime()),
         lock_(rt_),
         module_(module),
@@ -1468,7 +1469,7 @@ class AutoUnprotectCodeForClone
             module_.unprotectCode(rt_);
     }
 
-    ~AutoUnprotectCodeForClone()
+    ~AutoUnprotectCode()
     {
         if (protectedBefore_)
             module_.protectCode(rt_);
@@ -1478,7 +1479,7 @@ class AutoUnprotectCodeForClone
 bool
 AsmJSModule::clone(JSContext *cx, ScopedJSDeletePtr<AsmJSModule> *moduleOut) const
 {
-    AutoUnprotectCodeForClone cloneGuard(cx, *this);
+    AutoUnprotectCode auc(cx, *this);
 
     *moduleOut = cx->new_<AsmJSModule>(scriptSource_, srcStart_, srcBodyStart_, pod.strict_,
                                        pod.usesSignalHandlers_);
@@ -1527,7 +1528,7 @@ AsmJSModule::clone(JSContext *cx, ScopedJSDeletePtr<AsmJSModule> *moduleOut) con
 }
 
 void
-AsmJSModule::setProfilingEnabled(bool enabled)
+AsmJSModule::setProfilingEnabled(bool enabled, JSContext *cx)
 {
     JS_ASSERT(isDynamicallyLinked());
 
@@ -1539,6 +1540,7 @@ AsmJSModule::setProfilingEnabled(bool enabled)
     setAutoFlushICacheRange();
 
     // To enable profiling, we need to patch 3 kinds of things:
+    AutoUnprotectCode auc(cx, *this);
 
     // Patch all internal (asm.js->asm.js) callsites to call the profiling
     // prologues:
diff --git a/js/src/jit/AsmJSModule.h b/js/src/jit/AsmJSModule.h
index b9d38e52b00..c4de480eb57 100644
--- a/js/src/jit/AsmJSModule.h
+++ b/js/src/jit/AsmJSModule.h
@@ -1155,7 +1155,7 @@ class AsmJSModule
         JS_ASSERT(isDynamicallyLinked());
         return profilingEnabled_;
     }
-    void setProfilingEnabled(bool enabled);
+    void setProfilingEnabled(bool enabled, JSContext *cx);
 
     // Additionally, these functions may only be called while holding the
     // runtime's interrupt lock.

From 85e5dc87b9132ca304eac0bc24307cdd604a75ee Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 25 Jul 2014 14:15:35 -0700
Subject: [PATCH 007/128] Bug 946065 - Part 1: Move content/canvas/ to dom/ and
 flatten subdirectories. r=ehsan

--HG--
rename : content/canvas/src/CanvasGradient.h => dom/canvas/CanvasGradient.h
rename : content/canvas/src/CanvasImageCache.cpp => dom/canvas/CanvasImageCache.cpp
rename : content/canvas/src/CanvasImageCache.h => dom/canvas/CanvasImageCache.h
rename : content/canvas/src/CanvasPattern.h => dom/canvas/CanvasPattern.h
rename : content/canvas/src/CanvasRenderingContext2D.cpp => dom/canvas/CanvasRenderingContext2D.cpp
rename : content/canvas/src/CanvasRenderingContext2D.h => dom/canvas/CanvasRenderingContext2D.h
rename : content/canvas/src/CanvasUtils.cpp => dom/canvas/CanvasUtils.cpp
rename : content/canvas/src/CanvasUtils.h => dom/canvas/CanvasUtils.h
rename : content/canvas/src/DocumentRendererChild.cpp => dom/canvas/DocumentRendererChild.cpp
rename : content/canvas/public/DocumentRendererChild.h => dom/canvas/DocumentRendererChild.h
rename : content/canvas/src/DocumentRendererParent.cpp => dom/canvas/DocumentRendererParent.cpp
rename : content/canvas/public/DocumentRendererParent.h => dom/canvas/DocumentRendererParent.h
rename : content/canvas/src/ImageData.cpp => dom/canvas/ImageData.cpp
rename : content/canvas/src/ImageData.h => dom/canvas/ImageData.h
rename : content/canvas/src/ImageEncoder.cpp => dom/canvas/ImageEncoder.cpp
rename : content/canvas/src/ImageEncoder.h => dom/canvas/ImageEncoder.h
rename : content/canvas/src/Makefile.in => dom/canvas/Makefile.in
rename : content/canvas/src/MurmurHash3.cpp => dom/canvas/MurmurHash3.cpp
rename : content/canvas/src/MurmurHash3.h => dom/canvas/MurmurHash3.h
rename : content/canvas/src/TextMetrics.h => dom/canvas/TextMetrics.h
rename : content/canvas/src/WebGL1Context.cpp => dom/canvas/WebGL1Context.cpp
rename : content/canvas/src/WebGL1Context.h => dom/canvas/WebGL1Context.h
rename : content/canvas/src/WebGL2Context.cpp => dom/canvas/WebGL2Context.cpp
rename : content/canvas/src/WebGL2Context.h => dom/canvas/WebGL2Context.h
rename : content/canvas/src/WebGLActiveInfo.cpp => dom/canvas/WebGLActiveInfo.cpp
rename : content/canvas/src/WebGLActiveInfo.h => dom/canvas/WebGLActiveInfo.h
rename : content/canvas/src/WebGLBuffer.cpp => dom/canvas/WebGLBuffer.cpp
rename : content/canvas/src/WebGLBuffer.h => dom/canvas/WebGLBuffer.h
rename : content/canvas/src/WebGLContext.cpp => dom/canvas/WebGLContext.cpp
rename : content/canvas/src/WebGLContext.h => dom/canvas/WebGLContext.h
rename : content/canvas/src/WebGLContextAsyncQueries.cpp => dom/canvas/WebGLContextAsyncQueries.cpp
rename : content/canvas/src/WebGLContextBuffers.cpp => dom/canvas/WebGLContextBuffers.cpp
rename : content/canvas/src/WebGLContextDraw.cpp => dom/canvas/WebGLContextDraw.cpp
rename : content/canvas/src/WebGLContextExtensions.cpp => dom/canvas/WebGLContextExtensions.cpp
rename : content/canvas/src/WebGLContextFramebufferOperations.cpp => dom/canvas/WebGLContextFramebufferOperations.cpp
rename : content/canvas/src/WebGLContextGL.cpp => dom/canvas/WebGLContextGL.cpp
rename : content/canvas/src/WebGLContextLossTimer.cpp => dom/canvas/WebGLContextLossTimer.cpp
rename : content/canvas/src/WebGLContextNotSupported.cpp => dom/canvas/WebGLContextNotSupported.cpp
rename : content/canvas/src/WebGLContextReporter.cpp => dom/canvas/WebGLContextReporter.cpp
rename : content/canvas/src/WebGLContextState.cpp => dom/canvas/WebGLContextState.cpp
rename : content/canvas/src/WebGLContextUtils.cpp => dom/canvas/WebGLContextUtils.cpp
rename : content/canvas/src/WebGLContextUtils.h => dom/canvas/WebGLContextUtils.h
rename : content/canvas/src/WebGLContextValidate.cpp => dom/canvas/WebGLContextValidate.cpp
rename : content/canvas/src/WebGLContextVertexArray.cpp => dom/canvas/WebGLContextVertexArray.cpp
rename : content/canvas/src/WebGLContextVertices.cpp => dom/canvas/WebGLContextVertices.cpp
rename : content/canvas/src/WebGLElementArrayCache.cpp => dom/canvas/WebGLElementArrayCache.cpp
rename : content/canvas/src/WebGLElementArrayCache.h => dom/canvas/WebGLElementArrayCache.h
rename : content/canvas/src/WebGLExtensionBase.cpp => dom/canvas/WebGLExtensionBase.cpp
rename : content/canvas/src/WebGLExtensionBlendMinMax.cpp => dom/canvas/WebGLExtensionBlendMinMax.cpp
rename : content/canvas/src/WebGLExtensionColorBufferFloat.cpp => dom/canvas/WebGLExtensionColorBufferFloat.cpp
rename : content/canvas/src/WebGLExtensionColorBufferHalfFloat.cpp => dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp
rename : content/canvas/src/WebGLExtensionCompressedTextureATC.cpp => dom/canvas/WebGLExtensionCompressedTextureATC.cpp
rename : content/canvas/src/WebGLExtensionCompressedTextureETC1.cpp => dom/canvas/WebGLExtensionCompressedTextureETC1.cpp
rename : content/canvas/src/WebGLExtensionCompressedTexturePVRTC.cpp => dom/canvas/WebGLExtensionCompressedTexturePVRTC.cpp
rename : content/canvas/src/WebGLExtensionCompressedTextureS3TC.cpp => dom/canvas/WebGLExtensionCompressedTextureS3TC.cpp
rename : content/canvas/src/WebGLExtensionDebugRendererInfo.cpp => dom/canvas/WebGLExtensionDebugRendererInfo.cpp
rename : content/canvas/src/WebGLExtensionDebugShaders.cpp => dom/canvas/WebGLExtensionDebugShaders.cpp
rename : content/canvas/src/WebGLExtensionDepthTexture.cpp => dom/canvas/WebGLExtensionDepthTexture.cpp
rename : content/canvas/src/WebGLExtensionDrawBuffers.cpp => dom/canvas/WebGLExtensionDrawBuffers.cpp
rename : content/canvas/src/WebGLExtensionElementIndexUint.cpp => dom/canvas/WebGLExtensionElementIndexUint.cpp
rename : content/canvas/src/WebGLExtensionFragDepth.cpp => dom/canvas/WebGLExtensionFragDepth.cpp
rename : content/canvas/src/WebGLExtensionInstancedArrays.cpp => dom/canvas/WebGLExtensionInstancedArrays.cpp
rename : content/canvas/src/WebGLExtensionLoseContext.cpp => dom/canvas/WebGLExtensionLoseContext.cpp
rename : content/canvas/src/WebGLExtensionSRGB.cpp => dom/canvas/WebGLExtensionSRGB.cpp
rename : content/canvas/src/WebGLExtensionStandardDerivatives.cpp => dom/canvas/WebGLExtensionStandardDerivatives.cpp
rename : content/canvas/src/WebGLExtensionTextureFilterAnisotropic.cpp => dom/canvas/WebGLExtensionTextureFilterAnisotropic.cpp
rename : content/canvas/src/WebGLExtensionTextureFloat.cpp => dom/canvas/WebGLExtensionTextureFloat.cpp
rename : content/canvas/src/WebGLExtensionTextureFloatLinear.cpp => dom/canvas/WebGLExtensionTextureFloatLinear.cpp
rename : content/canvas/src/WebGLExtensionTextureHalfFloat.cpp => dom/canvas/WebGLExtensionTextureHalfFloat.cpp
rename : content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp => dom/canvas/WebGLExtensionTextureHalfFloatLinear.cpp
rename : content/canvas/src/WebGLExtensionVertexArray.cpp => dom/canvas/WebGLExtensionVertexArray.cpp
rename : content/canvas/src/WebGLExtensions.h => dom/canvas/WebGLExtensions.h
rename : content/canvas/src/WebGLFramebuffer.cpp => dom/canvas/WebGLFramebuffer.cpp
rename : content/canvas/src/WebGLFramebuffer.h => dom/canvas/WebGLFramebuffer.h
rename : content/canvas/src/WebGLFramebufferAttachable.cpp => dom/canvas/WebGLFramebufferAttachable.cpp
rename : content/canvas/src/WebGLFramebufferAttachable.h => dom/canvas/WebGLFramebufferAttachable.h
rename : content/canvas/src/WebGLMemoryTracker.h => dom/canvas/WebGLMemoryTracker.h
rename : content/canvas/src/WebGLObjectModel.cpp => dom/canvas/WebGLObjectModel.cpp
rename : content/canvas/src/WebGLObjectModel.h => dom/canvas/WebGLObjectModel.h
rename : content/canvas/src/WebGLProgram.cpp => dom/canvas/WebGLProgram.cpp
rename : content/canvas/src/WebGLProgram.h => dom/canvas/WebGLProgram.h
rename : content/canvas/src/WebGLQuery.cpp => dom/canvas/WebGLQuery.cpp
rename : content/canvas/src/WebGLQuery.h => dom/canvas/WebGLQuery.h
rename : content/canvas/src/WebGLRenderbuffer.cpp => dom/canvas/WebGLRenderbuffer.cpp
rename : content/canvas/src/WebGLRenderbuffer.h => dom/canvas/WebGLRenderbuffer.h
rename : content/canvas/src/WebGLShader.cpp => dom/canvas/WebGLShader.cpp
rename : content/canvas/src/WebGLShader.h => dom/canvas/WebGLShader.h
rename : content/canvas/src/WebGLShaderPrecisionFormat.cpp => dom/canvas/WebGLShaderPrecisionFormat.cpp
rename : content/canvas/src/WebGLShaderPrecisionFormat.h => dom/canvas/WebGLShaderPrecisionFormat.h
rename : content/canvas/src/WebGLTexelConversions.cpp => dom/canvas/WebGLTexelConversions.cpp
rename : content/canvas/src/WebGLTexelConversions.h => dom/canvas/WebGLTexelConversions.h
rename : content/canvas/src/WebGLTexture.cpp => dom/canvas/WebGLTexture.cpp
rename : content/canvas/src/WebGLTexture.h => dom/canvas/WebGLTexture.h
rename : content/canvas/src/WebGLTypes.h => dom/canvas/WebGLTypes.h
rename : content/canvas/src/WebGLUniformInfo.h => dom/canvas/WebGLUniformInfo.h
rename : content/canvas/src/WebGLUniformLocation.cpp => dom/canvas/WebGLUniformLocation.cpp
rename : content/canvas/src/WebGLUniformLocation.h => dom/canvas/WebGLUniformLocation.h
rename : content/canvas/src/WebGLValidateStrings.h => dom/canvas/WebGLValidateStrings.h
rename : content/canvas/src/WebGLVertexArray.cpp => dom/canvas/WebGLVertexArray.cpp
rename : content/canvas/src/WebGLVertexArray.h => dom/canvas/WebGLVertexArray.h
rename : content/canvas/src/WebGLVertexArrayFake.cpp => dom/canvas/WebGLVertexArrayFake.cpp
rename : content/canvas/src/WebGLVertexArrayFake.h => dom/canvas/WebGLVertexArrayFake.h
rename : content/canvas/src/WebGLVertexArrayGL.cpp => dom/canvas/WebGLVertexArrayGL.cpp
rename : content/canvas/src/WebGLVertexArrayGL.h => dom/canvas/WebGLVertexArrayGL.h
rename : content/canvas/src/WebGLVertexAttribData.h => dom/canvas/WebGLVertexAttribData.h
rename : content/canvas/compiledtest/TestWebGLElementArrayCache.cpp => dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp
rename : content/canvas/compiledtest/moz.build => dom/canvas/compiledtest/moz.build
rename : content/canvas/crashtests/0px-size-font-667225.html => dom/canvas/crashtests/0px-size-font-667225.html
rename : content/canvas/crashtests/0px-size-font-shadow.html => dom/canvas/crashtests/0px-size-font-shadow.html
rename : content/canvas/crashtests/360293-1.html => dom/canvas/crashtests/360293-1.html
rename : content/canvas/crashtests/421715-1.html => dom/canvas/crashtests/421715-1.html
rename : content/canvas/crashtests/553938-1.html => dom/canvas/crashtests/553938-1.html
rename : content/canvas/crashtests/647480.html => dom/canvas/crashtests/647480.html
rename : content/canvas/crashtests/727547.html => dom/canvas/crashtests/727547.html
rename : content/canvas/crashtests/729116.html => dom/canvas/crashtests/729116.html
rename : content/canvas/crashtests/743499-negative-size.html => dom/canvas/crashtests/743499-negative-size.html
rename : content/canvas/crashtests/745699-1.html => dom/canvas/crashtests/745699-1.html
rename : content/canvas/crashtests/745818-large-source.html => dom/canvas/crashtests/745818-large-source.html
rename : content/canvas/crashtests/746813-1.html => dom/canvas/crashtests/746813-1.html
rename : content/canvas/crashtests/767337-1.html => dom/canvas/crashtests/767337-1.html
rename : content/canvas/crashtests/780392-1.html => dom/canvas/crashtests/780392-1.html
rename : content/canvas/crashtests/789933-1.html => dom/canvas/crashtests/789933-1.html
rename : content/canvas/crashtests/794463-1.html => dom/canvas/crashtests/794463-1.html
rename : content/canvas/crashtests/802926-1.html => dom/canvas/crashtests/802926-1.html
rename : content/canvas/crashtests/896047-1.html => dom/canvas/crashtests/896047-1.html
rename : content/canvas/crashtests/896047-2.html => dom/canvas/crashtests/896047-2.html
rename : content/canvas/crashtests/916128-1.html => dom/canvas/crashtests/916128-1.html
rename : content/canvas/crashtests/934939-1.html => dom/canvas/crashtests/934939-1.html
rename : content/canvas/crashtests/crashtests.list => dom/canvas/crashtests/crashtests.list
rename : content/canvas/crashtests/texImage2D.html => dom/canvas/crashtests/texImage2D.html
rename : content/canvas/moz.build => dom/canvas/moz.build
rename : content/canvas/public/nsICanvasRenderingContextInternal.h => dom/canvas/nsICanvasRenderingContextInternal.h
rename : content/canvas/test/android.json => dom/canvas/test/android.json
rename : content/canvas/test/chrome/chrome.ini => dom/canvas/test/chrome/chrome.ini
rename : content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html => dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html
rename : content/canvas/test/chrome/test_drawWindow_widget_layers.html => dom/canvas/test/chrome/test_drawWindow_widget_layers.html
rename : content/canvas/test/chrome/test_webgl_debug_renderer_info.html => dom/canvas/test/chrome/test_webgl_debug_renderer_info.html
rename : content/canvas/test/crossorigin/image-allow-credentials.png => dom/canvas/test/crossorigin/image-allow-credentials.png
rename : content/canvas/test/crossorigin/image-allow-credentials.png^headers^ => dom/canvas/test/crossorigin/image-allow-credentials.png^headers^
rename : content/canvas/test/crossorigin/image-allow-star.png => dom/canvas/test/crossorigin/image-allow-star.png
rename : content/canvas/test/crossorigin/image-allow-star.png^headers^ => dom/canvas/test/crossorigin/image-allow-star.png^headers^
rename : content/canvas/test/crossorigin/image.png => dom/canvas/test/crossorigin/image.png
rename : content/canvas/test/crossorigin/mochitest.ini => dom/canvas/test/crossorigin/mochitest.ini
rename : content/canvas/test/crossorigin/test_canvas2d_crossorigin.html => dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
rename : content/canvas/test/crossorigin/test_video_crossorigin.html => dom/canvas/test/crossorigin/test_video_crossorigin.html
rename : content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html => dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
rename : content/canvas/test/crossorigin/video.sjs => dom/canvas/test/crossorigin/video.sjs
rename : content/canvas/test/file_drawImage_document_domain.html => dom/canvas/test/file_drawImage_document_domain.html
rename : content/canvas/test/file_drawWindow_common.js => dom/canvas/test/file_drawWindow_common.js
rename : content/canvas/test/file_drawWindow_source.html => dom/canvas/test/file_drawWindow_source.html
rename : content/canvas/test/image_anim-gr.gif => dom/canvas/test/image_anim-gr.gif
rename : content/canvas/test/image_anim-gr.png => dom/canvas/test/image_anim-gr.png
rename : content/canvas/test/image_anim-poster-gr.png => dom/canvas/test/image_anim-poster-gr.png
rename : content/canvas/test/image_broken.png => dom/canvas/test/image_broken.png
rename : content/canvas/test/image_ggrr-256x256.png => dom/canvas/test/image_ggrr-256x256.png
rename : content/canvas/test/image_green-16x16.png => dom/canvas/test/image_green-16x16.png
rename : content/canvas/test/image_green-1x1.png => dom/canvas/test/image_green-1x1.png
rename : content/canvas/test/image_green-redirect => dom/canvas/test/image_green-redirect
rename : content/canvas/test/image_green-redirect^headers^ => dom/canvas/test/image_green-redirect^headers^
rename : content/canvas/test/image_green.png => dom/canvas/test/image_green.png
rename : content/canvas/test/image_red-16x16.png => dom/canvas/test/image_red-16x16.png
rename : content/canvas/test/image_red.png => dom/canvas/test/image_red.png
rename : content/canvas/test/image_redtransparent.png => dom/canvas/test/image_redtransparent.png
rename : content/canvas/test/image_rgrg-256x256.png => dom/canvas/test/image_rgrg-256x256.png
rename : content/canvas/test/image_rrgg-256x256.png => dom/canvas/test/image_rrgg-256x256.png
rename : content/canvas/test/image_transparent.png => dom/canvas/test/image_transparent.png
rename : content/canvas/test/image_transparent50.png => dom/canvas/test/image_transparent50.png
rename : content/canvas/test/image_yellow.png => dom/canvas/test/image_yellow.png
rename : content/canvas/test/image_yellow75.png => dom/canvas/test/image_yellow75.png
rename : content/canvas/test/mochitest.ini => dom/canvas/test/mochitest.ini
rename : content/canvas/test/moz.build => dom/canvas/test/moz.build
rename : content/canvas/test/reftest/black.html => dom/canvas/test/reftest/black.html
rename : content/canvas/test/reftest/clip-multiple-paths-badref.html => dom/canvas/test/reftest/clip-multiple-paths-badref.html
rename : content/canvas/test/reftest/clip-multiple-paths.html => dom/canvas/test/reftest/clip-multiple-paths.html
rename : content/canvas/test/reftest/colors-half-alpha.png => dom/canvas/test/reftest/colors-half-alpha.png
rename : content/canvas/test/reftest/colors.png => dom/canvas/test/reftest/colors.png
rename : content/canvas/test/reftest/drawCustomFocusRing-ref.html => dom/canvas/test/reftest/drawCustomFocusRing-ref.html
rename : content/canvas/test/reftest/drawCustomFocusRing.html => dom/canvas/test/reftest/drawCustomFocusRing.html
rename : content/canvas/test/reftest/drawFocusIfNeeded-ref.html => dom/canvas/test/reftest/drawFocusIfNeeded-ref.html
rename : content/canvas/test/reftest/drawFocusIfNeeded.html => dom/canvas/test/reftest/drawFocusIfNeeded.html
rename : content/canvas/test/reftest/green.png => dom/canvas/test/reftest/green.png
rename : content/canvas/test/reftest/half-colors-half-alpha.png => dom/canvas/test/reftest/half-colors-half-alpha.png
rename : content/canvas/test/reftest/half-colors.png => dom/canvas/test/reftest/half-colors.png
rename : content/canvas/test/reftest/reftest.list => dom/canvas/test/reftest/reftest.list
rename : content/canvas/test/reftest/stroketext-shadow-ref.html => dom/canvas/test/reftest/stroketext-shadow-ref.html
rename : content/canvas/test/reftest/stroketext-shadow.html => dom/canvas/test/reftest/stroketext-shadow.html
rename : content/canvas/test/reftest/webgl-clear-test.html => dom/canvas/test/reftest/webgl-clear-test.html
rename : content/canvas/test/reftest/webgl-color-alpha-test.html => dom/canvas/test/reftest/webgl-color-alpha-test.html
rename : content/canvas/test/reftest/webgl-color-test.html => dom/canvas/test/reftest/webgl-color-test.html
rename : content/canvas/test/reftest/webgl-disable-test.html => dom/canvas/test/reftest/webgl-disable-test.html
rename : content/canvas/test/reftest/webgl-hanging-fb-test.html => dom/canvas/test/reftest/webgl-hanging-fb-test.html
rename : content/canvas/test/reftest/webgl-hanging-scissor-test.html => dom/canvas/test/reftest/webgl-hanging-scissor-test.html
rename : content/canvas/test/reftest/webgl-orientation-test.html => dom/canvas/test/reftest/webgl-orientation-test.html
rename : content/canvas/test/reftest/webgl-resize-test.html => dom/canvas/test/reftest/webgl-resize-test.html
rename : content/canvas/test/reftest/webgl-utils.js => dom/canvas/test/reftest/webgl-utils.js
rename : content/canvas/test/reftest/white-top-left.png => dom/canvas/test/reftest/white-top-left.png
rename : content/canvas/test/reftest/white.png => dom/canvas/test/reftest/white.png
rename : content/canvas/test/reftest/wrapper.html => dom/canvas/test/reftest/wrapper.html
rename : content/canvas/test/test_2d.clearRect.image.offscreen.html => dom/canvas/test/test_2d.clearRect.image.offscreen.html
rename : content/canvas/test/test_2d.clip.winding.html => dom/canvas/test/test_2d.clip.winding.html
rename : content/canvas/test/test_2d.composite.canvas.color-burn.html => dom/canvas/test/test_2d.composite.canvas.color-burn.html
rename : content/canvas/test/test_2d.composite.canvas.color-dodge.html => dom/canvas/test/test_2d.composite.canvas.color-dodge.html
rename : content/canvas/test/test_2d.composite.canvas.color.html => dom/canvas/test/test_2d.composite.canvas.color.html
rename : content/canvas/test/test_2d.composite.canvas.darken.html => dom/canvas/test/test_2d.composite.canvas.darken.html
rename : content/canvas/test/test_2d.composite.canvas.destination-atop.html => dom/canvas/test/test_2d.composite.canvas.destination-atop.html
rename : content/canvas/test/test_2d.composite.canvas.destination-in.html => dom/canvas/test/test_2d.composite.canvas.destination-in.html
rename : content/canvas/test/test_2d.composite.canvas.difference.html => dom/canvas/test/test_2d.composite.canvas.difference.html
rename : content/canvas/test/test_2d.composite.canvas.exclusion.html => dom/canvas/test/test_2d.composite.canvas.exclusion.html
rename : content/canvas/test/test_2d.composite.canvas.hard-light.html => dom/canvas/test/test_2d.composite.canvas.hard-light.html
rename : content/canvas/test/test_2d.composite.canvas.hue.html => dom/canvas/test/test_2d.composite.canvas.hue.html
rename : content/canvas/test/test_2d.composite.canvas.lighten.html => dom/canvas/test/test_2d.composite.canvas.lighten.html
rename : content/canvas/test/test_2d.composite.canvas.lighter.html => dom/canvas/test/test_2d.composite.canvas.lighter.html
rename : content/canvas/test/test_2d.composite.canvas.luminosity.html => dom/canvas/test/test_2d.composite.canvas.luminosity.html
rename : content/canvas/test/test_2d.composite.canvas.multiply.html => dom/canvas/test/test_2d.composite.canvas.multiply.html
rename : content/canvas/test/test_2d.composite.canvas.overlay.html => dom/canvas/test/test_2d.composite.canvas.overlay.html
rename : content/canvas/test/test_2d.composite.canvas.saturation.html => dom/canvas/test/test_2d.composite.canvas.saturation.html
rename : content/canvas/test/test_2d.composite.canvas.screen.html => dom/canvas/test/test_2d.composite.canvas.screen.html
rename : content/canvas/test/test_2d.composite.canvas.soft-light.html => dom/canvas/test/test_2d.composite.canvas.soft-light.html
rename : content/canvas/test/test_2d.composite.canvas.source-in.html => dom/canvas/test/test_2d.composite.canvas.source-in.html
rename : content/canvas/test/test_2d.composite.canvas.source-out.html => dom/canvas/test/test_2d.composite.canvas.source-out.html
rename : content/canvas/test/test_2d.composite.canvas.xor.html => dom/canvas/test/test_2d.composite.canvas.xor.html
rename : content/canvas/test/test_2d.composite.clip.lighter.html => dom/canvas/test/test_2d.composite.clip.lighter.html
rename : content/canvas/test/test_2d.composite.clip.xor.html => dom/canvas/test/test_2d.composite.clip.xor.html
rename : content/canvas/test/test_2d.composite.image.destination-atop.html => dom/canvas/test/test_2d.composite.image.destination-atop.html
rename : content/canvas/test/test_2d.composite.image.destination-in.html => dom/canvas/test/test_2d.composite.image.destination-in.html
rename : content/canvas/test/test_2d.composite.image.lighter.html => dom/canvas/test/test_2d.composite.image.lighter.html
rename : content/canvas/test/test_2d.composite.image.source-in.html => dom/canvas/test/test_2d.composite.image.source-in.html
rename : content/canvas/test/test_2d.composite.image.source-out.html => dom/canvas/test/test_2d.composite.image.source-out.html
rename : content/canvas/test/test_2d.composite.image.xor.html => dom/canvas/test/test_2d.composite.image.xor.html
rename : content/canvas/test/test_2d.composite.solid.color-burn.html => dom/canvas/test/test_2d.composite.solid.color-burn.html
rename : content/canvas/test/test_2d.composite.solid.color-dodge.html => dom/canvas/test/test_2d.composite.solid.color-dodge.html
rename : content/canvas/test/test_2d.composite.solid.color.html => dom/canvas/test/test_2d.composite.solid.color.html
rename : content/canvas/test/test_2d.composite.solid.darken.html => dom/canvas/test/test_2d.composite.solid.darken.html
rename : content/canvas/test/test_2d.composite.solid.difference.html => dom/canvas/test/test_2d.composite.solid.difference.html
rename : content/canvas/test/test_2d.composite.solid.exclusion.html => dom/canvas/test/test_2d.composite.solid.exclusion.html
rename : content/canvas/test/test_2d.composite.solid.hard-light.html => dom/canvas/test/test_2d.composite.solid.hard-light.html
rename : content/canvas/test/test_2d.composite.solid.hue.html => dom/canvas/test/test_2d.composite.solid.hue.html
rename : content/canvas/test/test_2d.composite.solid.lighten.html => dom/canvas/test/test_2d.composite.solid.lighten.html
rename : content/canvas/test/test_2d.composite.solid.lighter.html => dom/canvas/test/test_2d.composite.solid.lighter.html
rename : content/canvas/test/test_2d.composite.solid.luminosity.html => dom/canvas/test/test_2d.composite.solid.luminosity.html
rename : content/canvas/test/test_2d.composite.solid.multiply.html => dom/canvas/test/test_2d.composite.solid.multiply.html
rename : content/canvas/test/test_2d.composite.solid.overlay.html => dom/canvas/test/test_2d.composite.solid.overlay.html
rename : content/canvas/test/test_2d.composite.solid.saturation.html => dom/canvas/test/test_2d.composite.solid.saturation.html
rename : content/canvas/test/test_2d.composite.solid.screen.html => dom/canvas/test/test_2d.composite.solid.screen.html
rename : content/canvas/test/test_2d.composite.solid.soft-light.html => dom/canvas/test/test_2d.composite.solid.soft-light.html
rename : content/canvas/test/test_2d.composite.solid.xor.html => dom/canvas/test/test_2d.composite.solid.xor.html
rename : content/canvas/test/test_2d.composite.transparent.lighter.html => dom/canvas/test/test_2d.composite.transparent.lighter.html
rename : content/canvas/test/test_2d.composite.transparent.xor.html => dom/canvas/test/test_2d.composite.transparent.xor.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html => dom/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html => dom/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.color.html => dom/canvas/test/test_2d.composite.uncovered.fill.color.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.darken.html => dom/canvas/test/test_2d.composite.uncovered.fill.darken.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html => dom/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html => dom/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.difference.html => dom/canvas/test/test_2d.composite.uncovered.fill.difference.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html => dom/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html => dom/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.hue.html => dom/canvas/test/test_2d.composite.uncovered.fill.hue.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.lighten.html => dom/canvas/test/test_2d.composite.uncovered.fill.lighten.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html => dom/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.multiply.html => dom/canvas/test/test_2d.composite.uncovered.fill.multiply.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.overlay.html => dom/canvas/test/test_2d.composite.uncovered.fill.overlay.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.saturation.html => dom/canvas/test/test_2d.composite.uncovered.fill.saturation.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.screen.html => dom/canvas/test/test_2d.composite.uncovered.fill.screen.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html => dom/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.source-in.html => dom/canvas/test/test_2d.composite.uncovered.fill.source-in.html
rename : content/canvas/test/test_2d.composite.uncovered.fill.source-out.html => dom/canvas/test/test_2d.composite.uncovered.fill.source-out.html
rename : content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html => dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
rename : content/canvas/test/test_2d.composite.uncovered.image.destination-in.html => dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html
rename : content/canvas/test/test_2d.composite.uncovered.image.source-in.html => dom/canvas/test/test_2d.composite.uncovered.image.source-in.html
rename : content/canvas/test/test_2d.composite.uncovered.image.source-out.html => dom/canvas/test/test_2d.composite.uncovered.image.source-out.html
rename : content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html => dom/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
rename : content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html => dom/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
rename : content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html => dom/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
rename : content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html => dom/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
rename : content/canvas/test/test_2d.drawImage.zerocanvas.html => dom/canvas/test/test_2d.drawImage.zerocanvas.html
rename : content/canvas/test/test_2d.fill.winding.html => dom/canvas/test/test_2d.fill.winding.html
rename : content/canvas/test/test_2d.fillText.gradient.html => dom/canvas/test/test_2d.fillText.gradient.html
rename : content/canvas/test/test_2d.gradient.radial.cone.behind.html => dom/canvas/test/test_2d.gradient.radial.cone.behind.html
rename : content/canvas/test/test_2d.gradient.radial.cone.beside.html => dom/canvas/test/test_2d.gradient.radial.cone.beside.html
rename : content/canvas/test/test_2d.gradient.radial.cone.front.html => dom/canvas/test/test_2d.gradient.radial.cone.front.html
rename : content/canvas/test/test_2d.gradient.radial.cone.shape2.html => dom/canvas/test/test_2d.gradient.radial.cone.shape2.html
rename : content/canvas/test/test_2d.gradient.radial.cone.top.html => dom/canvas/test/test_2d.gradient.radial.cone.top.html
rename : content/canvas/test/test_2d.gradient.radial.equal.html => dom/canvas/test/test_2d.gradient.radial.equal.html
rename : content/canvas/test/test_2d.gradient.radial.inside2.html => dom/canvas/test/test_2d.gradient.radial.inside2.html
rename : content/canvas/test/test_2d.gradient.radial.inside3.html => dom/canvas/test/test_2d.gradient.radial.inside3.html
rename : content/canvas/test/test_2d.gradient.radial.outside1.html => dom/canvas/test/test_2d.gradient.radial.outside1.html
rename : content/canvas/test/test_2d.gradient.radial.outside2.html => dom/canvas/test/test_2d.gradient.radial.outside2.html
rename : content/canvas/test/test_2d.gradient.radial.outside3.html => dom/canvas/test/test_2d.gradient.radial.outside3.html
rename : content/canvas/test/test_2d.gradient.radial.touch1.html => dom/canvas/test/test_2d.gradient.radial.touch1.html
rename : content/canvas/test/test_2d.gradient.radial.touch2.html => dom/canvas/test/test_2d.gradient.radial.touch2.html
rename : content/canvas/test/test_2d.gradient.radial.touch3.html => dom/canvas/test/test_2d.gradient.radial.touch3.html
rename : content/canvas/test/test_2d.isPointInPath.winding.html => dom/canvas/test/test_2d.isPointInPath.winding.html
rename : content/canvas/test/test_2d.line.cap.closed.html => dom/canvas/test/test_2d.line.cap.closed.html
rename : content/canvas/test/test_2d.line.join.parallel.html => dom/canvas/test/test_2d.line.join.parallel.html
rename : content/canvas/test/test_2d.path.arc.shape.3.html => dom/canvas/test/test_2d.path.arc.shape.3.html
rename : content/canvas/test/test_2d.path.rect.selfintersect.html => dom/canvas/test/test_2d.path.rect.selfintersect.html
rename : content/canvas/test/test_2d.path.rect.zero.6.html => dom/canvas/test/test_2d.path.rect.zero.6.html
rename : content/canvas/test/test_2d.strokeRect.zero.5.html => dom/canvas/test/test_2d.strokeRect.zero.5.html
rename : content/canvas/test/test_2d_composite_canvaspattern_setTransform.html => dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html
rename : content/canvas/test/test_ImageData_ctor.html => dom/canvas/test/test_ImageData_ctor.html
rename : content/canvas/test/test_bug613794.html => dom/canvas/test/test_bug613794.html
rename : content/canvas/test/test_bug753758.html => dom/canvas/test/test_bug753758.html
rename : content/canvas/test/test_bug764125.html => dom/canvas/test/test_bug764125.html
rename : content/canvas/test/test_bug856472.html => dom/canvas/test/test_bug856472.html
rename : content/canvas/test/test_bug866575.html => dom/canvas/test/test_bug866575.html
rename : content/canvas/test/test_bug902651.html => dom/canvas/test/test_bug902651.html
rename : content/canvas/test/test_canvas.html => dom/canvas/test/test_canvas.html
rename : content/canvas/test/test_canvas_focusring.html => dom/canvas/test/test_canvas_focusring.html
rename : content/canvas/test/test_canvas_font_setter.html => dom/canvas/test/test_canvas_font_setter.html
rename : content/canvas/test/test_canvas_path.html => dom/canvas/test/test_canvas_path.html
rename : content/canvas/test/test_canvas_strokeStyle_getter.html => dom/canvas/test/test_canvas_strokeStyle_getter.html
rename : content/canvas/test/test_createPattern_broken.html => dom/canvas/test/test_createPattern_broken.html
rename : content/canvas/test/test_drawImageIncomplete.html => dom/canvas/test/test_drawImageIncomplete.html
rename : content/canvas/test/test_drawImage_document_domain.html => dom/canvas/test/test_drawImage_document_domain.html
rename : content/canvas/test/test_drawImage_edge_cases.html => dom/canvas/test/test_drawImage_edge_cases.html
rename : content/canvas/test/test_drawWindow.html => dom/canvas/test/test_drawWindow.html
rename : content/canvas/test/test_hitregion_canvas.html => dom/canvas/test/test_hitregion_canvas.html
rename : content/canvas/test/test_hitregion_event.html => dom/canvas/test/test_hitregion_event.html
rename : content/canvas/test/test_isPointInStroke.html => dom/canvas/test/test_isPointInStroke.html
rename : content/canvas/test/test_mozDashOffset.html => dom/canvas/test/test_mozDashOffset.html
rename : content/canvas/test/test_mozGetAsFile.html => dom/canvas/test/test_mozGetAsFile.html
rename : content/canvas/test/test_setlinedash.html => dom/canvas/test/test_setlinedash.html
rename : content/canvas/test/test_strokeText_throw.html => dom/canvas/test/test_strokeText_throw.html
rename : content/canvas/test/test_toBlob.html => dom/canvas/test/test_toBlob.html
rename : content/canvas/test/test_toDataURL_alpha.html => dom/canvas/test/test_toDataURL_alpha.html
rename : content/canvas/test/test_toDataURL_lowercase_ascii.html => dom/canvas/test/test_toDataURL_lowercase_ascii.html
rename : content/canvas/test/test_toDataURL_parameters.html => dom/canvas/test/test_toDataURL_parameters.html
rename : content/canvas/test/test_windingRuleUndefined.html => dom/canvas/test/test_windingRuleUndefined.html
rename : content/canvas/test/webgl-conformance/00_test_list.txt => dom/canvas/test/webgl-conformance/00_test_list.txt
rename : content/canvas/test/webgl-conformance/README.mozilla => dom/canvas/test/webgl-conformance/README.mozilla
rename : content/canvas/test/webgl-conformance/README.txt => dom/canvas/test/webgl-conformance/README.txt
rename : content/canvas/test/webgl-conformance/conformance/00_readme.txt => dom/canvas/test/webgl-conformance/conformance/00_readme.txt
rename : content/canvas/test/webgl-conformance/conformance/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM => dom/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM
rename : content/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html => dom/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html
rename : content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html => dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html
rename : content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html => dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html
rename : content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html => dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html
rename : content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html => dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html => dom/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html => dom/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html => dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html => dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html => dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html => dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html
rename : content/canvas/test/webgl-conformance/conformance/buffers/index-validation.html => dom/canvas/test/webgl-conformance/conformance/buffers/index-validation.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html => dom/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html => dom/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html => dom/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html => dom/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html => dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html => dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html
rename : content/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html => dom/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html
rename : content/canvas/test/webgl-conformance/conformance/context/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/context/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/context/constants.html => dom/canvas/test/webgl-conformance/conformance/context/constants.html
rename : content/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html => dom/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html
rename : content/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html => dom/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html
rename : content/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html => dom/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html
rename : content/canvas/test/webgl-conformance/conformance/context/context-lost.html => dom/canvas/test/webgl-conformance/conformance/context/context-lost.html
rename : content/canvas/test/webgl-conformance/conformance/context/context-type-test.html => dom/canvas/test/webgl-conformance/conformance/context/context-type-test.html
rename : content/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html => dom/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html
rename : content/canvas/test/webgl-conformance/conformance/context/methods.html => dom/canvas/test/webgl-conformance/conformance/context/methods.html
rename : content/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html => dom/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html
rename : content/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html => dom/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html => dom/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html => dom/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html => dom/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html => dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html => dom/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html => dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html => dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html => dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html => dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html
rename : content/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html => dom/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html => dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html => dom/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs => dom/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html => dom/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html => dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html => dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html => dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html => dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html => dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html => dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html
rename : content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html => dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html
rename : content/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html => dom/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html
rename : content/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html => dom/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html
rename : content/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html => dom/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html
rename : content/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html => dom/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html
rename : content/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html => dom/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html
rename : content/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html => dom/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html
rename : content/canvas/test/webgl-conformance/conformance/misc/error-reporting.html => dom/canvas/test/webgl-conformance/conformance/misc/error-reporting.html
rename : content/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html => dom/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html
rename : content/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html => dom/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html
rename : content/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html => dom/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html
rename : content/canvas/test/webgl-conformance/conformance/misc/is-object.html => dom/canvas/test/webgl-conformance/conformance/misc/is-object.html
rename : content/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html => dom/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html
rename : content/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html => dom/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html
rename : content/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html => dom/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html
rename : content/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html => dom/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html
rename : content/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html => dom/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html
rename : content/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html => dom/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html
rename : content/canvas/test/webgl-conformance/conformance/more/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/more/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/more/README.md => dom/canvas/test/webgl-conformance/conformance/more/README.md
rename : content/canvas/test/webgl-conformance/conformance/more/all_tests.html => dom/canvas/test/webgl-conformance/conformance/more/all_tests.html
rename : content/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html => dom/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html
rename : content/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html => dom/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/constants.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/constants.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/methods.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/methods.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html => dom/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html
rename : content/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html => dom/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html
rename : content/canvas/test/webgl-conformance/conformance/more/demos/video.html => dom/canvas/test/webgl-conformance/conformance/more/demos/video.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html => dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html => dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html => dom/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html => dom/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html => dom/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/isTests.html => dom/canvas/test/webgl-conformance/conformance/more/functions/isTests.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html => dom/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html => dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html => dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html
rename : content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html => dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html
rename : content/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html => dom/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html
rename : content/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html => dom/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html
rename : content/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html => dom/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html
rename : content/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html => dom/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html
rename : content/canvas/test/webgl-conformance/conformance/more/index.html => dom/canvas/test/webgl-conformance/conformance/more/index.html
rename : content/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html => dom/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html
rename : content/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html => dom/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html
rename : content/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html => dom/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html
rename : content/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html => dom/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html
rename : content/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html => dom/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html
rename : content/canvas/test/webgl-conformance/conformance/more/unit.css => dom/canvas/test/webgl-conformance/conformance/more/unit.css
rename : content/canvas/test/webgl-conformance/conformance/more/unit.js => dom/canvas/test/webgl-conformance/conformance/more/unit.js
rename : content/canvas/test/webgl-conformance/conformance/more/util.js => dom/canvas/test/webgl-conformance/conformance/more/util.js
rename : content/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/programs/get-active-test.html => dom/canvas/test/webgl-conformance/conformance/programs/get-active-test.html
rename : content/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html => dom/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html
rename : content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html => dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html
rename : content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html => dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html
rename : content/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html => dom/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html
rename : content/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html => dom/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html
rename : content/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html => dom/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html
rename : content/canvas/test/webgl-conformance/conformance/programs/program-test.html => dom/canvas/test/webgl-conformance/conformance/programs/program-test.html
rename : content/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html => dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html
rename : content/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html => dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html
rename : content/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html => dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html
rename : content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html => dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html
rename : content/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html => dom/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html => dom/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html => dom/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html => dom/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html => dom/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html => dom/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html => dom/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html => dom/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/point-size.html => dom/canvas/test/webgl-conformance/conformance/rendering/point-size.html
rename : content/canvas/test/webgl-conformance/conformance/rendering/triangle.html => dom/canvas/test/webgl-conformance/conformance/rendering/triangle.html
rename : content/canvas/test/webgl-conformance/conformance/resources/3x3.png => dom/canvas/test/webgl-conformance/conformance/resources/3x3.png
rename : content/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg => dom/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg
rename : content/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png => dom/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png
rename : content/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag => dom/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag
rename : content/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js => dom/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js
rename : content/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css => dom/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css
rename : content/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js => dom/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png
rename : content/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png => dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png
rename : content/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png => dom/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png
rename : content/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag => dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag
rename : content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4 => dom/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4
rename : content/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv => dom/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv
rename : content/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm => dom/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm
rename : content/canvas/test/webgl-conformance/conformance/resources/pnglib.js => dom/canvas/test/webgl-conformance/conformance/resources/pnglib.js
rename : content/canvas/test/webgl-conformance/conformance/resources/red-green.mp4 => dom/canvas/test/webgl-conformance/conformance/resources/red-green.mp4
rename : content/canvas/test/webgl-conformance/conformance/resources/red-green.png => dom/canvas/test/webgl-conformance/conformance/resources/red-green.png
rename : content/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv => dom/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv
rename : content/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm => dom/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm
rename : content/canvas/test/webgl-conformance/conformance/resources/red-indexed.png => dom/canvas/test/webgl-conformance/conformance/resources/red-indexed.png
rename : content/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag => dom/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png => dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png
rename : content/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert => dom/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert
rename : content/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js => dom/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js
rename : content/canvas/test/webgl-conformance/conformance/resources/webgl-test.js => dom/canvas/test/webgl-conformance/conformance/resources/webgl-test.js
rename : content/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png => dom/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png
rename : content/canvas/test/webgl-conformance/conformance/state/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/state/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html => dom/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html
rename : content/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html => dom/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html
rename : content/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html => dom/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html
rename : content/canvas/test/webgl-conformance/conformance/state/gl-geterror.html => dom/canvas/test/webgl-conformance/conformance/state/gl-geterror.html
rename : content/canvas/test/webgl-conformance/conformance/state/gl-getstring.html => dom/canvas/test/webgl-conformance/conformance/state/gl-getstring.html
rename : content/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html => dom/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html
rename : content/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html => dom/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html
rename : content/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html => dom/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html
rename : content/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html => dom/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html
rename : content/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html => dom/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html
rename : content/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html => dom/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html
rename : content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html => dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html => dom/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-clear.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-clear.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-complete.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-complete.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-mips.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-mips.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-npot.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-npot.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-size.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-size.html
rename : content/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html => dom/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html
rename : content/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html => dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html
rename : content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html => dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html
rename : content/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html => dom/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt => dom/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt
rename : content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html => dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html => dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html => dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html => dom/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html => dom/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html => dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html
rename : content/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html => dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html
rename : content/canvas/test/webgl-conformance/dont-load-image-from-internet.patch => dom/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
rename : content/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch => dom/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
rename : content/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png => dom/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png
rename : content/canvas/test/webgl-conformance/extra/big-fbos-example.html => dom/canvas/test/webgl-conformance/extra/big-fbos-example.html
rename : content/canvas/test/webgl-conformance/extra/canvas-compositing-test.html => dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.html
rename : content/canvas/test/webgl-conformance/extra/canvas-compositing-test.png => dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.png
rename : content/canvas/test/webgl-conformance/extra/fbo-lost-context.html => dom/canvas/test/webgl-conformance/extra/fbo-lost-context.html
rename : content/canvas/test/webgl-conformance/extra/lots-of-polys-example.html => dom/canvas/test/webgl-conformance/extra/lots-of-polys-example.html
rename : content/canvas/test/webgl-conformance/extra/offscreen-issue.html => dom/canvas/test/webgl-conformance/extra/offscreen-issue.html
rename : content/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html => dom/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html
rename : content/canvas/test/webgl-conformance/extra/out-of-memory.html => dom/canvas/test/webgl-conformance/extra/out-of-memory.html
rename : content/canvas/test/webgl-conformance/extra/out-of-resources.html => dom/canvas/test/webgl-conformance/extra/out-of-resources.html
rename : content/canvas/test/webgl-conformance/extra/out-of-vram.html => dom/canvas/test/webgl-conformance/extra/out-of-vram.html
rename : content/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html => dom/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html
rename : content/canvas/test/webgl-conformance/extra/slow-shader-example.html => dom/canvas/test/webgl-conformance/extra/slow-shader-example.html
rename : content/canvas/test/webgl-conformance/extra/webgl-info.html => dom/canvas/test/webgl-conformance/extra/webgl-info.html
rename : content/canvas/test/webgl-conformance/failing_tests_android.txt => dom/canvas/test/webgl-conformance/failing_tests_android.txt
rename : content/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt => dom/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt
rename : content/canvas/test/webgl-conformance/failing_tests_android_x86.txt => dom/canvas/test/webgl-conformance/failing_tests_android_x86.txt
rename : content/canvas/test/webgl-conformance/failing_tests_linux.txt => dom/canvas/test/webgl-conformance/failing_tests_linux.txt
rename : content/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt => dom/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
rename : content/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt => dom/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt
rename : content/canvas/test/webgl-conformance/failing_tests_mac.txt => dom/canvas/test/webgl-conformance/failing_tests_mac.txt
rename : content/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt => dom/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt
rename : content/canvas/test/webgl-conformance/failing_tests_windows.txt => dom/canvas/test/webgl-conformance/failing_tests_windows.txt
rename : content/canvas/test/webgl-conformance/fix-webgl-harness-async.patch => dom/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
rename : content/canvas/test/webgl-conformance/gc.patch => dom/canvas/test/webgl-conformance/gc.patch
rename : content/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch => dom/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
rename : content/canvas/test/webgl-conformance/misc/program-test-1.html => dom/canvas/test/webgl-conformance/misc/program-test-1.html
rename : content/canvas/test/webgl-conformance/mochitest-conformance-files.ini => dom/canvas/test/webgl-conformance/mochitest-conformance-files.ini
rename : content/canvas/test/webgl-conformance/mochitest.ini => dom/canvas/test/webgl-conformance/mochitest.ini
rename : content/canvas/test/webgl-conformance/moz.build => dom/canvas/test/webgl-conformance/moz.build
rename : content/canvas/test/webgl-conformance/reference-cycle-test.patch => dom/canvas/test/webgl-conformance/reference-cycle-test.patch
rename : content/canvas/test/webgl-conformance/resources/cors-util.js => dom/canvas/test/webgl-conformance/resources/cors-util.js
rename : content/canvas/test/webgl-conformance/resources/desktop-gl-constants.js => dom/canvas/test/webgl-conformance/resources/desktop-gl-constants.js
rename : content/canvas/test/webgl-conformance/resources/js-test-pre.js => dom/canvas/test/webgl-conformance/resources/js-test-pre.js
rename : content/canvas/test/webgl-conformance/resources/js-test-style.css => dom/canvas/test/webgl-conformance/resources/js-test-style.css
rename : content/canvas/test/webgl-conformance/resources/opengl_logo.jpg => dom/canvas/test/webgl-conformance/resources/opengl_logo.jpg
rename : content/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png => dom/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png
rename : content/canvas/test/webgl-conformance/resources/webgl-logo.png => dom/canvas/test/webgl-conformance/resources/webgl-logo.png
rename : content/canvas/test/webgl-conformance/resources/webgl-test-harness.js => dom/canvas/test/webgl-conformance/resources/webgl-test-harness.js
rename : content/canvas/test/webgl-conformance/skipped_tests_android.txt => dom/canvas/test/webgl-conformance/skipped_tests_android.txt
rename : content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt => dom/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
rename : content/canvas/test/webgl-conformance/skipped_tests_linux.txt => dom/canvas/test/webgl-conformance/skipped_tests_linux.txt
rename : content/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt => dom/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt
rename : content/canvas/test/webgl-conformance/skipped_tests_win_vista.txt => dom/canvas/test/webgl-conformance/skipped_tests_win_vista.txt
rename : content/canvas/test/webgl-conformance/skipped_tests_winxp.txt => dom/canvas/test/webgl-conformance/skipped_tests_winxp.txt
rename : content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html => dom/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
rename : content/canvas/test/webgl-conformance/webgl-conformance-tests.html => dom/canvas/test/webgl-conformance/webgl-conformance-tests.html
rename : content/canvas/test/webgl-conformance/writemanifest.py => dom/canvas/test/webgl-conformance/writemanifest.py
rename : content/canvas/test/webgl-mochitest/driver-info.js => dom/canvas/test/webgl-mochitest/driver-info.js
rename : content/canvas/test/webgl-mochitest/mochi-to-testcase.py => dom/canvas/test/webgl-mochitest/mochi-to-testcase.py
rename : content/canvas/test/webgl-mochitest/mochitest.ini => dom/canvas/test/webgl-mochitest/mochitest.ini
rename : content/canvas/test/webgl-mochitest/moz.build => dom/canvas/test/webgl-mochitest/moz.build
rename : content/canvas/test/webgl-mochitest/test_depth_readpixels.html => dom/canvas/test/webgl-mochitest/test_depth_readpixels.html
rename : content/canvas/test/webgl-mochitest/test_draw.html => dom/canvas/test/webgl-mochitest/test_draw.html
rename : content/canvas/test/webgl-mochitest/test_fb_param.html => dom/canvas/test/webgl-mochitest/test_fb_param.html
rename : content/canvas/test/webgl-mochitest/test_fb_param_crash.html => dom/canvas/test/webgl-mochitest/test_fb_param_crash.html
rename : content/canvas/test/webgl-mochitest/test_highp_fs.html => dom/canvas/test/webgl-mochitest/test_highp_fs.html
rename : content/canvas/test/webgl-mochitest/test_no_arr_points.html => dom/canvas/test/webgl-mochitest/test_no_arr_points.html
rename : content/canvas/test/webgl-mochitest/test_noprog_draw.html => dom/canvas/test/webgl-mochitest/test_noprog_draw.html
rename : content/canvas/test/webgl-mochitest/test_privileged_exts.html => dom/canvas/test/webgl-mochitest/test_privileged_exts.html
rename : content/canvas/test/webgl-mochitest/test_texsubimage_float.html => dom/canvas/test/webgl-mochitest/test_texsubimage_float.html
rename : content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html => dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
rename : content/canvas/test/webgl-mochitest/test_webgl_available.html => dom/canvas/test/webgl-mochitest/test_webgl_available.html
rename : content/canvas/test/webgl-mochitest/test_webgl_conformance.html => dom/canvas/test/webgl-mochitest/test_webgl_conformance.html
rename : content/canvas/test/webgl-mochitest/test_webgl_request_context.html => dom/canvas/test/webgl-mochitest/test_webgl_request_context.html
rename : content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html => dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
rename : content/canvas/test/webgl-mochitest/webgl-util.js => dom/canvas/test/webgl-mochitest/webgl-util.js
---
 content/canvas/moz.build                      |  10 ---
 content/canvas/public/moz.build               |  15 -----
 content/canvas/test/android.json              |   6 --
 .../canvas/test/image_green-redirect^headers^ |   2 -
 .../html/content/src/HTMLCanvasElement.cpp    |   2 +-
 content/html/content/src/moz.build            |   2 +-
 content/moz.build                             |   1 -
 content/test/reftest/reftest.list             |   5 --
 dom/bindings/moz.build                        |   2 +-
 .../src => dom/canvas}/CanvasGradient.h       |   0
 .../src => dom/canvas}/CanvasImageCache.cpp   |   0
 .../src => dom/canvas}/CanvasImageCache.h     |   0
 .../canvas/src => dom/canvas}/CanvasPattern.h |   0
 .../canvas}/CanvasRenderingContext2D.cpp      |   0
 .../canvas}/CanvasRenderingContext2D.h        |   0
 .../canvas/src => dom/canvas}/CanvasUtils.cpp |   0
 .../canvas/src => dom/canvas}/CanvasUtils.h   |   0
 .../canvas}/DocumentRendererChild.cpp         |   0
 .../canvas}/DocumentRendererChild.h           |   0
 .../canvas}/DocumentRendererParent.cpp        |   0
 .../canvas}/DocumentRendererParent.h          |   0
 .../canvas/src => dom/canvas}/ImageData.cpp   |   0
 .../canvas/src => dom/canvas}/ImageData.h     |   0
 .../src => dom/canvas}/ImageEncoder.cpp       |   0
 .../canvas/src => dom/canvas}/ImageEncoder.h  |   0
 .../canvas/src => dom/canvas}/Makefile.in     |   0
 .../canvas/src => dom/canvas}/MurmurHash3.cpp |   0
 .../canvas/src => dom/canvas}/MurmurHash3.h   |   0
 .../canvas/src => dom/canvas}/TextMetrics.h   |   0
 .../src => dom/canvas}/WebGL1Context.cpp      |   0
 .../canvas/src => dom/canvas}/WebGL1Context.h |   0
 .../src => dom/canvas}/WebGL2Context.cpp      |   0
 .../canvas/src => dom/canvas}/WebGL2Context.h |   0
 .../src => dom/canvas}/WebGLActiveInfo.cpp    |   0
 .../src => dom/canvas}/WebGLActiveInfo.h      |   0
 .../canvas/src => dom/canvas}/WebGLBuffer.cpp |   0
 .../canvas/src => dom/canvas}/WebGLBuffer.h   |   0
 .../src => dom/canvas}/WebGLContext.cpp       |   0
 .../canvas/src => dom/canvas}/WebGLContext.h  |   0
 .../canvas}/WebGLContextAsyncQueries.cpp      |   0
 .../canvas}/WebGLContextBuffers.cpp           |   0
 .../src => dom/canvas}/WebGLContextDraw.cpp   |   0
 .../canvas}/WebGLContextExtensions.cpp        |   0
 .../WebGLContextFramebufferOperations.cpp     |   0
 .../src => dom/canvas}/WebGLContextGL.cpp     |   0
 .../canvas}/WebGLContextLossTimer.cpp         |   0
 .../canvas}/WebGLContextNotSupported.cpp      |   0
 .../canvas}/WebGLContextReporter.cpp          |   0
 .../src => dom/canvas}/WebGLContextState.cpp  |   0
 .../src => dom/canvas}/WebGLContextUtils.cpp  |   0
 .../src => dom/canvas}/WebGLContextUtils.h    |   0
 .../canvas}/WebGLContextValidate.cpp          |   0
 .../canvas}/WebGLContextVertexArray.cpp       |   0
 .../canvas}/WebGLContextVertices.cpp          |   0
 .../canvas}/WebGLElementArrayCache.cpp        |   0
 .../canvas}/WebGLElementArrayCache.h          |   0
 .../src => dom/canvas}/WebGLExtensionBase.cpp |   0
 .../canvas}/WebGLExtensionBlendMinMax.cpp     |   0
 .../WebGLExtensionColorBufferFloat.cpp        |   0
 .../WebGLExtensionColorBufferHalfFloat.cpp    |   0
 .../WebGLExtensionCompressedTextureATC.cpp    |   0
 .../WebGLExtensionCompressedTextureETC1.cpp   |   0
 .../WebGLExtensionCompressedTexturePVRTC.cpp  |   0
 .../WebGLExtensionCompressedTextureS3TC.cpp   |   0
 .../WebGLExtensionDebugRendererInfo.cpp       |   0
 .../canvas}/WebGLExtensionDebugShaders.cpp    |   0
 .../canvas}/WebGLExtensionDepthTexture.cpp    |   0
 .../canvas}/WebGLExtensionDrawBuffers.cpp     |   0
 .../WebGLExtensionElementIndexUint.cpp        |   0
 .../canvas}/WebGLExtensionFragDepth.cpp       |   0
 .../canvas}/WebGLExtensionInstancedArrays.cpp |   0
 .../canvas}/WebGLExtensionLoseContext.cpp     |   0
 .../src => dom/canvas}/WebGLExtensionSRGB.cpp |   0
 .../WebGLExtensionStandardDerivatives.cpp     |   0
 ...WebGLExtensionTextureFilterAnisotropic.cpp |   0
 .../canvas}/WebGLExtensionTextureFloat.cpp    |   0
 .../WebGLExtensionTextureFloatLinear.cpp      |   0
 .../WebGLExtensionTextureHalfFloat.cpp        |   0
 .../WebGLExtensionTextureHalfFloatLinear.cpp  |   0
 .../canvas}/WebGLExtensionVertexArray.cpp     |   0
 .../src => dom/canvas}/WebGLExtensions.h      |   0
 .../src => dom/canvas}/WebGLFramebuffer.cpp   |   0
 .../src => dom/canvas}/WebGLFramebuffer.h     |   0
 .../canvas}/WebGLFramebufferAttachable.cpp    |   0
 .../canvas}/WebGLFramebufferAttachable.h      |   0
 .../src => dom/canvas}/WebGLMemoryTracker.h   |   0
 .../src => dom/canvas}/WebGLObjectModel.cpp   |   0
 .../src => dom/canvas}/WebGLObjectModel.h     |   0
 .../src => dom/canvas}/WebGLProgram.cpp       |   0
 .../canvas/src => dom/canvas}/WebGLProgram.h  |   0
 .../canvas/src => dom/canvas}/WebGLQuery.cpp  |   0
 .../canvas/src => dom/canvas}/WebGLQuery.h    |   0
 .../src => dom/canvas}/WebGLRenderbuffer.cpp  |   0
 .../src => dom/canvas}/WebGLRenderbuffer.h    |   0
 .../canvas/src => dom/canvas}/WebGLShader.cpp |   0
 .../canvas/src => dom/canvas}/WebGLShader.h   |   0
 .../canvas}/WebGLShaderPrecisionFormat.cpp    |   0
 .../canvas}/WebGLShaderPrecisionFormat.h      |   0
 .../canvas}/WebGLTexelConversions.cpp         |   0
 .../canvas}/WebGLTexelConversions.h           |   0
 .../src => dom/canvas}/WebGLTexture.cpp       |   0
 .../canvas/src => dom/canvas}/WebGLTexture.h  |   0
 .../canvas/src => dom/canvas}/WebGLTypes.h    |   0
 .../src => dom/canvas}/WebGLUniformInfo.h     |   0
 .../canvas}/WebGLUniformLocation.cpp          |   0
 .../src => dom/canvas}/WebGLUniformLocation.h |   0
 .../src => dom/canvas}/WebGLValidateStrings.h |   0
 .../src => dom/canvas}/WebGLVertexArray.cpp   |   0
 .../src => dom/canvas}/WebGLVertexArray.h     |   0
 .../canvas}/WebGLVertexArrayFake.cpp          |   0
 .../src => dom/canvas}/WebGLVertexArrayFake.h |   0
 .../src => dom/canvas}/WebGLVertexArrayGL.cpp |   0
 .../src => dom/canvas}/WebGLVertexArrayGL.h   |   0
 .../canvas}/WebGLVertexAttribData.h           |   0
 .../TestWebGLElementArrayCache.cpp            |   0
 .../canvas/compiledtest/moz.build             |   2 +-
 .../crashtests/0px-size-font-667225.html      |   0
 .../crashtests/0px-size-font-shadow.html      |   0
 .../canvas/crashtests/360293-1.html           |   0
 .../canvas/crashtests/421715-1.html           |   0
 .../canvas/crashtests/553938-1.html           |   0
 .../canvas/crashtests/647480.html             |   0
 .../canvas/crashtests/727547.html             |   0
 .../canvas/crashtests/729116.html             |   0
 .../crashtests/743499-negative-size.html      |   0
 .../canvas/crashtests/745699-1.html           |   0
 .../crashtests/745818-large-source.html       |   0
 .../canvas/crashtests/746813-1.html           |   0
 .../canvas/crashtests/767337-1.html           |   0
 .../canvas/crashtests/780392-1.html           |   0
 .../canvas/crashtests/789933-1.html           |   0
 .../canvas/crashtests/794463-1.html           |   0
 .../canvas/crashtests/802926-1.html           |   0
 .../canvas/crashtests/896047-1.html           |   0
 .../canvas/crashtests/896047-2.html           |   0
 .../canvas/crashtests/916128-1.html           |   0
 .../canvas/crashtests/934939-1.html           |   0
 .../canvas/crashtests/crashtests.list         |   0
 .../canvas/crashtests/texImage2D.html         |   0
 {content/canvas/src => dom/canvas}/moz.build  |  12 ++++
 .../nsICanvasRenderingContextInternal.h       |   0
 dom/canvas/test/android.json                  |   6 ++
 .../canvas/test/chrome/chrome.ini             |   0
 .../nonchrome_webgl_debug_renderer_info.html  |   0
 .../chrome/test_drawWindow_widget_layers.html |   0
 .../test_webgl_debug_renderer_info.html       |   2 +-
 .../crossorigin/image-allow-credentials.png   | Bin
 .../image-allow-credentials.png^headers^      |   0
 .../test/crossorigin/image-allow-star.png     | Bin
 .../crossorigin/image-allow-star.png^headers^ |   0
 .../canvas/test/crossorigin/image.png         | Bin
 .../canvas/test/crossorigin/mochitest.ini     |   0
 .../test_canvas2d_crossorigin.html            |   2 +-
 .../crossorigin/test_video_crossorigin.html   |   2 +-
 .../test_webgl_crossorigin_textures.html      |  40 ++++++------
 .../canvas/test/crossorigin/video.sjs         |   0
 .../test/file_drawImage_document_domain.html  |   0
 .../canvas/test/file_drawWindow_common.js     |   0
 .../canvas/test/file_drawWindow_source.html   |   0
 .../canvas/test/image_anim-gr.gif             | Bin
 .../canvas/test/image_anim-gr.png             | Bin
 .../canvas/test/image_anim-poster-gr.png      | Bin
 {content => dom}/canvas/test/image_broken.png | Bin
 .../canvas/test/image_ggrr-256x256.png        | Bin
 .../canvas/test/image_green-16x16.png         | Bin
 .../canvas/test/image_green-1x1.png           | Bin
 .../canvas/test/image_green-redirect          |   0
 dom/canvas/test/image_green-redirect^headers^ |   2 +
 {content => dom}/canvas/test/image_green.png  | Bin
 .../canvas/test/image_red-16x16.png           | Bin
 {content => dom}/canvas/test/image_red.png    | Bin
 .../canvas/test/image_redtransparent.png      | Bin
 .../canvas/test/image_rgrg-256x256.png        | Bin
 .../canvas/test/image_rrgg-256x256.png        | Bin
 .../canvas/test/image_transparent.png         | Bin
 .../canvas/test/image_transparent50.png       | Bin
 {content => dom}/canvas/test/image_yellow.png | Bin
 .../canvas/test/image_yellow75.png            | Bin
 {content => dom}/canvas/test/mochitest.ini    |   0
 {content => dom}/canvas/test/moz.build        |   0
 .../canvas/test/reftest/black.html            |   0
 .../reftest/clip-multiple-paths-badref.html   |   0
 .../test/reftest/clip-multiple-paths.html     |   0
 .../canvas/test/reftest/colors-half-alpha.png | Bin
 .../canvas/test/reftest/colors.png            | Bin
 .../test/reftest/drawCustomFocusRing-ref.html |   0
 .../test/reftest/drawCustomFocusRing.html     |   0
 .../test/reftest/drawFocusIfNeeded-ref.html   |   0
 .../test/reftest/drawFocusIfNeeded.html       |   0
 .../canvas/test/reftest/green.png             | Bin
 .../test/reftest/half-colors-half-alpha.png   | Bin
 .../canvas/test/reftest/half-colors.png       | Bin
 .../canvas/test/reftest/reftest.list          |   0
 .../test/reftest/stroketext-shadow-ref.html   |   0
 .../test/reftest/stroketext-shadow.html       |   0
 .../canvas/test/reftest/webgl-clear-test.html |   0
 .../test/reftest/webgl-color-alpha-test.html  |   0
 .../canvas/test/reftest/webgl-color-test.html |   0
 .../test/reftest/webgl-disable-test.html      |   0
 .../test/reftest/webgl-hanging-fb-test.html   |   0
 .../reftest/webgl-hanging-scissor-test.html   |   0
 .../test/reftest/webgl-orientation-test.html  |   0
 .../test/reftest/webgl-resize-test.html       |   0
 .../canvas/test/reftest/webgl-utils.js        |   0
 .../canvas/test/reftest/white-top-left.png    | Bin
 .../canvas/test/reftest/white.png             | Bin
 .../canvas/test/reftest/wrapper.html          |   0
 .../test_2d.clearRect.image.offscreen.html    |   0
 .../canvas/test/test_2d.clip.winding.html     |   0
 .../test_2d.composite.canvas.color-burn.html  |   0
 .../test_2d.composite.canvas.color-dodge.html |   0
 .../test/test_2d.composite.canvas.color.html  |   0
 .../test/test_2d.composite.canvas.darken.html |   0
 ..._2d.composite.canvas.destination-atop.html |   0
 ...st_2d.composite.canvas.destination-in.html |   0
 .../test_2d.composite.canvas.difference.html  |   0
 .../test_2d.composite.canvas.exclusion.html   |   0
 .../test_2d.composite.canvas.hard-light.html  |   0
 .../test/test_2d.composite.canvas.hue.html    |   0
 .../test_2d.composite.canvas.lighten.html     |   0
 .../test_2d.composite.canvas.lighter.html     |   0
 .../test_2d.composite.canvas.luminosity.html  |   0
 .../test_2d.composite.canvas.multiply.html    |   0
 .../test_2d.composite.canvas.overlay.html     |   0
 .../test_2d.composite.canvas.saturation.html  |   0
 .../test/test_2d.composite.canvas.screen.html |   0
 .../test_2d.composite.canvas.soft-light.html  |   0
 .../test_2d.composite.canvas.source-in.html   |   0
 .../test_2d.composite.canvas.source-out.html  |   0
 .../test/test_2d.composite.canvas.xor.html    |   0
 .../test/test_2d.composite.clip.lighter.html  |   0
 .../test/test_2d.composite.clip.xor.html      |   0
 ...t_2d.composite.image.destination-atop.html |   0
 ...est_2d.composite.image.destination-in.html |   0
 .../test/test_2d.composite.image.lighter.html |   0
 .../test_2d.composite.image.source-in.html    |   0
 .../test_2d.composite.image.source-out.html   |   0
 .../test/test_2d.composite.image.xor.html     |   0
 .../test_2d.composite.solid.color-burn.html   |   0
 .../test_2d.composite.solid.color-dodge.html  |   0
 .../test/test_2d.composite.solid.color.html   |   0
 .../test/test_2d.composite.solid.darken.html  |   0
 .../test_2d.composite.solid.difference.html   |   0
 .../test_2d.composite.solid.exclusion.html    |   0
 .../test_2d.composite.solid.hard-light.html   |   0
 .../test/test_2d.composite.solid.hue.html     |   0
 .../test/test_2d.composite.solid.lighten.html |   0
 .../test/test_2d.composite.solid.lighter.html |   0
 .../test_2d.composite.solid.luminosity.html   |   0
 .../test_2d.composite.solid.multiply.html     |   0
 .../test/test_2d.composite.solid.overlay.html |   0
 .../test_2d.composite.solid.saturation.html   |   0
 .../test/test_2d.composite.solid.screen.html  |   0
 .../test_2d.composite.solid.soft-light.html   |   0
 .../test/test_2d.composite.solid.xor.html     |   0
 ...test_2d.composite.transparent.lighter.html |   0
 .../test_2d.composite.transparent.xor.html    |   0
 ...d.composite.uncovered.fill.color-burn.html |   0
 ....composite.uncovered.fill.color-dodge.html |   0
 ...est_2d.composite.uncovered.fill.color.html |   0
 ...st_2d.composite.uncovered.fill.darken.html |   0
 ...osite.uncovered.fill.destination-atop.html |   0
 ...mposite.uncovered.fill.destination-in.html |   0
 ...d.composite.uncovered.fill.difference.html |   0
 ...2d.composite.uncovered.fill.exclusion.html |   0
 ...d.composite.uncovered.fill.hard-light.html |   0
 .../test_2d.composite.uncovered.fill.hue.html |   0
 ...t_2d.composite.uncovered.fill.lighten.html |   0
 ...d.composite.uncovered.fill.luminosity.html |   0
 ..._2d.composite.uncovered.fill.multiply.html |   0
 ...t_2d.composite.uncovered.fill.overlay.html |   0
 ...d.composite.uncovered.fill.saturation.html |   0
 ...st_2d.composite.uncovered.fill.screen.html |   0
 ...d.composite.uncovered.fill.soft-light.html |   0
 ...2d.composite.uncovered.fill.source-in.html |   0
 ...d.composite.uncovered.fill.source-out.html |   0
 ...site.uncovered.image.destination-atop.html |   0
 ...posite.uncovered.image.destination-in.html |   0
 ...d.composite.uncovered.image.source-in.html |   0
 ....composite.uncovered.image.source-out.html |   0
 ...te.uncovered.pattern.destination-atop.html |   0
 ...site.uncovered.pattern.destination-in.html |   0
 ...composite.uncovered.pattern.source-in.html |   0
 ...omposite.uncovered.pattern.source-out.html |   0
 .../test/test_2d.drawImage.zerocanvas.html    |   0
 .../canvas/test/test_2d.fill.winding.html     |   0
 .../test/test_2d.fillText.gradient.html       |   0
 .../test_2d.gradient.radial.cone.behind.html  |   0
 .../test_2d.gradient.radial.cone.beside.html  |   0
 .../test_2d.gradient.radial.cone.front.html   |   0
 .../test_2d.gradient.radial.cone.shape2.html  |   0
 .../test_2d.gradient.radial.cone.top.html     |   0
 .../test/test_2d.gradient.radial.equal.html   |   0
 .../test/test_2d.gradient.radial.inside2.html |   0
 .../test/test_2d.gradient.radial.inside3.html |   0
 .../test_2d.gradient.radial.outside1.html     |   0
 .../test_2d.gradient.radial.outside2.html     |   0
 .../test_2d.gradient.radial.outside3.html     |   0
 .../test/test_2d.gradient.radial.touch1.html  |   0
 .../test/test_2d.gradient.radial.touch2.html  |   0
 .../test/test_2d.gradient.radial.touch3.html  |   0
 .../test/test_2d.isPointInPath.winding.html   |   0
 .../canvas/test/test_2d.line.cap.closed.html  |   0
 .../test/test_2d.line.join.parallel.html      |   0
 .../canvas/test/test_2d.path.arc.shape.3.html |   0
 .../test/test_2d.path.rect.selfintersect.html |   0
 .../canvas/test/test_2d.path.rect.zero.6.html |   0
 .../test/test_2d.strokeRect.zero.5.html       |   0
 ..._composite_canvaspattern_setTransform.html |   0
 .../canvas/test/test_ImageData_ctor.html      |   0
 .../canvas/test/test_bug613794.html           |   0
 .../canvas/test/test_bug753758.html           |   0
 .../canvas/test/test_bug764125.html           |   0
 .../canvas/test/test_bug856472.html           |   0
 .../canvas/test/test_bug866575.html           |   0
 .../canvas/test/test_bug902651.html           |   0
 {content => dom}/canvas/test/test_canvas.html |   4 +-
 .../canvas/test/test_canvas_focusring.html    |   0
 .../canvas/test/test_canvas_font_setter.html  |   0
 .../canvas/test/test_canvas_path.html         |   0
 .../test/test_canvas_strokeStyle_getter.html  |   0
 .../test/test_createPattern_broken.html       |   0
 .../canvas/test/test_drawImageIncomplete.html |   0
 .../test/test_drawImage_document_domain.html  |   0
 .../test/test_drawImage_edge_cases.html       |   0
 .../canvas/test/test_drawWindow.html          |   0
 .../canvas/test/test_hitregion_canvas.html    |   0
 .../canvas/test/test_hitregion_event.html     |   0
 .../canvas/test/test_isPointInStroke.html     |   0
 .../canvas/test/test_mozDashOffset.html       |   0
 .../canvas/test/test_mozGetAsFile.html        |   0
 .../canvas/test/test_setlinedash.html         |   0
 .../canvas/test/test_strokeText_throw.html    |   0
 {content => dom}/canvas/test/test_toBlob.html |   0
 .../canvas/test/test_toDataURL_alpha.html     |   0
 .../test/test_toDataURL_lowercase_ascii.html  |   0
 .../test/test_toDataURL_parameters.html       |   0
 .../test/test_windingRuleUndefined.html       |   0
 .../test/webgl-conformance/00_test_list.txt   |   0
 .../test/webgl-conformance/README.mozilla     |   0
 .../canvas/test/webgl-conformance/README.txt  |   0
 .../conformance/00_readme.txt                 |   0
 .../conformance/00_test_list.txt              |   0
 .../conformance/LICENSE_CHROMIUM              |   0
 .../conformance/attribs/00_test_list.txt      |   0
 .../attribs/gl-enable-vertex-attrib.html      |   0
 .../attribs/gl-vertex-attrib-zero-issues.html |   0
 .../conformance/attribs/gl-vertex-attrib.html |   0
 .../gl-vertexattribpointer-offsets.html       |   0
 .../attribs/gl-vertexattribpointer.html       |   0
 .../conformance/buffers/00_test_list.txt      |   0
 .../conformance/buffers/buffer-bind-test.html |   0
 .../buffers/buffer-data-array-buffer.html     |   0
 .../index-validation-copies-indices.html      |   0
 ...validation-crash-with-buffer-sub-data.html |   0
 ...-validation-verifies-too-many-indices.html |   0
 .../index-validation-with-resized-buffer.html |   0
 .../conformance/buffers/index-validation.html |   0
 .../conformance/canvas/00_test_list.txt       |   0
 .../canvas/buffer-offscreen-test.html         |   0
 .../canvas/buffer-preserve-test.html          |   0
 .../conformance/canvas/canvas-test.html       |   0
 .../conformance/canvas/canvas-zero-size.html  |   0
 .../drawingbuffer-static-canvas-test.html     |   0
 .../canvas/drawingbuffer-test.html            |   0
 .../viewport-unchanged-upon-resize.html       |   0
 .../conformance/context/00_test_list.txt      |   0
 .../conformance/context/constants.html        |   0
 ...ext-attribute-preserve-drawing-buffer.html |   0
 ...ributes-alpha-depth-stencil-antialias.html |   0
 .../context/context-lost-restored.html        |   0
 .../conformance/context/context-lost.html     |   0
 .../context/context-type-test.html            |   0
 .../incorrect-context-object-behaviour.html   |   0
 .../conformance/context/methods.html          |   0
 .../context/premultiplyalpha-test.html        |   0
 .../context/resource-sharing-test.html        |   0
 .../conformance/extensions/00_test_list.txt   |   0
 .../conformance/extensions/ext-sRGB.html      |   0
 .../ext-texture-filter-anisotropic.html       |   0
 .../extensions/oes-standard-derivatives.html  |   0
 .../extensions/oes-texture-float.html         |   0
 .../extensions/oes-vertex-array-object.html   |   0
 .../webgl-compressed-texture-etc1.html        |   0
 .../webgl-compressed-texture-s3tc.html        |   0
 .../extensions/webgl-debug-renderer-info.html |   0
 .../extensions/webgl-debug-shaders.html       |   0
 .../extensions/webgl-depth-texture.html       |   0
 .../conformance/glsl/00_test_list.txt         |   0
 .../glsl/functions/00_test_list.txt           |   0
 .../glsl/functions/glsl-function-abs.html     |   0
 .../glsl/functions/glsl-function-acos.html    |   0
 .../glsl/functions/glsl-function-asin.html    |   0
 .../glsl/functions/glsl-function-atan-xy.html |   0
 .../glsl/functions/glsl-function-atan.html    |   0
 .../glsl/functions/glsl-function-ceil.html    |   0
 .../functions/glsl-function-clamp-float.html  |   0
 .../glsl-function-clamp-gentype.html          |   0
 .../glsl/functions/glsl-function-cos.html     |   0
 .../glsl/functions/glsl-function-cross.html   |   0
 .../functions/glsl-function-distance.html     |   0
 .../glsl/functions/glsl-function-dot.html     |   0
 .../functions/glsl-function-faceforward.html  |   0
 .../glsl/functions/glsl-function-floor.html   |   0
 .../glsl/functions/glsl-function-fract.html   |   0
 .../glsl/functions/glsl-function-length.html  |   0
 .../functions/glsl-function-lessThan.html     |   0
 .../functions/glsl-function-max-float.html    |   0
 .../functions/glsl-function-max-gentype.html  |   0
 .../functions/glsl-function-min-float.html    |   0
 .../functions/glsl-function-min-gentype.html  |   0
 .../functions/glsl-function-mix-float.html    |   0
 .../functions/glsl-function-mix-gentype.html  |   0
 .../functions/glsl-function-mod-float.html    |   0
 .../functions/glsl-function-mod-gentype.html  |   0
 .../functions/glsl-function-normalize.html    |   0
 .../glsl/functions/glsl-function-reflect.html |   0
 .../glsl/functions/glsl-function-refract.html |   0
 .../glsl/functions/glsl-function-sign.html    |   0
 .../glsl/functions/glsl-function-sin.html     |   0
 .../glsl-function-smoothstep-float.html       |   0
 .../glsl-function-smoothstep-gentype.html     |   0
 .../functions/glsl-function-step-float.html   |   0
 .../functions/glsl-function-step-gentype.html |   0
 .../glsl/functions/glsl-function.html         |   0
 .../glsl/implicit/00_test_list.txt            |   0
 .../glsl/implicit/add_int_float.vert.html     |   0
 .../glsl/implicit/add_int_mat2.vert.html      |   0
 .../glsl/implicit/add_int_mat3.vert.html      |   0
 .../glsl/implicit/add_int_mat4.vert.html      |   0
 .../glsl/implicit/add_int_vec2.vert.html      |   0
 .../glsl/implicit/add_int_vec3.vert.html      |   0
 .../glsl/implicit/add_int_vec4.vert.html      |   0
 .../glsl/implicit/add_ivec2_vec2.vert.html    |   0
 .../glsl/implicit/add_ivec3_vec3.vert.html    |   0
 .../glsl/implicit/add_ivec4_vec4.vert.html    |   0
 .../implicit/assign_int_to_float.vert.html    |   0
 .../implicit/assign_ivec2_to_vec2.vert.html   |   0
 .../implicit/assign_ivec3_to_vec3.vert.html   |   0
 .../implicit/assign_ivec4_to_vec4.vert.html   |   0
 .../glsl/implicit/construct_struct.vert.html  |   0
 .../glsl/implicit/divide_int_float.vert.html  |   0
 .../glsl/implicit/divide_int_mat2.vert.html   |   0
 .../glsl/implicit/divide_int_mat3.vert.html   |   0
 .../glsl/implicit/divide_int_mat4.vert.html   |   0
 .../glsl/implicit/divide_int_vec2.vert.html   |   0
 .../glsl/implicit/divide_int_vec3.vert.html   |   0
 .../glsl/implicit/divide_int_vec4.vert.html   |   0
 .../glsl/implicit/divide_ivec2_vec2.vert.html |   0
 .../glsl/implicit/divide_ivec3_vec3.vert.html |   0
 .../glsl/implicit/divide_ivec4_vec4.vert.html |   0
 .../glsl/implicit/equal_int_float.vert.html   |   0
 .../glsl/implicit/equal_ivec2_vec2.vert.html  |   0
 .../glsl/implicit/equal_ivec3_vec3.vert.html  |   0
 .../glsl/implicit/equal_ivec4_vec4.vert.html  |   0
 .../implicit/function_int_float.vert.html     |   0
 .../implicit/function_ivec2_vec2.vert.html    |   0
 .../implicit/function_ivec3_vec3.vert.html    |   0
 .../implicit/function_ivec4_vec4.vert.html    |   0
 .../glsl/implicit/greater_than.vert.html      |   0
 .../implicit/greater_than_equal.vert.html     |   0
 .../glsl/implicit/less_than.vert.html         |   0
 .../glsl/implicit/less_than_equal.vert.html   |   0
 .../implicit/multiply_int_float.vert.html     |   0
 .../glsl/implicit/multiply_int_mat2.vert.html |   0
 .../glsl/implicit/multiply_int_mat3.vert.html |   0
 .../glsl/implicit/multiply_int_mat4.vert.html |   0
 .../glsl/implicit/multiply_int_vec2.vert.html |   0
 .../glsl/implicit/multiply_int_vec3.vert.html |   0
 .../glsl/implicit/multiply_int_vec4.vert.html |   0
 .../implicit/multiply_ivec2_vec2.vert.html    |   0
 .../implicit/multiply_ivec3_vec3.vert.html    |   0
 .../implicit/multiply_ivec4_vec4.vert.html    |   0
 .../implicit/not_equal_int_float.vert.html    |   0
 .../implicit/not_equal_ivec2_vec2.vert.html   |   0
 .../implicit/not_equal_ivec3_vec3.vert.html   |   0
 .../implicit/not_equal_ivec4_vec4.vert.html   |   0
 .../implicit/subtract_int_float.vert.html     |   0
 .../glsl/implicit/subtract_int_mat2.vert.html |   0
 .../glsl/implicit/subtract_int_mat3.vert.html |   0
 .../glsl/implicit/subtract_int_mat4.vert.html |   0
 .../glsl/implicit/subtract_int_vec2.vert.html |   0
 .../glsl/implicit/subtract_int_vec3.vert.html |   0
 .../glsl/implicit/subtract_int_vec4.vert.html |   0
 .../implicit/subtract_ivec2_vec2.vert.html    |   0
 .../implicit/subtract_ivec3_vec3.vert.html    |   0
 .../implicit/subtract_ivec4_vec4.vert.html    |   0
 .../glsl/implicit/ternary_int_float.vert.html |   0
 .../implicit/ternary_ivec2_vec2.vert.html     |   0
 .../implicit/ternary_ivec3_vec3.vert.html     |   0
 .../implicit/ternary_ivec4_vec4.vert.html     |   0
 .../glsl/matrices/00_test_list.txt            |   0
 .../glsl/matrices/glsl-mat4-to-mat3.html      |   0
 .../conformance/glsl/misc/00_test_list.txt    |   0
 .../misc/attrib-location-length-limits.html   |   0
 ...embedded-struct-definitions-forbidden.html |   0
 .../glsl-2types-of-textures-on-same-unit.html |   0
 .../glsl/misc/glsl-function-nodes.html        |   0
 .../glsl/misc/glsl-long-variable-names.html   |   0
 .../glsl/misc/glsl-vertex-branch.html         |   0
 .../conformance/glsl/misc/include.vs          |   0
 .../glsl/misc/non-ascii-comments.vert.html    |   0
 .../conformance/glsl/misc/non-ascii.vert.html |   0
 .../glsl/misc/re-compile-re-link.html         |   0
 ...er-with-256-character-identifier.frag.html |   0
 ...er-with-257-character-identifier.frag.html |   0
 .../shader-with-_webgl-identifier.vert.html   |   0
 .../shader-with-arbitrary-indexing.frag.html  |   0
 .../shader-with-arbitrary-indexing.vert.html  |   0
 .../misc/shader-with-attrib-array.vert.html   |   0
 .../misc/shader-with-attrib-struct.vert.html  |   0
 .../misc/shader-with-clipvertex.vert.html     |   0
 .../misc/shader-with-comma-assignment.html    |   0
 ...der-with-comma-conditional-assignment.html |   0
 .../misc/shader-with-conditional-scoping.html |   0
 .../shader-with-default-precision.frag.html   |   0
 .../shader-with-default-precision.vert.html   |   0
 ...er-with-define-line-continuation.frag.html |   0
 .../misc/shader-with-dfdx-no-ext.frag.html    |   0
 .../glsl/misc/shader-with-dfdx.frag.html      |   0
 .../glsl/misc/shader-with-do-scoping.html     |   0
 .../misc/shader-with-error-directive.html     |   0
 .../shader-with-explicit-int-cast.vert.html   |   0
 .../shader-with-float-return-value.frag.html  |   0
 .../glsl/misc/shader-with-for-loop.html       |   0
 .../glsl/misc/shader-with-for-scoping.html    |   0
 .../misc/shader-with-frag-depth.frag.html     |   0
 .../shader-with-function-recursion.frag.html  |   0
 .../shader-with-function-scoped-struct.html   |   0
 .../misc/shader-with-functional-scoping.html  |   0
 .../glsl/misc/shader-with-glcolor.vert.html   |   0
 .../glsl/misc/shader-with-gles-1.frag.html    |   0
 .../misc/shader-with-gles-symbol.frag.html    |   0
 .../shader-with-glprojectionmatrix.vert.html  |   0
 .../shader-with-hex-int-constant-macro.html   |   0
 ...-with-implicit-vec3-to-vec4-cast.vert.html |   0
 .../glsl/misc/shader-with-include.vert.html   |   0
 .../shader-with-int-return-value.frag.html    |   0
 .../shader-with-invalid-identifier.frag.html  |   0
 .../shader-with-ivec2-return-value.frag.html  |   0
 .../shader-with-ivec3-return-value.frag.html  |   0
 .../shader-with-ivec4-return-value.frag.html  |   0
 .../shader-with-limited-indexing.frag.html    |   0
 .../glsl/misc/shader-with-line-directive.html |   0
 .../glsl/misc/shader-with-long-line.html      |   0
 .../shader-with-non-ascii-error.frag.html     |   0
 .../glsl/misc/shader-with-precision.frag.html |   0
 .../misc/shader-with-quoted-error.frag.html   |   0
 ...th-undefined-preprocessor-symbol.frag.html |   0
 ...r-with-uniform-in-loop-condition.vert.html |   0
 .../shader-with-vec2-return-value.frag.html   |   0
 .../shader-with-vec3-return-value.frag.html   |   0
 .../shader-with-vec4-return-value.frag.html   |   0
 ...hader-with-vec4-vec3-vec4-conditional.html |   0
 .../misc/shader-with-version-100.frag.html    |   0
 .../misc/shader-with-version-100.vert.html    |   0
 .../misc/shader-with-version-120.vert.html    |   0
 .../misc/shader-with-version-130.vert.html    |   0
 .../shader-with-webgl-identifier.vert.html    |   0
 .../misc/shader-without-precision.frag.html   |   0
 .../conformance/glsl/misc/shared.html         |   0
 .../misc/struct-nesting-exceeds-maximum.html  |   0
 .../misc/struct-nesting-under-maximum.html    |   0
 .../misc/uniform-location-length-limits.html  |   0
 .../glsl/reserved/00_test_list.txt            |   0
 .../glsl/reserved/_webgl_field.vert.html      |   0
 .../glsl/reserved/_webgl_function.vert.html   |   0
 .../glsl/reserved/_webgl_struct.vert.html     |   0
 .../glsl/reserved/_webgl_variable.vert.html   |   0
 .../glsl/reserved/webgl_field.vert.html       |   0
 .../glsl/reserved/webgl_function.vert.html    |   0
 .../glsl/reserved/webgl_struct.vert.html      |   0
 .../glsl/reserved/webgl_variable.vert.html    |   0
 .../glsl/samplers/00_test_list.txt            |   0
 .../glsl-function-texture2d-bias.html         |   0
 .../samplers/glsl-function-texture2dlod.html  |   0
 .../samplers/glsl-function-texture2dproj.html |   0
 .../glsl/variables/00_test_list.txt           |   0
 .../glsl/variables/gl-fragcoord.html          |   0
 .../glsl/variables/gl-frontfacing.html        |   0
 .../glsl/variables/gl-pointcoord.html         |   0
 .../conformance/limits/00_test_list.txt       |   0
 .../limits/gl-max-texture-dimensions.html     |   0
 .../conformance/limits/gl-min-attribs.html    |   0
 .../conformance/limits/gl-min-textures.html   |   0
 .../conformance/limits/gl-min-uniforms.html   |   0
 .../conformance/misc/00_test_list.txt         |   0
 .../conformance/misc/bad-arguments-test.html  |   0
 .../conformance/misc/delayed-drawing.html     |   0
 .../conformance/misc/error-reporting.html     |   0
 .../misc/functions-returning-strings.html     |   0
 .../conformance/misc/instanceof-test.html     |   0
 .../misc/invalid-passed-params.html           |   0
 .../conformance/misc/is-object.html           |   0
 .../misc/null-object-behaviour.html           |   0
 .../misc/object-deletion-behaviour.html       |   0
 .../misc/shader-precision-format.html         |   0
 .../misc/type-conversion-test.html            |   0
 .../conformance/misc/uninitialized-test.html  |   0
 .../conformance/misc/webgl-specific.html      |   0
 .../conformance/more/00_test_list.txt         |   0
 .../conformance/more/README.md                |   0
 .../conformance/more/all_tests.html           |   0
 .../conformance/more/all_tests_linkonly.html  |   0
 .../more/all_tests_sequential.html            |   0
 .../more/conformance/argGenerators-A.js       |   0
 .../more/conformance/argGenerators-B1.js      |   0
 .../more/conformance/argGenerators-B2.js      |   0
 .../more/conformance/argGenerators-B3.js      |   0
 .../more/conformance/argGenerators-B4.js      |   0
 .../more/conformance/argGenerators-C.js       |   0
 .../more/conformance/argGenerators-D_G.js     |   0
 .../more/conformance/argGenerators-G_I.js     |   0
 .../more/conformance/argGenerators-L_S.js     |   0
 .../more/conformance/argGenerators-S_V.js     |   0
 .../conformance/badArgsArityLessThanArgc.html |   0
 .../more/conformance/constants.html           |   0
 .../more/conformance/fuzzTheAPI.html          |   0
 .../more/conformance/getContext.html          |   0
 .../conformance/more/conformance/methods.html |   0
 .../more/conformance/quickCheckAPI-A.html     |   0
 .../more/conformance/quickCheckAPI-B1.html    |   0
 .../more/conformance/quickCheckAPI-B2.html    |   0
 .../more/conformance/quickCheckAPI-B3.html    |   0
 .../more/conformance/quickCheckAPI-B4.html    |   0
 .../more/conformance/quickCheckAPI-C.html     |   0
 .../more/conformance/quickCheckAPI-D_G.html   |   0
 .../more/conformance/quickCheckAPI-G_I.html   |   0
 .../more/conformance/quickCheckAPI-L_S.html   |   0
 .../more/conformance/quickCheckAPI-S_V.html   |   0
 .../more/conformance/quickCheckAPI.js         |   0
 .../conformance/quickCheckAPIBadArgs.html     |   0
 .../more/conformance/webGLArrays.html         |   0
 .../conformance/more/demos/opengl_web.html    |   0
 .../conformance/more/demos/video.html         |   0
 .../more/functions/bindBuffer.html            |   0
 .../more/functions/bindBufferBadArgs.html     |   0
 .../bindFramebufferLeaveNonZero.html          |   0
 .../more/functions/bufferData.html            |   0
 .../more/functions/bufferDataBadArgs.html     |   0
 .../more/functions/bufferSubData.html         |   0
 .../more/functions/bufferSubDataBadArgs.html  |   0
 .../more/functions/copyTexImage2D.html        |   0
 .../more/functions/copyTexImage2DBadArgs.html |   0
 .../more/functions/copyTexSubImage2D.html     |   0
 .../functions/copyTexSubImage2DBadArgs.html   |   0
 .../more/functions/deleteBufferBadArgs.html   |   0
 .../more/functions/drawArrays.html            |   0
 .../more/functions/drawArraysOutOfBounds.html |   0
 .../more/functions/drawElements.html          |   0
 .../more/functions/drawElementsBadArgs.html   |   0
 .../conformance/more/functions/isTests.html   |   0
 .../more/functions/readPixels.html            |   0
 .../more/functions/readPixelsBadArgs.html     |   0
 .../more/functions/texImage2D.html            |   0
 .../more/functions/texImage2DBadArgs.html     |   0
 .../more/functions/texImage2DHTML.html        |   0
 .../more/functions/texImage2DHTMLBadArgs.html |   0
 .../more/functions/texSubImage2D.html         |   0
 .../more/functions/texSubImage2DBadArgs.html  |   0
 .../more/functions/texSubImage2DHTML.html     |   0
 .../functions/texSubImage2DHTMLBadArgs.html   |   0
 .../more/functions/uniformMatrix.html         |   0
 .../more/functions/uniformMatrixBadArgs.html  |   0
 .../conformance/more/functions/uniformf.html  |   0
 .../more/functions/uniformfArrayLen1.html     |   0
 .../more/functions/uniformfBadArgs.html       |   0
 .../conformance/more/functions/uniformi.html  |   0
 .../more/functions/uniformiBadArgs.html       |   0
 .../more/functions/vertexAttrib.html          |   0
 .../more/functions/vertexAttribBadArgs.html   |   0
 .../more/functions/vertexAttribPointer.html   |   0
 .../functions/vertexAttribPointerBadArgs.html |   0
 .../more/glsl/arrayOutOfBounds.html           |   0
 .../conformance/more/glsl/longLoops.html      |   0
 .../more/glsl/uniformOutOfBounds.html         |   0
 .../more/glsl/unusedAttribsUniforms.html      |   0
 .../conformance/more/index.html               |   0
 .../more/performance/CPUvsGPU.html            |   0
 .../more/performance/bandwidth.html           |   0
 .../more/performance/jsGCPause.html           |   0
 .../more/performance/jsMatrixMult.html        |   0
 .../more/performance/jsToGLOverhead.html      |   0
 .../conformance/more/unit.css                 |   0
 .../conformance/more/unit.js                  |   0
 .../conformance/more/util.js                  |   0
 .../conformance/programs/00_test_list.txt     |   0
 .../conformance/programs/get-active-test.html |   0
 .../gl-bind-attrib-location-test.html         |   0
 .../programs/gl-get-active-attribute.html     |   0
 .../programs/gl-get-active-uniform.html       |   0
 .../programs/gl-getshadersource.html          |   0
 .../conformance/programs/gl-shader-test.html  |   0
 .../conformance/programs/invalid-UTF-16.html  |   0
 .../conformance/programs/program-test.html    |   0
 .../conformance/reading/00_test_list.txt      |   0
 .../reading/read-pixels-pack-alignment.html   |   0
 .../conformance/reading/read-pixels-test.html |   0
 .../renderbuffers/00_test_list.txt            |   0
 .../framebuffer-object-attachment.html        |   0
 .../renderbuffers/framebuffer-test.html       |   0
 .../renderbuffer-initialization.html          |   0
 .../conformance/rendering/00_test_list.txt    |   0
 .../rendering/draw-arrays-out-of-bounds.html  |   0
 .../draw-elements-out-of-bounds.html          |   0
 .../conformance/rendering/gl-clear.html       |   0
 .../rendering/gl-drawelements.html            |   0
 .../rendering/gl-scissor-test.html            |   0
 .../rendering/line-loop-tri-fan.html          |   0
 .../rendering/more-than-65536-indices.html    |   0
 .../conformance/rendering/point-size.html     |   0
 .../conformance/rendering/triangle.html       |   0
 .../conformance/resources/3x3.png             | Bin
 .../conformance/resources/blue-1x1.jpg        | Bin
 .../resources/boolUniformShader.vert          |   0
 .../resources/bug-32888-texture.png           | Bin
 .../resources/floatUniformShader.vert         |   0
 .../conformance/resources/fragmentShader.frag |   0
 .../resources/glsl-conformance-test.js        |   0
 .../resources/glsl-feature-tests.css          |   0
 .../conformance/resources/glsl-generator.js   |   0
 .../gray-ramp-256-with-128-alpha.png          | Bin
 .../conformance/resources/gray-ramp-256.png   | Bin
 .../resources/gray-ramp-default-gamma.png     | Bin
 .../resources/gray-ramp-gamma0.1.png          | Bin
 .../resources/gray-ramp-gamma1.0.png          | Bin
 .../resources/gray-ramp-gamma2.0.png          | Bin
 .../resources/gray-ramp-gamma4.0.png          | Bin
 .../resources/gray-ramp-gamma9.0.png          | Bin
 .../conformance/resources/gray-ramp.png       | Bin
 .../conformance/resources/green-2x2-16bit.png | Bin
 .../resources/intArrayUniformShader.vert      |   0
 .../resources/intUniformShader.vert           |   0
 .../resources/matUniformShader.vert           |   0
 .../resources/noopUniformShader.frag          |   0
 .../resources/noopUniformShader.vert          |   0
 .../conformance/resources/npot-video.mp4      | Bin
 .../resources/npot-video.theora.ogv           | Bin
 .../resources/npot-video.webmvp8.webm         | Bin
 .../conformance/resources/pnglib.js           |   0
 .../conformance/resources/red-green.mp4       | Bin
 .../conformance/resources/red-green.png       | Bin
 .../resources/red-green.theora.ogv            | Bin
 .../resources/red-green.webmvp8.webm          | Bin
 .../conformance/resources/red-indexed.png     | Bin
 .../resources/samplerUniformShader.frag       |   0
 .../small-square-with-cie-rgb-profile.png     | Bin
 .../small-square-with-colormatch-profile.png  | Bin
 .../small-square-with-colorspin-profile.jpg   | Bin
 .../small-square-with-colorspin-profile.png   | Bin
 .../small-square-with-e-srgb-profile.png      | Bin
 .../small-square-with-smpte-c-profile.png     | Bin
 ...-square-with-srgb-iec61966-2.1-profile.png | Bin
 .../resources/structUniformShader.vert        |   0
 .../conformance/resources/vertexShader.vert   |   0
 .../conformance/resources/webgl-test-utils.js |   0
 .../conformance/resources/webgl-test.js       |   0
 .../conformance/resources/zero-alpha.png      | Bin
 .../conformance/state/00_test_list.txt        |   0
 .../state/gl-enable-enum-test.html            |   0
 .../conformance/state/gl-enum-tests.html      |   0
 .../conformance/state/gl-get-calls.html       |   0
 .../conformance/state/gl-geterror.html        |   0
 .../conformance/state/gl-getstring.html       |   0
 .../state/gl-object-get-calls.html            |   0
 .../conformance/textures/00_test_list.txt     |   0
 .../textures/compressed-tex-image.html        |   0
 .../copy-tex-image-and-sub-image-2d.html      |   0
 .../conformance/textures/gl-pixelstorei.html  |   0
 .../conformance/textures/gl-teximage.html     |   0
 .../textures/origin-clean-conformance.html    |   0
 ...d-sub-image-2d-with-array-buffer-view.html |   0
 ...ex-image-and-sub-image-2d-with-canvas.html |   0
 ...mage-and-sub-image-2d-with-image-data.html |   0
 ...tex-image-and-sub-image-2d-with-image.html |   0
 ...tex-image-and-sub-image-2d-with-video.html |   0
 .../tex-image-and-uniform-binding-bugs.html   |   0
 .../tex-image-with-format-and-type.html       |   0
 .../textures/tex-image-with-invalid-data.html |   0
 .../textures/tex-input-validation.html        |   0
 .../textures/tex-sub-image-2d-bad-args.html   |   0
 .../textures/tex-sub-image-2d.html            |   0
 .../textures/texparameter-test.html           |   0
 .../textures/texture-active-bind-2.html       |   0
 .../textures/texture-active-bind.html         |   0
 .../conformance/textures/texture-clear.html   |   0
 .../textures/texture-complete.html            |   0
 .../textures/texture-formats-test.html        |   0
 .../conformance/textures/texture-mips.html    |   0
 .../textures/texture-npot-video.html          |   0
 .../conformance/textures/texture-npot.html    |   0
 .../textures/texture-size-cube-maps.html      |   0
 .../conformance/textures/texture-size.html    |   0
 ...exture-transparent-pixels-initialized.html |   0
 .../conformance/typedarrays/00_test_list.txt  |   0
 .../typedarrays/array-buffer-crash.html       |   0
 .../typedarrays/array-buffer-view-crash.html  |   0
 .../typedarrays/array-unit-tests.html         |   0
 .../conformance/uniforms/00_test_list.txt     |   0
 .../uniforms/gl-uniform-arrays.html           |   0
 .../conformance/uniforms/gl-uniform-bool.html |   0
 .../uniforms/gl-uniformmatrix4fv.html         |   0
 .../uniforms/gl-unknown-uniform.html          |   0
 .../uniforms/null-uniform-location.html       |   0
 .../uniforms/uniform-location.html            |   0
 .../uniforms/uniform-samplers-test.html       |   0
 .../dont-load-image-from-internet.patch       |  36 +++++------
 .../ext-texture-filter-anisotropic.patch      |  10 +--
 .../50x50pixel-black-with-red-triangle.png    | Bin
 .../extra/big-fbos-example.html               |   0
 .../extra/canvas-compositing-test.html        |   0
 .../extra/canvas-compositing-test.png         | Bin
 .../extra/fbo-lost-context.html               |   0
 .../extra/lots-of-polys-example.html          |   0
 .../extra/offscreen-issue.html                |   0
 .../out-of-bounds-uniform-array-access.html   |   0
 .../extra/out-of-memory.html                  |   0
 .../extra/out-of-resources.html               |   0
 .../webgl-conformance/extra/out-of-vram.html  |   0
 .../extra/simulated-attrib-0-bug-test.html    |   0
 .../extra/slow-shader-example.html            |   0
 .../webgl-conformance/extra/webgl-info.html   |   0
 .../failing_tests_android.txt                 |   0
 .../failing_tests_android_nvidia.txt          |   0
 .../failing_tests_android_x86.txt             |   0
 .../webgl-conformance/failing_tests_linux.txt |   0
 .../failing_tests_linux_mesa.txt              |   0
 .../failing_tests_linux_nvidia.txt            |   0
 .../webgl-conformance/failing_tests_mac.txt   |   0
 .../failing_tests_mac_mtnlion.txt             |   0
 .../failing_tests_windows.txt                 |   0
 .../fix-webgl-harness-async.patch             |   6 +-
 .../canvas/test/webgl-conformance/gc.patch    |  18 +++---
 .../log-more-info-about-test-failures.patch   |  24 ++++----
 .../misc/program-test-1.html                  |   0
 .../mochitest-conformance-files.ini           |   0
 .../test/webgl-conformance/mochitest.ini      |   0
 .../canvas/test/webgl-conformance/moz.build   |   0
 .../reference-cycle-test.patch                |  12 ++--
 .../webgl-conformance/resources/cors-util.js  |   2 +-
 .../resources/desktop-gl-constants.js         |   0
 .../resources/js-test-pre.js                  |   0
 .../resources/js-test-style.css               |   0
 .../resources/opengl_logo.jpg                 | Bin
 .../resources/thunderbird-logo-64x64.png      | Bin
 .../resources/webgl-logo.png                  | Bin
 .../resources/webgl-test-harness.js           |   0
 .../skipped_tests_android.txt                 |   0
 .../skipped_tests_android_x86.txt             |   0
 .../webgl-conformance/skipped_tests_linux.txt |   0
 .../skipped_tests_linux_mesa.txt              |   0
 .../skipped_tests_win_vista.txt               |   0
 .../webgl-conformance/skipped_tests_winxp.txt |   0
 .../test_webgl_conformance_test_suite.html    |   0
 .../webgl-conformance-tests.html              |   0
 .../test/webgl-conformance/writemanifest.py   |   0
 .../test/webgl-mochitest/driver-info.js       |   2 +-
 .../test/webgl-mochitest/mochi-to-testcase.py |   0
 .../canvas/test/webgl-mochitest/mochitest.ini |   0
 .../canvas/test/webgl-mochitest/moz.build     |   0
 .../test_depth_readpixels.html                |   0
 .../test/webgl-mochitest/test_draw.html       |   0
 .../test/webgl-mochitest/test_fb_param.html   |   0
 .../webgl-mochitest/test_fb_param_crash.html  |   0
 .../test/webgl-mochitest/test_highp_fs.html   |   0
 .../webgl-mochitest/test_no_arr_points.html   |   0
 .../webgl-mochitest/test_noprog_draw.html     |   0
 .../webgl-mochitest/test_privileged_exts.html |   0
 .../test_texsubimage_float.html               |   0
 .../test_webgl2_not_exposed.html              |   0
 .../webgl-mochitest/test_webgl_available.html |   0
 .../test_webgl_conformance.html               |   0
 .../test_webgl_request_context.html           |   0
 .../test_webgl_request_mismatch.html          |   0
 .../canvas/test/webgl-mochitest/webgl-util.js |   0
 dom/moz.build                                 |   1 +
 layout/build/moz.build                        |   2 +-
 layout/reftests/reftest.list                  |   3 +-
 testing/crashtest/crashtests.list             |   2 +-
 testing/mochitest/android.json                |   2 +-
 testing/mochitest/android23.json              |   4 +-
 testing/mochitest/androidx86.json             |  58 +++++++++---------
 testing/mochitest/gl.json                     |   2 +-
 883 files changed, 142 insertions(+), 159 deletions(-)
 delete mode 100644 content/canvas/moz.build
 delete mode 100644 content/canvas/public/moz.build
 delete mode 100644 content/canvas/test/android.json
 delete mode 100644 content/canvas/test/image_green-redirect^headers^
 rename {content/canvas/src => dom/canvas}/CanvasGradient.h (100%)
 rename {content/canvas/src => dom/canvas}/CanvasImageCache.cpp (100%)
 rename {content/canvas/src => dom/canvas}/CanvasImageCache.h (100%)
 rename {content/canvas/src => dom/canvas}/CanvasPattern.h (100%)
 rename {content/canvas/src => dom/canvas}/CanvasRenderingContext2D.cpp (100%)
 rename {content/canvas/src => dom/canvas}/CanvasRenderingContext2D.h (100%)
 rename {content/canvas/src => dom/canvas}/CanvasUtils.cpp (100%)
 rename {content/canvas/src => dom/canvas}/CanvasUtils.h (100%)
 rename {content/canvas/src => dom/canvas}/DocumentRendererChild.cpp (100%)
 rename {content/canvas/public => dom/canvas}/DocumentRendererChild.h (100%)
 rename {content/canvas/src => dom/canvas}/DocumentRendererParent.cpp (100%)
 rename {content/canvas/public => dom/canvas}/DocumentRendererParent.h (100%)
 rename {content/canvas/src => dom/canvas}/ImageData.cpp (100%)
 rename {content/canvas/src => dom/canvas}/ImageData.h (100%)
 rename {content/canvas/src => dom/canvas}/ImageEncoder.cpp (100%)
 rename {content/canvas/src => dom/canvas}/ImageEncoder.h (100%)
 rename {content/canvas/src => dom/canvas}/Makefile.in (100%)
 rename {content/canvas/src => dom/canvas}/MurmurHash3.cpp (100%)
 rename {content/canvas/src => dom/canvas}/MurmurHash3.h (100%)
 rename {content/canvas/src => dom/canvas}/TextMetrics.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGL1Context.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGL1Context.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGL2Context.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGL2Context.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLActiveInfo.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLActiveInfo.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLBuffer.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLBuffer.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContext.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContext.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextAsyncQueries.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextBuffers.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextDraw.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextExtensions.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextFramebufferOperations.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextGL.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextLossTimer.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextNotSupported.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextReporter.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextState.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextUtils.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextUtils.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextValidate.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextVertexArray.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLContextVertices.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLElementArrayCache.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLElementArrayCache.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionBase.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionBlendMinMax.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionColorBufferFloat.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionColorBufferHalfFloat.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionCompressedTextureATC.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionCompressedTextureETC1.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionCompressedTexturePVRTC.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionCompressedTextureS3TC.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionDebugRendererInfo.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionDebugShaders.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionDepthTexture.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionDrawBuffers.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionElementIndexUint.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionFragDepth.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionInstancedArrays.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionLoseContext.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionSRGB.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionStandardDerivatives.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionTextureFilterAnisotropic.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionTextureFloat.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionTextureFloatLinear.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionTextureHalfFloat.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionTextureHalfFloatLinear.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensionVertexArray.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLExtensions.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLFramebuffer.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLFramebuffer.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLFramebufferAttachable.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLFramebufferAttachable.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLMemoryTracker.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLObjectModel.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLObjectModel.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLProgram.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLProgram.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLQuery.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLQuery.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLRenderbuffer.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLRenderbuffer.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLShader.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLShader.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLShaderPrecisionFormat.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLShaderPrecisionFormat.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLTexelConversions.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLTexelConversions.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLTexture.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLTexture.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLTypes.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLUniformInfo.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLUniformLocation.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLUniformLocation.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLValidateStrings.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArray.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArray.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArrayFake.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArrayFake.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArrayGL.cpp (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexArrayGL.h (100%)
 rename {content/canvas/src => dom/canvas}/WebGLVertexAttribData.h (100%)
 rename {content => dom}/canvas/compiledtest/TestWebGLElementArrayCache.cpp (100%)
 rename {content => dom}/canvas/compiledtest/moz.build (97%)
 rename {content => dom}/canvas/crashtests/0px-size-font-667225.html (100%)
 rename {content => dom}/canvas/crashtests/0px-size-font-shadow.html (100%)
 rename {content => dom}/canvas/crashtests/360293-1.html (100%)
 rename {content => dom}/canvas/crashtests/421715-1.html (100%)
 rename {content => dom}/canvas/crashtests/553938-1.html (100%)
 rename {content => dom}/canvas/crashtests/647480.html (100%)
 rename {content => dom}/canvas/crashtests/727547.html (100%)
 rename {content => dom}/canvas/crashtests/729116.html (100%)
 rename {content => dom}/canvas/crashtests/743499-negative-size.html (100%)
 rename {content => dom}/canvas/crashtests/745699-1.html (100%)
 rename {content => dom}/canvas/crashtests/745818-large-source.html (100%)
 rename {content => dom}/canvas/crashtests/746813-1.html (100%)
 rename {content => dom}/canvas/crashtests/767337-1.html (100%)
 rename {content => dom}/canvas/crashtests/780392-1.html (100%)
 rename {content => dom}/canvas/crashtests/789933-1.html (100%)
 rename {content => dom}/canvas/crashtests/794463-1.html (100%)
 rename {content => dom}/canvas/crashtests/802926-1.html (100%)
 rename {content => dom}/canvas/crashtests/896047-1.html (100%)
 rename {content => dom}/canvas/crashtests/896047-2.html (100%)
 rename {content => dom}/canvas/crashtests/916128-1.html (100%)
 rename {content => dom}/canvas/crashtests/934939-1.html (100%)
 rename {content => dom}/canvas/crashtests/crashtests.list (100%)
 rename {content => dom}/canvas/crashtests/texImage2D.html (100%)
 rename {content/canvas/src => dom/canvas}/moz.build (94%)
 rename {content/canvas/public => dom/canvas}/nsICanvasRenderingContextInternal.h (100%)
 create mode 100644 dom/canvas/test/android.json
 rename {content => dom}/canvas/test/chrome/chrome.ini (100%)
 rename {content => dom}/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html (100%)
 rename {content => dom}/canvas/test/chrome/test_drawWindow_widget_layers.html (100%)
 rename {content => dom}/canvas/test/chrome/test_webgl_debug_renderer_info.html (96%)
 rename {content => dom}/canvas/test/crossorigin/image-allow-credentials.png (100%)
 rename {content => dom}/canvas/test/crossorigin/image-allow-credentials.png^headers^ (100%)
 rename {content => dom}/canvas/test/crossorigin/image-allow-star.png (100%)
 rename {content => dom}/canvas/test/crossorigin/image-allow-star.png^headers^ (100%)
 rename {content => dom}/canvas/test/crossorigin/image.png (100%)
 rename {content => dom}/canvas/test/crossorigin/mochitest.ini (100%)
 rename {content => dom}/canvas/test/crossorigin/test_canvas2d_crossorigin.html (98%)
 rename {content => dom}/canvas/test/crossorigin/test_video_crossorigin.html (98%)
 rename {content => dom}/canvas/test/crossorigin/test_webgl_crossorigin_textures.html (65%)
 rename {content => dom}/canvas/test/crossorigin/video.sjs (100%)
 rename {content => dom}/canvas/test/file_drawImage_document_domain.html (100%)
 rename {content => dom}/canvas/test/file_drawWindow_common.js (100%)
 rename {content => dom}/canvas/test/file_drawWindow_source.html (100%)
 rename {content => dom}/canvas/test/image_anim-gr.gif (100%)
 rename {content => dom}/canvas/test/image_anim-gr.png (100%)
 rename {content => dom}/canvas/test/image_anim-poster-gr.png (100%)
 rename {content => dom}/canvas/test/image_broken.png (100%)
 rename {content => dom}/canvas/test/image_ggrr-256x256.png (100%)
 rename {content => dom}/canvas/test/image_green-16x16.png (100%)
 rename {content => dom}/canvas/test/image_green-1x1.png (100%)
 rename {content => dom}/canvas/test/image_green-redirect (100%)
 create mode 100644 dom/canvas/test/image_green-redirect^headers^
 rename {content => dom}/canvas/test/image_green.png (100%)
 rename {content => dom}/canvas/test/image_red-16x16.png (100%)
 rename {content => dom}/canvas/test/image_red.png (100%)
 rename {content => dom}/canvas/test/image_redtransparent.png (100%)
 rename {content => dom}/canvas/test/image_rgrg-256x256.png (100%)
 rename {content => dom}/canvas/test/image_rrgg-256x256.png (100%)
 rename {content => dom}/canvas/test/image_transparent.png (100%)
 rename {content => dom}/canvas/test/image_transparent50.png (100%)
 rename {content => dom}/canvas/test/image_yellow.png (100%)
 rename {content => dom}/canvas/test/image_yellow75.png (100%)
 rename {content => dom}/canvas/test/mochitest.ini (100%)
 rename {content => dom}/canvas/test/moz.build (100%)
 rename {content => dom}/canvas/test/reftest/black.html (100%)
 rename {content => dom}/canvas/test/reftest/clip-multiple-paths-badref.html (100%)
 rename {content => dom}/canvas/test/reftest/clip-multiple-paths.html (100%)
 rename {content => dom}/canvas/test/reftest/colors-half-alpha.png (100%)
 rename {content => dom}/canvas/test/reftest/colors.png (100%)
 rename {content => dom}/canvas/test/reftest/drawCustomFocusRing-ref.html (100%)
 rename {content => dom}/canvas/test/reftest/drawCustomFocusRing.html (100%)
 rename {content => dom}/canvas/test/reftest/drawFocusIfNeeded-ref.html (100%)
 rename {content => dom}/canvas/test/reftest/drawFocusIfNeeded.html (100%)
 rename {content => dom}/canvas/test/reftest/green.png (100%)
 rename {content => dom}/canvas/test/reftest/half-colors-half-alpha.png (100%)
 rename {content => dom}/canvas/test/reftest/half-colors.png (100%)
 rename {content => dom}/canvas/test/reftest/reftest.list (100%)
 rename {content => dom}/canvas/test/reftest/stroketext-shadow-ref.html (100%)
 rename {content => dom}/canvas/test/reftest/stroketext-shadow.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-clear-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-color-alpha-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-color-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-disable-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-hanging-fb-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-hanging-scissor-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-orientation-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-resize-test.html (100%)
 rename {content => dom}/canvas/test/reftest/webgl-utils.js (100%)
 rename {content => dom}/canvas/test/reftest/white-top-left.png (100%)
 rename {content => dom}/canvas/test/reftest/white.png (100%)
 rename {content => dom}/canvas/test/reftest/wrapper.html (100%)
 rename {content => dom}/canvas/test/test_2d.clearRect.image.offscreen.html (100%)
 rename {content => dom}/canvas/test/test_2d.clip.winding.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.color-burn.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.color-dodge.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.color.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.darken.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.destination-atop.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.destination-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.difference.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.exclusion.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.hard-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.hue.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.lighten.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.lighter.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.luminosity.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.multiply.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.overlay.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.saturation.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.screen.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.soft-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.source-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.source-out.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.canvas.xor.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.clip.lighter.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.clip.xor.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.destination-atop.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.destination-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.lighter.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.source-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.source-out.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.image.xor.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.color-burn.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.color-dodge.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.color.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.darken.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.difference.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.exclusion.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.hard-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.hue.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.lighten.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.lighter.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.luminosity.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.multiply.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.overlay.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.saturation.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.screen.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.soft-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.solid.xor.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.transparent.lighter.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.transparent.xor.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.color-burn.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.color.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.darken.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.destination-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.difference.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.exclusion.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.hard-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.hue.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.lighten.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.luminosity.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.multiply.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.overlay.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.saturation.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.screen.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.soft-light.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.source-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.fill.source-out.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.image.destination-atop.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.image.destination-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.image.source-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.image.source-out.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.pattern.source-in.html (100%)
 rename {content => dom}/canvas/test/test_2d.composite.uncovered.pattern.source-out.html (100%)
 rename {content => dom}/canvas/test/test_2d.drawImage.zerocanvas.html (100%)
 rename {content => dom}/canvas/test/test_2d.fill.winding.html (100%)
 rename {content => dom}/canvas/test/test_2d.fillText.gradient.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.cone.behind.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.cone.beside.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.cone.front.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.cone.shape2.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.cone.top.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.equal.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.inside2.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.inside3.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.outside1.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.outside2.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.outside3.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.touch1.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.touch2.html (100%)
 rename {content => dom}/canvas/test/test_2d.gradient.radial.touch3.html (100%)
 rename {content => dom}/canvas/test/test_2d.isPointInPath.winding.html (100%)
 rename {content => dom}/canvas/test/test_2d.line.cap.closed.html (100%)
 rename {content => dom}/canvas/test/test_2d.line.join.parallel.html (100%)
 rename {content => dom}/canvas/test/test_2d.path.arc.shape.3.html (100%)
 rename {content => dom}/canvas/test/test_2d.path.rect.selfintersect.html (100%)
 rename {content => dom}/canvas/test/test_2d.path.rect.zero.6.html (100%)
 rename {content => dom}/canvas/test/test_2d.strokeRect.zero.5.html (100%)
 rename {content => dom}/canvas/test/test_2d_composite_canvaspattern_setTransform.html (100%)
 rename {content => dom}/canvas/test/test_ImageData_ctor.html (100%)
 rename {content => dom}/canvas/test/test_bug613794.html (100%)
 rename {content => dom}/canvas/test/test_bug753758.html (100%)
 rename {content => dom}/canvas/test/test_bug764125.html (100%)
 rename {content => dom}/canvas/test/test_bug856472.html (100%)
 rename {content => dom}/canvas/test/test_bug866575.html (100%)
 rename {content => dom}/canvas/test/test_bug902651.html (100%)
 rename {content => dom}/canvas/test/test_canvas.html (99%)
 rename {content => dom}/canvas/test/test_canvas_focusring.html (100%)
 rename {content => dom}/canvas/test/test_canvas_font_setter.html (100%)
 rename {content => dom}/canvas/test/test_canvas_path.html (100%)
 rename {content => dom}/canvas/test/test_canvas_strokeStyle_getter.html (100%)
 rename {content => dom}/canvas/test/test_createPattern_broken.html (100%)
 rename {content => dom}/canvas/test/test_drawImageIncomplete.html (100%)
 rename {content => dom}/canvas/test/test_drawImage_document_domain.html (100%)
 rename {content => dom}/canvas/test/test_drawImage_edge_cases.html (100%)
 rename {content => dom}/canvas/test/test_drawWindow.html (100%)
 rename {content => dom}/canvas/test/test_hitregion_canvas.html (100%)
 rename {content => dom}/canvas/test/test_hitregion_event.html (100%)
 rename {content => dom}/canvas/test/test_isPointInStroke.html (100%)
 rename {content => dom}/canvas/test/test_mozDashOffset.html (100%)
 rename {content => dom}/canvas/test/test_mozGetAsFile.html (100%)
 rename {content => dom}/canvas/test/test_setlinedash.html (100%)
 rename {content => dom}/canvas/test/test_strokeText_throw.html (100%)
 rename {content => dom}/canvas/test/test_toBlob.html (100%)
 rename {content => dom}/canvas/test/test_toDataURL_alpha.html (100%)
 rename {content => dom}/canvas/test/test_toDataURL_lowercase_ascii.html (100%)
 rename {content => dom}/canvas/test/test_toDataURL_parameters.html (100%)
 rename {content => dom}/canvas/test/test_windingRuleUndefined.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/README.mozilla (100%)
 rename {content => dom}/canvas/test/webgl-conformance/README.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/00_readme.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/buffers/index-validation.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/constants.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/context-lost.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/context-type-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/methods.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/error-reporting.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/is-object.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/README.md (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/all_tests.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/constants.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/methods.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/demos/video.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/isTests.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/index.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/unit.css (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/unit.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/more/util.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/get-active-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/programs/program-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/point-size.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/rendering/triangle.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/3x3.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4 (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/pnglib.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/red-green.mp4 (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/red-green.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/red-indexed.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/webgl-test.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-geterror.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-getstring.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-clear.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-complete.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-mips.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-npot.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-size.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/dont-load-image-from-internet.patch (98%)
 rename {content => dom}/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch (92%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/big-fbos-example.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/canvas-compositing-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/canvas-compositing-test.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/fbo-lost-context.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/lots-of-polys-example.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/offscreen-issue.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/out-of-memory.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/out-of-resources.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/out-of-vram.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/slow-shader-example.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/extra/webgl-info.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_android.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_android_x86.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_linux.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_mac.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/failing_tests_windows.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/fix-webgl-harness-async.patch (73%)
 rename {content => dom}/canvas/test/webgl-conformance/gc.patch (82%)
 rename {content => dom}/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch (83%)
 rename {content => dom}/canvas/test/webgl-conformance/misc/program-test-1.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/mochitest-conformance-files.ini (100%)
 rename {content => dom}/canvas/test/webgl-conformance/mochitest.ini (100%)
 rename {content => dom}/canvas/test/webgl-conformance/moz.build (100%)
 rename {content => dom}/canvas/test/webgl-conformance/reference-cycle-test.patch (82%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/cors-util.js (91%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/desktop-gl-constants.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/js-test-pre.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/js-test-style.css (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/opengl_logo.jpg (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/webgl-logo.png (100%)
 rename {content => dom}/canvas/test/webgl-conformance/resources/webgl-test-harness.js (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_android.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_android_x86.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_linux.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_win_vista.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/skipped_tests_winxp.txt (100%)
 rename {content => dom}/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/webgl-conformance-tests.html (100%)
 rename {content => dom}/canvas/test/webgl-conformance/writemanifest.py (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/driver-info.js (98%)
 rename {content => dom}/canvas/test/webgl-mochitest/mochi-to-testcase.py (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/mochitest.ini (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/moz.build (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_depth_readpixels.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_draw.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_fb_param.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_fb_param_crash.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_highp_fs.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_no_arr_points.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_noprog_draw.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_privileged_exts.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_texsubimage_float.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_webgl_available.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_webgl_conformance.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_webgl_request_context.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html (100%)
 rename {content => dom}/canvas/test/webgl-mochitest/webgl-util.js (100%)

diff --git a/content/canvas/moz.build b/content/canvas/moz.build
deleted file mode 100644
index b666b2e804a..00000000000
--- a/content/canvas/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-PARALLEL_DIRS += ['public', 'src']
-TEST_DIRS += ['test']
-
-TEST_TOOL_DIRS += ['compiledtest']
diff --git a/content/canvas/public/moz.build b/content/canvas/public/moz.build
deleted file mode 100644
index 774482005eb..00000000000
--- a/content/canvas/public/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsICanvasRenderingContextInternal.h',
-]
-
-EXPORTS.mozilla.ipc += [
-    'DocumentRendererChild.h',
-    'DocumentRendererParent.h',
-]
-
diff --git a/content/canvas/test/android.json b/content/canvas/test/android.json
deleted file mode 100644
index f6697b7a149..00000000000
--- a/content/canvas/test/android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "runtests": {},
-  "excludetests": {
-      "content/canvas/test/webgl/test_webgl_conformance_test_suite.html": ""
-  }
-}
diff --git a/content/canvas/test/image_green-redirect^headers^ b/content/canvas/test/image_green-redirect^headers^
deleted file mode 100644
index e54e486c1a5..00000000000
--- a/content/canvas/test/image_green-redirect^headers^
+++ /dev/null
@@ -1,2 +0,0 @@
-HTTP 302 Moved
-Location: http://example.com/tests/content/canvas/test/image_green-1x1.png
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
index 1836bbebcaf..012238a7a70 100644
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@@ -37,7 +37,7 @@
 #include "ActiveLayerTracker.h"
 
 #ifdef MOZ_WEBGL
-#include "../canvas/src/WebGL2Context.h"
+#include "WebGL2Context.h"
 #endif
 
 using namespace mozilla::layers;
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 88948c87527..a793993d989 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -171,11 +171,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/canvas/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
+    '/dom/canvas',
     '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
diff --git a/content/moz.build b/content/moz.build
index 6c174ed42c0..1dcdcad54c2 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -6,7 +6,6 @@
 
 PARALLEL_DIRS += [
     'base',
-    'canvas',
     'html',
     'mathml/content/src',
     'media',
diff --git a/content/test/reftest/reftest.list b/content/test/reftest/reftest.list
index 0042059d6a3..f292a87f41f 100644
--- a/content/test/reftest/reftest.list
+++ b/content/test/reftest/reftest.list
@@ -1,8 +1,3 @@
-# Canvas reftests
-# From: /content/test/reftest
-# To:   /content/canvas/test/reftest
-skip-if(xulFennec) include ../../canvas/test/reftest/reftest.list
-
 include ../../base/test/reftest/reftest.list # bug 920877
 
 == bug453105.html bug453105-ref.html
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 1162b0cedd6..c72a987d7b8 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -41,7 +41,6 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/canvas/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
@@ -54,6 +53,7 @@ LOCAL_INCLUDES += [
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
+    '/dom/canvas',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
diff --git a/content/canvas/src/CanvasGradient.h b/dom/canvas/CanvasGradient.h
similarity index 100%
rename from content/canvas/src/CanvasGradient.h
rename to dom/canvas/CanvasGradient.h
diff --git a/content/canvas/src/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp
similarity index 100%
rename from content/canvas/src/CanvasImageCache.cpp
rename to dom/canvas/CanvasImageCache.cpp
diff --git a/content/canvas/src/CanvasImageCache.h b/dom/canvas/CanvasImageCache.h
similarity index 100%
rename from content/canvas/src/CanvasImageCache.h
rename to dom/canvas/CanvasImageCache.h
diff --git a/content/canvas/src/CanvasPattern.h b/dom/canvas/CanvasPattern.h
similarity index 100%
rename from content/canvas/src/CanvasPattern.h
rename to dom/canvas/CanvasPattern.h
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
similarity index 100%
rename from content/canvas/src/CanvasRenderingContext2D.cpp
rename to dom/canvas/CanvasRenderingContext2D.cpp
diff --git a/content/canvas/src/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h
similarity index 100%
rename from content/canvas/src/CanvasRenderingContext2D.h
rename to dom/canvas/CanvasRenderingContext2D.h
diff --git a/content/canvas/src/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp
similarity index 100%
rename from content/canvas/src/CanvasUtils.cpp
rename to dom/canvas/CanvasUtils.cpp
diff --git a/content/canvas/src/CanvasUtils.h b/dom/canvas/CanvasUtils.h
similarity index 100%
rename from content/canvas/src/CanvasUtils.h
rename to dom/canvas/CanvasUtils.h
diff --git a/content/canvas/src/DocumentRendererChild.cpp b/dom/canvas/DocumentRendererChild.cpp
similarity index 100%
rename from content/canvas/src/DocumentRendererChild.cpp
rename to dom/canvas/DocumentRendererChild.cpp
diff --git a/content/canvas/public/DocumentRendererChild.h b/dom/canvas/DocumentRendererChild.h
similarity index 100%
rename from content/canvas/public/DocumentRendererChild.h
rename to dom/canvas/DocumentRendererChild.h
diff --git a/content/canvas/src/DocumentRendererParent.cpp b/dom/canvas/DocumentRendererParent.cpp
similarity index 100%
rename from content/canvas/src/DocumentRendererParent.cpp
rename to dom/canvas/DocumentRendererParent.cpp
diff --git a/content/canvas/public/DocumentRendererParent.h b/dom/canvas/DocumentRendererParent.h
similarity index 100%
rename from content/canvas/public/DocumentRendererParent.h
rename to dom/canvas/DocumentRendererParent.h
diff --git a/content/canvas/src/ImageData.cpp b/dom/canvas/ImageData.cpp
similarity index 100%
rename from content/canvas/src/ImageData.cpp
rename to dom/canvas/ImageData.cpp
diff --git a/content/canvas/src/ImageData.h b/dom/canvas/ImageData.h
similarity index 100%
rename from content/canvas/src/ImageData.h
rename to dom/canvas/ImageData.h
diff --git a/content/canvas/src/ImageEncoder.cpp b/dom/canvas/ImageEncoder.cpp
similarity index 100%
rename from content/canvas/src/ImageEncoder.cpp
rename to dom/canvas/ImageEncoder.cpp
diff --git a/content/canvas/src/ImageEncoder.h b/dom/canvas/ImageEncoder.h
similarity index 100%
rename from content/canvas/src/ImageEncoder.h
rename to dom/canvas/ImageEncoder.h
diff --git a/content/canvas/src/Makefile.in b/dom/canvas/Makefile.in
similarity index 100%
rename from content/canvas/src/Makefile.in
rename to dom/canvas/Makefile.in
diff --git a/content/canvas/src/MurmurHash3.cpp b/dom/canvas/MurmurHash3.cpp
similarity index 100%
rename from content/canvas/src/MurmurHash3.cpp
rename to dom/canvas/MurmurHash3.cpp
diff --git a/content/canvas/src/MurmurHash3.h b/dom/canvas/MurmurHash3.h
similarity index 100%
rename from content/canvas/src/MurmurHash3.h
rename to dom/canvas/MurmurHash3.h
diff --git a/content/canvas/src/TextMetrics.h b/dom/canvas/TextMetrics.h
similarity index 100%
rename from content/canvas/src/TextMetrics.h
rename to dom/canvas/TextMetrics.h
diff --git a/content/canvas/src/WebGL1Context.cpp b/dom/canvas/WebGL1Context.cpp
similarity index 100%
rename from content/canvas/src/WebGL1Context.cpp
rename to dom/canvas/WebGL1Context.cpp
diff --git a/content/canvas/src/WebGL1Context.h b/dom/canvas/WebGL1Context.h
similarity index 100%
rename from content/canvas/src/WebGL1Context.h
rename to dom/canvas/WebGL1Context.h
diff --git a/content/canvas/src/WebGL2Context.cpp b/dom/canvas/WebGL2Context.cpp
similarity index 100%
rename from content/canvas/src/WebGL2Context.cpp
rename to dom/canvas/WebGL2Context.cpp
diff --git a/content/canvas/src/WebGL2Context.h b/dom/canvas/WebGL2Context.h
similarity index 100%
rename from content/canvas/src/WebGL2Context.h
rename to dom/canvas/WebGL2Context.h
diff --git a/content/canvas/src/WebGLActiveInfo.cpp b/dom/canvas/WebGLActiveInfo.cpp
similarity index 100%
rename from content/canvas/src/WebGLActiveInfo.cpp
rename to dom/canvas/WebGLActiveInfo.cpp
diff --git a/content/canvas/src/WebGLActiveInfo.h b/dom/canvas/WebGLActiveInfo.h
similarity index 100%
rename from content/canvas/src/WebGLActiveInfo.h
rename to dom/canvas/WebGLActiveInfo.h
diff --git a/content/canvas/src/WebGLBuffer.cpp b/dom/canvas/WebGLBuffer.cpp
similarity index 100%
rename from content/canvas/src/WebGLBuffer.cpp
rename to dom/canvas/WebGLBuffer.cpp
diff --git a/content/canvas/src/WebGLBuffer.h b/dom/canvas/WebGLBuffer.h
similarity index 100%
rename from content/canvas/src/WebGLBuffer.h
rename to dom/canvas/WebGLBuffer.h
diff --git a/content/canvas/src/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
similarity index 100%
rename from content/canvas/src/WebGLContext.cpp
rename to dom/canvas/WebGLContext.cpp
diff --git a/content/canvas/src/WebGLContext.h b/dom/canvas/WebGLContext.h
similarity index 100%
rename from content/canvas/src/WebGLContext.h
rename to dom/canvas/WebGLContext.h
diff --git a/content/canvas/src/WebGLContextAsyncQueries.cpp b/dom/canvas/WebGLContextAsyncQueries.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextAsyncQueries.cpp
rename to dom/canvas/WebGLContextAsyncQueries.cpp
diff --git a/content/canvas/src/WebGLContextBuffers.cpp b/dom/canvas/WebGLContextBuffers.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextBuffers.cpp
rename to dom/canvas/WebGLContextBuffers.cpp
diff --git a/content/canvas/src/WebGLContextDraw.cpp b/dom/canvas/WebGLContextDraw.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextDraw.cpp
rename to dom/canvas/WebGLContextDraw.cpp
diff --git a/content/canvas/src/WebGLContextExtensions.cpp b/dom/canvas/WebGLContextExtensions.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextExtensions.cpp
rename to dom/canvas/WebGLContextExtensions.cpp
diff --git a/content/canvas/src/WebGLContextFramebufferOperations.cpp b/dom/canvas/WebGLContextFramebufferOperations.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextFramebufferOperations.cpp
rename to dom/canvas/WebGLContextFramebufferOperations.cpp
diff --git a/content/canvas/src/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextGL.cpp
rename to dom/canvas/WebGLContextGL.cpp
diff --git a/content/canvas/src/WebGLContextLossTimer.cpp b/dom/canvas/WebGLContextLossTimer.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextLossTimer.cpp
rename to dom/canvas/WebGLContextLossTimer.cpp
diff --git a/content/canvas/src/WebGLContextNotSupported.cpp b/dom/canvas/WebGLContextNotSupported.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextNotSupported.cpp
rename to dom/canvas/WebGLContextNotSupported.cpp
diff --git a/content/canvas/src/WebGLContextReporter.cpp b/dom/canvas/WebGLContextReporter.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextReporter.cpp
rename to dom/canvas/WebGLContextReporter.cpp
diff --git a/content/canvas/src/WebGLContextState.cpp b/dom/canvas/WebGLContextState.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextState.cpp
rename to dom/canvas/WebGLContextState.cpp
diff --git a/content/canvas/src/WebGLContextUtils.cpp b/dom/canvas/WebGLContextUtils.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextUtils.cpp
rename to dom/canvas/WebGLContextUtils.cpp
diff --git a/content/canvas/src/WebGLContextUtils.h b/dom/canvas/WebGLContextUtils.h
similarity index 100%
rename from content/canvas/src/WebGLContextUtils.h
rename to dom/canvas/WebGLContextUtils.h
diff --git a/content/canvas/src/WebGLContextValidate.cpp b/dom/canvas/WebGLContextValidate.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextValidate.cpp
rename to dom/canvas/WebGLContextValidate.cpp
diff --git a/content/canvas/src/WebGLContextVertexArray.cpp b/dom/canvas/WebGLContextVertexArray.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextVertexArray.cpp
rename to dom/canvas/WebGLContextVertexArray.cpp
diff --git a/content/canvas/src/WebGLContextVertices.cpp b/dom/canvas/WebGLContextVertices.cpp
similarity index 100%
rename from content/canvas/src/WebGLContextVertices.cpp
rename to dom/canvas/WebGLContextVertices.cpp
diff --git a/content/canvas/src/WebGLElementArrayCache.cpp b/dom/canvas/WebGLElementArrayCache.cpp
similarity index 100%
rename from content/canvas/src/WebGLElementArrayCache.cpp
rename to dom/canvas/WebGLElementArrayCache.cpp
diff --git a/content/canvas/src/WebGLElementArrayCache.h b/dom/canvas/WebGLElementArrayCache.h
similarity index 100%
rename from content/canvas/src/WebGLElementArrayCache.h
rename to dom/canvas/WebGLElementArrayCache.h
diff --git a/content/canvas/src/WebGLExtensionBase.cpp b/dom/canvas/WebGLExtensionBase.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionBase.cpp
rename to dom/canvas/WebGLExtensionBase.cpp
diff --git a/content/canvas/src/WebGLExtensionBlendMinMax.cpp b/dom/canvas/WebGLExtensionBlendMinMax.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionBlendMinMax.cpp
rename to dom/canvas/WebGLExtensionBlendMinMax.cpp
diff --git a/content/canvas/src/WebGLExtensionColorBufferFloat.cpp b/dom/canvas/WebGLExtensionColorBufferFloat.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionColorBufferFloat.cpp
rename to dom/canvas/WebGLExtensionColorBufferFloat.cpp
diff --git a/content/canvas/src/WebGLExtensionColorBufferHalfFloat.cpp b/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionColorBufferHalfFloat.cpp
rename to dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp
diff --git a/content/canvas/src/WebGLExtensionCompressedTextureATC.cpp b/dom/canvas/WebGLExtensionCompressedTextureATC.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionCompressedTextureATC.cpp
rename to dom/canvas/WebGLExtensionCompressedTextureATC.cpp
diff --git a/content/canvas/src/WebGLExtensionCompressedTextureETC1.cpp b/dom/canvas/WebGLExtensionCompressedTextureETC1.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionCompressedTextureETC1.cpp
rename to dom/canvas/WebGLExtensionCompressedTextureETC1.cpp
diff --git a/content/canvas/src/WebGLExtensionCompressedTexturePVRTC.cpp b/dom/canvas/WebGLExtensionCompressedTexturePVRTC.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionCompressedTexturePVRTC.cpp
rename to dom/canvas/WebGLExtensionCompressedTexturePVRTC.cpp
diff --git a/content/canvas/src/WebGLExtensionCompressedTextureS3TC.cpp b/dom/canvas/WebGLExtensionCompressedTextureS3TC.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionCompressedTextureS3TC.cpp
rename to dom/canvas/WebGLExtensionCompressedTextureS3TC.cpp
diff --git a/content/canvas/src/WebGLExtensionDebugRendererInfo.cpp b/dom/canvas/WebGLExtensionDebugRendererInfo.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionDebugRendererInfo.cpp
rename to dom/canvas/WebGLExtensionDebugRendererInfo.cpp
diff --git a/content/canvas/src/WebGLExtensionDebugShaders.cpp b/dom/canvas/WebGLExtensionDebugShaders.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionDebugShaders.cpp
rename to dom/canvas/WebGLExtensionDebugShaders.cpp
diff --git a/content/canvas/src/WebGLExtensionDepthTexture.cpp b/dom/canvas/WebGLExtensionDepthTexture.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionDepthTexture.cpp
rename to dom/canvas/WebGLExtensionDepthTexture.cpp
diff --git a/content/canvas/src/WebGLExtensionDrawBuffers.cpp b/dom/canvas/WebGLExtensionDrawBuffers.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionDrawBuffers.cpp
rename to dom/canvas/WebGLExtensionDrawBuffers.cpp
diff --git a/content/canvas/src/WebGLExtensionElementIndexUint.cpp b/dom/canvas/WebGLExtensionElementIndexUint.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionElementIndexUint.cpp
rename to dom/canvas/WebGLExtensionElementIndexUint.cpp
diff --git a/content/canvas/src/WebGLExtensionFragDepth.cpp b/dom/canvas/WebGLExtensionFragDepth.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionFragDepth.cpp
rename to dom/canvas/WebGLExtensionFragDepth.cpp
diff --git a/content/canvas/src/WebGLExtensionInstancedArrays.cpp b/dom/canvas/WebGLExtensionInstancedArrays.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionInstancedArrays.cpp
rename to dom/canvas/WebGLExtensionInstancedArrays.cpp
diff --git a/content/canvas/src/WebGLExtensionLoseContext.cpp b/dom/canvas/WebGLExtensionLoseContext.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionLoseContext.cpp
rename to dom/canvas/WebGLExtensionLoseContext.cpp
diff --git a/content/canvas/src/WebGLExtensionSRGB.cpp b/dom/canvas/WebGLExtensionSRGB.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionSRGB.cpp
rename to dom/canvas/WebGLExtensionSRGB.cpp
diff --git a/content/canvas/src/WebGLExtensionStandardDerivatives.cpp b/dom/canvas/WebGLExtensionStandardDerivatives.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionStandardDerivatives.cpp
rename to dom/canvas/WebGLExtensionStandardDerivatives.cpp
diff --git a/content/canvas/src/WebGLExtensionTextureFilterAnisotropic.cpp b/dom/canvas/WebGLExtensionTextureFilterAnisotropic.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionTextureFilterAnisotropic.cpp
rename to dom/canvas/WebGLExtensionTextureFilterAnisotropic.cpp
diff --git a/content/canvas/src/WebGLExtensionTextureFloat.cpp b/dom/canvas/WebGLExtensionTextureFloat.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionTextureFloat.cpp
rename to dom/canvas/WebGLExtensionTextureFloat.cpp
diff --git a/content/canvas/src/WebGLExtensionTextureFloatLinear.cpp b/dom/canvas/WebGLExtensionTextureFloatLinear.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionTextureFloatLinear.cpp
rename to dom/canvas/WebGLExtensionTextureFloatLinear.cpp
diff --git a/content/canvas/src/WebGLExtensionTextureHalfFloat.cpp b/dom/canvas/WebGLExtensionTextureHalfFloat.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionTextureHalfFloat.cpp
rename to dom/canvas/WebGLExtensionTextureHalfFloat.cpp
diff --git a/content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp b/dom/canvas/WebGLExtensionTextureHalfFloatLinear.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp
rename to dom/canvas/WebGLExtensionTextureHalfFloatLinear.cpp
diff --git a/content/canvas/src/WebGLExtensionVertexArray.cpp b/dom/canvas/WebGLExtensionVertexArray.cpp
similarity index 100%
rename from content/canvas/src/WebGLExtensionVertexArray.cpp
rename to dom/canvas/WebGLExtensionVertexArray.cpp
diff --git a/content/canvas/src/WebGLExtensions.h b/dom/canvas/WebGLExtensions.h
similarity index 100%
rename from content/canvas/src/WebGLExtensions.h
rename to dom/canvas/WebGLExtensions.h
diff --git a/content/canvas/src/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp
similarity index 100%
rename from content/canvas/src/WebGLFramebuffer.cpp
rename to dom/canvas/WebGLFramebuffer.cpp
diff --git a/content/canvas/src/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h
similarity index 100%
rename from content/canvas/src/WebGLFramebuffer.h
rename to dom/canvas/WebGLFramebuffer.h
diff --git a/content/canvas/src/WebGLFramebufferAttachable.cpp b/dom/canvas/WebGLFramebufferAttachable.cpp
similarity index 100%
rename from content/canvas/src/WebGLFramebufferAttachable.cpp
rename to dom/canvas/WebGLFramebufferAttachable.cpp
diff --git a/content/canvas/src/WebGLFramebufferAttachable.h b/dom/canvas/WebGLFramebufferAttachable.h
similarity index 100%
rename from content/canvas/src/WebGLFramebufferAttachable.h
rename to dom/canvas/WebGLFramebufferAttachable.h
diff --git a/content/canvas/src/WebGLMemoryTracker.h b/dom/canvas/WebGLMemoryTracker.h
similarity index 100%
rename from content/canvas/src/WebGLMemoryTracker.h
rename to dom/canvas/WebGLMemoryTracker.h
diff --git a/content/canvas/src/WebGLObjectModel.cpp b/dom/canvas/WebGLObjectModel.cpp
similarity index 100%
rename from content/canvas/src/WebGLObjectModel.cpp
rename to dom/canvas/WebGLObjectModel.cpp
diff --git a/content/canvas/src/WebGLObjectModel.h b/dom/canvas/WebGLObjectModel.h
similarity index 100%
rename from content/canvas/src/WebGLObjectModel.h
rename to dom/canvas/WebGLObjectModel.h
diff --git a/content/canvas/src/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp
similarity index 100%
rename from content/canvas/src/WebGLProgram.cpp
rename to dom/canvas/WebGLProgram.cpp
diff --git a/content/canvas/src/WebGLProgram.h b/dom/canvas/WebGLProgram.h
similarity index 100%
rename from content/canvas/src/WebGLProgram.h
rename to dom/canvas/WebGLProgram.h
diff --git a/content/canvas/src/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp
similarity index 100%
rename from content/canvas/src/WebGLQuery.cpp
rename to dom/canvas/WebGLQuery.cpp
diff --git a/content/canvas/src/WebGLQuery.h b/dom/canvas/WebGLQuery.h
similarity index 100%
rename from content/canvas/src/WebGLQuery.h
rename to dom/canvas/WebGLQuery.h
diff --git a/content/canvas/src/WebGLRenderbuffer.cpp b/dom/canvas/WebGLRenderbuffer.cpp
similarity index 100%
rename from content/canvas/src/WebGLRenderbuffer.cpp
rename to dom/canvas/WebGLRenderbuffer.cpp
diff --git a/content/canvas/src/WebGLRenderbuffer.h b/dom/canvas/WebGLRenderbuffer.h
similarity index 100%
rename from content/canvas/src/WebGLRenderbuffer.h
rename to dom/canvas/WebGLRenderbuffer.h
diff --git a/content/canvas/src/WebGLShader.cpp b/dom/canvas/WebGLShader.cpp
similarity index 100%
rename from content/canvas/src/WebGLShader.cpp
rename to dom/canvas/WebGLShader.cpp
diff --git a/content/canvas/src/WebGLShader.h b/dom/canvas/WebGLShader.h
similarity index 100%
rename from content/canvas/src/WebGLShader.h
rename to dom/canvas/WebGLShader.h
diff --git a/content/canvas/src/WebGLShaderPrecisionFormat.cpp b/dom/canvas/WebGLShaderPrecisionFormat.cpp
similarity index 100%
rename from content/canvas/src/WebGLShaderPrecisionFormat.cpp
rename to dom/canvas/WebGLShaderPrecisionFormat.cpp
diff --git a/content/canvas/src/WebGLShaderPrecisionFormat.h b/dom/canvas/WebGLShaderPrecisionFormat.h
similarity index 100%
rename from content/canvas/src/WebGLShaderPrecisionFormat.h
rename to dom/canvas/WebGLShaderPrecisionFormat.h
diff --git a/content/canvas/src/WebGLTexelConversions.cpp b/dom/canvas/WebGLTexelConversions.cpp
similarity index 100%
rename from content/canvas/src/WebGLTexelConversions.cpp
rename to dom/canvas/WebGLTexelConversions.cpp
diff --git a/content/canvas/src/WebGLTexelConversions.h b/dom/canvas/WebGLTexelConversions.h
similarity index 100%
rename from content/canvas/src/WebGLTexelConversions.h
rename to dom/canvas/WebGLTexelConversions.h
diff --git a/content/canvas/src/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp
similarity index 100%
rename from content/canvas/src/WebGLTexture.cpp
rename to dom/canvas/WebGLTexture.cpp
diff --git a/content/canvas/src/WebGLTexture.h b/dom/canvas/WebGLTexture.h
similarity index 100%
rename from content/canvas/src/WebGLTexture.h
rename to dom/canvas/WebGLTexture.h
diff --git a/content/canvas/src/WebGLTypes.h b/dom/canvas/WebGLTypes.h
similarity index 100%
rename from content/canvas/src/WebGLTypes.h
rename to dom/canvas/WebGLTypes.h
diff --git a/content/canvas/src/WebGLUniformInfo.h b/dom/canvas/WebGLUniformInfo.h
similarity index 100%
rename from content/canvas/src/WebGLUniformInfo.h
rename to dom/canvas/WebGLUniformInfo.h
diff --git a/content/canvas/src/WebGLUniformLocation.cpp b/dom/canvas/WebGLUniformLocation.cpp
similarity index 100%
rename from content/canvas/src/WebGLUniformLocation.cpp
rename to dom/canvas/WebGLUniformLocation.cpp
diff --git a/content/canvas/src/WebGLUniformLocation.h b/dom/canvas/WebGLUniformLocation.h
similarity index 100%
rename from content/canvas/src/WebGLUniformLocation.h
rename to dom/canvas/WebGLUniformLocation.h
diff --git a/content/canvas/src/WebGLValidateStrings.h b/dom/canvas/WebGLValidateStrings.h
similarity index 100%
rename from content/canvas/src/WebGLValidateStrings.h
rename to dom/canvas/WebGLValidateStrings.h
diff --git a/content/canvas/src/WebGLVertexArray.cpp b/dom/canvas/WebGLVertexArray.cpp
similarity index 100%
rename from content/canvas/src/WebGLVertexArray.cpp
rename to dom/canvas/WebGLVertexArray.cpp
diff --git a/content/canvas/src/WebGLVertexArray.h b/dom/canvas/WebGLVertexArray.h
similarity index 100%
rename from content/canvas/src/WebGLVertexArray.h
rename to dom/canvas/WebGLVertexArray.h
diff --git a/content/canvas/src/WebGLVertexArrayFake.cpp b/dom/canvas/WebGLVertexArrayFake.cpp
similarity index 100%
rename from content/canvas/src/WebGLVertexArrayFake.cpp
rename to dom/canvas/WebGLVertexArrayFake.cpp
diff --git a/content/canvas/src/WebGLVertexArrayFake.h b/dom/canvas/WebGLVertexArrayFake.h
similarity index 100%
rename from content/canvas/src/WebGLVertexArrayFake.h
rename to dom/canvas/WebGLVertexArrayFake.h
diff --git a/content/canvas/src/WebGLVertexArrayGL.cpp b/dom/canvas/WebGLVertexArrayGL.cpp
similarity index 100%
rename from content/canvas/src/WebGLVertexArrayGL.cpp
rename to dom/canvas/WebGLVertexArrayGL.cpp
diff --git a/content/canvas/src/WebGLVertexArrayGL.h b/dom/canvas/WebGLVertexArrayGL.h
similarity index 100%
rename from content/canvas/src/WebGLVertexArrayGL.h
rename to dom/canvas/WebGLVertexArrayGL.h
diff --git a/content/canvas/src/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h
similarity index 100%
rename from content/canvas/src/WebGLVertexAttribData.h
rename to dom/canvas/WebGLVertexAttribData.h
diff --git a/content/canvas/compiledtest/TestWebGLElementArrayCache.cpp b/dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp
similarity index 100%
rename from content/canvas/compiledtest/TestWebGLElementArrayCache.cpp
rename to dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp
diff --git a/content/canvas/compiledtest/moz.build b/dom/canvas/compiledtest/moz.build
similarity index 97%
rename from content/canvas/compiledtest/moz.build
rename to dom/canvas/compiledtest/moz.build
index 41bf30506e3..0de02180e44 100644
--- a/content/canvas/compiledtest/moz.build
+++ b/dom/canvas/compiledtest/moz.build
@@ -13,7 +13,7 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../src',
+    '../',
 ]
 
 USE_LIBS += [
diff --git a/content/canvas/crashtests/0px-size-font-667225.html b/dom/canvas/crashtests/0px-size-font-667225.html
similarity index 100%
rename from content/canvas/crashtests/0px-size-font-667225.html
rename to dom/canvas/crashtests/0px-size-font-667225.html
diff --git a/content/canvas/crashtests/0px-size-font-shadow.html b/dom/canvas/crashtests/0px-size-font-shadow.html
similarity index 100%
rename from content/canvas/crashtests/0px-size-font-shadow.html
rename to dom/canvas/crashtests/0px-size-font-shadow.html
diff --git a/content/canvas/crashtests/360293-1.html b/dom/canvas/crashtests/360293-1.html
similarity index 100%
rename from content/canvas/crashtests/360293-1.html
rename to dom/canvas/crashtests/360293-1.html
diff --git a/content/canvas/crashtests/421715-1.html b/dom/canvas/crashtests/421715-1.html
similarity index 100%
rename from content/canvas/crashtests/421715-1.html
rename to dom/canvas/crashtests/421715-1.html
diff --git a/content/canvas/crashtests/553938-1.html b/dom/canvas/crashtests/553938-1.html
similarity index 100%
rename from content/canvas/crashtests/553938-1.html
rename to dom/canvas/crashtests/553938-1.html
diff --git a/content/canvas/crashtests/647480.html b/dom/canvas/crashtests/647480.html
similarity index 100%
rename from content/canvas/crashtests/647480.html
rename to dom/canvas/crashtests/647480.html
diff --git a/content/canvas/crashtests/727547.html b/dom/canvas/crashtests/727547.html
similarity index 100%
rename from content/canvas/crashtests/727547.html
rename to dom/canvas/crashtests/727547.html
diff --git a/content/canvas/crashtests/729116.html b/dom/canvas/crashtests/729116.html
similarity index 100%
rename from content/canvas/crashtests/729116.html
rename to dom/canvas/crashtests/729116.html
diff --git a/content/canvas/crashtests/743499-negative-size.html b/dom/canvas/crashtests/743499-negative-size.html
similarity index 100%
rename from content/canvas/crashtests/743499-negative-size.html
rename to dom/canvas/crashtests/743499-negative-size.html
diff --git a/content/canvas/crashtests/745699-1.html b/dom/canvas/crashtests/745699-1.html
similarity index 100%
rename from content/canvas/crashtests/745699-1.html
rename to dom/canvas/crashtests/745699-1.html
diff --git a/content/canvas/crashtests/745818-large-source.html b/dom/canvas/crashtests/745818-large-source.html
similarity index 100%
rename from content/canvas/crashtests/745818-large-source.html
rename to dom/canvas/crashtests/745818-large-source.html
diff --git a/content/canvas/crashtests/746813-1.html b/dom/canvas/crashtests/746813-1.html
similarity index 100%
rename from content/canvas/crashtests/746813-1.html
rename to dom/canvas/crashtests/746813-1.html
diff --git a/content/canvas/crashtests/767337-1.html b/dom/canvas/crashtests/767337-1.html
similarity index 100%
rename from content/canvas/crashtests/767337-1.html
rename to dom/canvas/crashtests/767337-1.html
diff --git a/content/canvas/crashtests/780392-1.html b/dom/canvas/crashtests/780392-1.html
similarity index 100%
rename from content/canvas/crashtests/780392-1.html
rename to dom/canvas/crashtests/780392-1.html
diff --git a/content/canvas/crashtests/789933-1.html b/dom/canvas/crashtests/789933-1.html
similarity index 100%
rename from content/canvas/crashtests/789933-1.html
rename to dom/canvas/crashtests/789933-1.html
diff --git a/content/canvas/crashtests/794463-1.html b/dom/canvas/crashtests/794463-1.html
similarity index 100%
rename from content/canvas/crashtests/794463-1.html
rename to dom/canvas/crashtests/794463-1.html
diff --git a/content/canvas/crashtests/802926-1.html b/dom/canvas/crashtests/802926-1.html
similarity index 100%
rename from content/canvas/crashtests/802926-1.html
rename to dom/canvas/crashtests/802926-1.html
diff --git a/content/canvas/crashtests/896047-1.html b/dom/canvas/crashtests/896047-1.html
similarity index 100%
rename from content/canvas/crashtests/896047-1.html
rename to dom/canvas/crashtests/896047-1.html
diff --git a/content/canvas/crashtests/896047-2.html b/dom/canvas/crashtests/896047-2.html
similarity index 100%
rename from content/canvas/crashtests/896047-2.html
rename to dom/canvas/crashtests/896047-2.html
diff --git a/content/canvas/crashtests/916128-1.html b/dom/canvas/crashtests/916128-1.html
similarity index 100%
rename from content/canvas/crashtests/916128-1.html
rename to dom/canvas/crashtests/916128-1.html
diff --git a/content/canvas/crashtests/934939-1.html b/dom/canvas/crashtests/934939-1.html
similarity index 100%
rename from content/canvas/crashtests/934939-1.html
rename to dom/canvas/crashtests/934939-1.html
diff --git a/content/canvas/crashtests/crashtests.list b/dom/canvas/crashtests/crashtests.list
similarity index 100%
rename from content/canvas/crashtests/crashtests.list
rename to dom/canvas/crashtests/crashtests.list
diff --git a/content/canvas/crashtests/texImage2D.html b/dom/canvas/crashtests/texImage2D.html
similarity index 100%
rename from content/canvas/crashtests/texImage2D.html
rename to dom/canvas/crashtests/texImage2D.html
diff --git a/content/canvas/src/moz.build b/dom/canvas/moz.build
similarity index 94%
rename from content/canvas/src/moz.build
rename to dom/canvas/moz.build
index f19d13d525e..c2528cde2b3 100644
--- a/content/canvas/src/moz.build
+++ b/dom/canvas/moz.build
@@ -4,6 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+TEST_DIRS += ['test']
+TEST_TOOL_DIRS += ['compiledtest']
+
+EXPORTS += [
+    'nsICanvasRenderingContextInternal.h',
+]
+
+EXPORTS.mozilla.ipc += [
+    'DocumentRendererChild.h',
+    'DocumentRendererParent.h',
+]
+
 EXPORTS.mozilla.dom += [
     'CanvasGradient.h',
     'CanvasPattern.h',
diff --git a/content/canvas/public/nsICanvasRenderingContextInternal.h b/dom/canvas/nsICanvasRenderingContextInternal.h
similarity index 100%
rename from content/canvas/public/nsICanvasRenderingContextInternal.h
rename to dom/canvas/nsICanvasRenderingContextInternal.h
diff --git a/dom/canvas/test/android.json b/dom/canvas/test/android.json
new file mode 100644
index 00000000000..6170e32fb5f
--- /dev/null
+++ b/dom/canvas/test/android.json
@@ -0,0 +1,6 @@
+{
+  "runtests": {},
+  "excludetests": {
+      "dom/canvas/test/webgl/test_webgl_conformance_test_suite.html": ""
+  }
+}
diff --git a/content/canvas/test/chrome/chrome.ini b/dom/canvas/test/chrome/chrome.ini
similarity index 100%
rename from content/canvas/test/chrome/chrome.ini
rename to dom/canvas/test/chrome/chrome.ini
diff --git a/content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html b/dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html
similarity index 100%
rename from content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html
rename to dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html
diff --git a/content/canvas/test/chrome/test_drawWindow_widget_layers.html b/dom/canvas/test/chrome/test_drawWindow_widget_layers.html
similarity index 100%
rename from content/canvas/test/chrome/test_drawWindow_widget_layers.html
rename to dom/canvas/test/chrome/test_drawWindow_widget_layers.html
diff --git a/content/canvas/test/chrome/test_webgl_debug_renderer_info.html b/dom/canvas/test/chrome/test_webgl_debug_renderer_info.html
similarity index 96%
rename from content/canvas/test/chrome/test_webgl_debug_renderer_info.html
rename to dom/canvas/test/chrome/test_webgl_debug_renderer_info.html
index abd9a4b714e..46fabe54f74 100644
--- a/content/canvas/test/chrome/test_webgl_debug_renderer_info.html
+++ b/dom/canvas/test/chrome/test_webgl_debug_renderer_info.html
@@ -67,7 +67,7 @@ function main()
   // Now run the non-chrome code to verify the security of this WebGL chrome-only extension.
 
   var iframe = document.createElement("iframe");
-  iframe.src = "http://mochi.test:8888/chrome/content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html";
+  iframe.src = "http://mochi.test:8888/chrome/dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html";
 
   iframe.onload = function () {
 
diff --git a/content/canvas/test/crossorigin/image-allow-credentials.png b/dom/canvas/test/crossorigin/image-allow-credentials.png
similarity index 100%
rename from content/canvas/test/crossorigin/image-allow-credentials.png
rename to dom/canvas/test/crossorigin/image-allow-credentials.png
diff --git a/content/canvas/test/crossorigin/image-allow-credentials.png^headers^ b/dom/canvas/test/crossorigin/image-allow-credentials.png^headers^
similarity index 100%
rename from content/canvas/test/crossorigin/image-allow-credentials.png^headers^
rename to dom/canvas/test/crossorigin/image-allow-credentials.png^headers^
diff --git a/content/canvas/test/crossorigin/image-allow-star.png b/dom/canvas/test/crossorigin/image-allow-star.png
similarity index 100%
rename from content/canvas/test/crossorigin/image-allow-star.png
rename to dom/canvas/test/crossorigin/image-allow-star.png
diff --git a/content/canvas/test/crossorigin/image-allow-star.png^headers^ b/dom/canvas/test/crossorigin/image-allow-star.png^headers^
similarity index 100%
rename from content/canvas/test/crossorigin/image-allow-star.png^headers^
rename to dom/canvas/test/crossorigin/image-allow-star.png^headers^
diff --git a/content/canvas/test/crossorigin/image.png b/dom/canvas/test/crossorigin/image.png
similarity index 100%
rename from content/canvas/test/crossorigin/image.png
rename to dom/canvas/test/crossorigin/image.png
diff --git a/content/canvas/test/crossorigin/mochitest.ini b/dom/canvas/test/crossorigin/mochitest.ini
similarity index 100%
rename from content/canvas/test/crossorigin/mochitest.ini
rename to dom/canvas/test/crossorigin/mochitest.ini
diff --git a/content/canvas/test/crossorigin/test_canvas2d_crossorigin.html b/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
similarity index 98%
rename from content/canvas/test/crossorigin/test_canvas2d_crossorigin.html
rename to dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
index 81a11176de7..6571542be9f 100644
--- a/content/canvas/test/crossorigin/test_canvas2d_crossorigin.html
+++ b/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
@@ -106,7 +106,7 @@ function testImage(url, crossOriginAttribute, expected_error) {
 }
 
 // Now kick off the tests.
-const testPath = "/tests/content/canvas/test/crossorigin/"
+const testPath = "/tests/dom/canvas/test/crossorigin/"
 
 // First column is image file, second column is what CORS headers the server sends
 const imageFiles = [
diff --git a/content/canvas/test/crossorigin/test_video_crossorigin.html b/dom/canvas/test/crossorigin/test_video_crossorigin.html
similarity index 98%
rename from content/canvas/test/crossorigin/test_video_crossorigin.html
rename to dom/canvas/test/crossorigin/test_video_crossorigin.html
index 5ae2313d4a3..ffd4bcb5110 100644
--- a/content/canvas/test/crossorigin/test_video_crossorigin.html
+++ b/dom/canvas/test/crossorigin/test_video_crossorigin.html
@@ -158,7 +158,7 @@ try {
 var manager = new MediaTestManager;
 var corsTests = [];
 
-const host = "http://example.com/tests/content/canvas/test/crossorigin/video.sjs";
+const host = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs";
 const serverAttrValues = [
   [ "&cors=none", "none" ],
   [ "&cors=anonymous", "anonymous" ],
diff --git a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html b/dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
similarity index 65%
rename from content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
rename to dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
index 2eaa38e133f..545048a340d 100644
--- a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
+++ b/dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
@@ -73,68 +73,68 @@
     }
 
 
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 "SecurityError");
 
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "use-credentials",
                 "SecurityError");
 
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "use-credentials",
                 OK);
 
     // Test that bad values for crossorigin="..." are interpreted as invalid-value-default which is "anonymous".
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "foobar",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "foobar",
                 OK);
 
diff --git a/content/canvas/test/crossorigin/video.sjs b/dom/canvas/test/crossorigin/video.sjs
similarity index 100%
rename from content/canvas/test/crossorigin/video.sjs
rename to dom/canvas/test/crossorigin/video.sjs
diff --git a/content/canvas/test/file_drawImage_document_domain.html b/dom/canvas/test/file_drawImage_document_domain.html
similarity index 100%
rename from content/canvas/test/file_drawImage_document_domain.html
rename to dom/canvas/test/file_drawImage_document_domain.html
diff --git a/content/canvas/test/file_drawWindow_common.js b/dom/canvas/test/file_drawWindow_common.js
similarity index 100%
rename from content/canvas/test/file_drawWindow_common.js
rename to dom/canvas/test/file_drawWindow_common.js
diff --git a/content/canvas/test/file_drawWindow_source.html b/dom/canvas/test/file_drawWindow_source.html
similarity index 100%
rename from content/canvas/test/file_drawWindow_source.html
rename to dom/canvas/test/file_drawWindow_source.html
diff --git a/content/canvas/test/image_anim-gr.gif b/dom/canvas/test/image_anim-gr.gif
similarity index 100%
rename from content/canvas/test/image_anim-gr.gif
rename to dom/canvas/test/image_anim-gr.gif
diff --git a/content/canvas/test/image_anim-gr.png b/dom/canvas/test/image_anim-gr.png
similarity index 100%
rename from content/canvas/test/image_anim-gr.png
rename to dom/canvas/test/image_anim-gr.png
diff --git a/content/canvas/test/image_anim-poster-gr.png b/dom/canvas/test/image_anim-poster-gr.png
similarity index 100%
rename from content/canvas/test/image_anim-poster-gr.png
rename to dom/canvas/test/image_anim-poster-gr.png
diff --git a/content/canvas/test/image_broken.png b/dom/canvas/test/image_broken.png
similarity index 100%
rename from content/canvas/test/image_broken.png
rename to dom/canvas/test/image_broken.png
diff --git a/content/canvas/test/image_ggrr-256x256.png b/dom/canvas/test/image_ggrr-256x256.png
similarity index 100%
rename from content/canvas/test/image_ggrr-256x256.png
rename to dom/canvas/test/image_ggrr-256x256.png
diff --git a/content/canvas/test/image_green-16x16.png b/dom/canvas/test/image_green-16x16.png
similarity index 100%
rename from content/canvas/test/image_green-16x16.png
rename to dom/canvas/test/image_green-16x16.png
diff --git a/content/canvas/test/image_green-1x1.png b/dom/canvas/test/image_green-1x1.png
similarity index 100%
rename from content/canvas/test/image_green-1x1.png
rename to dom/canvas/test/image_green-1x1.png
diff --git a/content/canvas/test/image_green-redirect b/dom/canvas/test/image_green-redirect
similarity index 100%
rename from content/canvas/test/image_green-redirect
rename to dom/canvas/test/image_green-redirect
diff --git a/dom/canvas/test/image_green-redirect^headers^ b/dom/canvas/test/image_green-redirect^headers^
new file mode 100644
index 00000000000..a5b6cb7446e
--- /dev/null
+++ b/dom/canvas/test/image_green-redirect^headers^
@@ -0,0 +1,2 @@
+HTTP 302 Moved
+Location: http://example.com/tests/dom/canvas/test/image_green-1x1.png
diff --git a/content/canvas/test/image_green.png b/dom/canvas/test/image_green.png
similarity index 100%
rename from content/canvas/test/image_green.png
rename to dom/canvas/test/image_green.png
diff --git a/content/canvas/test/image_red-16x16.png b/dom/canvas/test/image_red-16x16.png
similarity index 100%
rename from content/canvas/test/image_red-16x16.png
rename to dom/canvas/test/image_red-16x16.png
diff --git a/content/canvas/test/image_red.png b/dom/canvas/test/image_red.png
similarity index 100%
rename from content/canvas/test/image_red.png
rename to dom/canvas/test/image_red.png
diff --git a/content/canvas/test/image_redtransparent.png b/dom/canvas/test/image_redtransparent.png
similarity index 100%
rename from content/canvas/test/image_redtransparent.png
rename to dom/canvas/test/image_redtransparent.png
diff --git a/content/canvas/test/image_rgrg-256x256.png b/dom/canvas/test/image_rgrg-256x256.png
similarity index 100%
rename from content/canvas/test/image_rgrg-256x256.png
rename to dom/canvas/test/image_rgrg-256x256.png
diff --git a/content/canvas/test/image_rrgg-256x256.png b/dom/canvas/test/image_rrgg-256x256.png
similarity index 100%
rename from content/canvas/test/image_rrgg-256x256.png
rename to dom/canvas/test/image_rrgg-256x256.png
diff --git a/content/canvas/test/image_transparent.png b/dom/canvas/test/image_transparent.png
similarity index 100%
rename from content/canvas/test/image_transparent.png
rename to dom/canvas/test/image_transparent.png
diff --git a/content/canvas/test/image_transparent50.png b/dom/canvas/test/image_transparent50.png
similarity index 100%
rename from content/canvas/test/image_transparent50.png
rename to dom/canvas/test/image_transparent50.png
diff --git a/content/canvas/test/image_yellow.png b/dom/canvas/test/image_yellow.png
similarity index 100%
rename from content/canvas/test/image_yellow.png
rename to dom/canvas/test/image_yellow.png
diff --git a/content/canvas/test/image_yellow75.png b/dom/canvas/test/image_yellow75.png
similarity index 100%
rename from content/canvas/test/image_yellow75.png
rename to dom/canvas/test/image_yellow75.png
diff --git a/content/canvas/test/mochitest.ini b/dom/canvas/test/mochitest.ini
similarity index 100%
rename from content/canvas/test/mochitest.ini
rename to dom/canvas/test/mochitest.ini
diff --git a/content/canvas/test/moz.build b/dom/canvas/test/moz.build
similarity index 100%
rename from content/canvas/test/moz.build
rename to dom/canvas/test/moz.build
diff --git a/content/canvas/test/reftest/black.html b/dom/canvas/test/reftest/black.html
similarity index 100%
rename from content/canvas/test/reftest/black.html
rename to dom/canvas/test/reftest/black.html
diff --git a/content/canvas/test/reftest/clip-multiple-paths-badref.html b/dom/canvas/test/reftest/clip-multiple-paths-badref.html
similarity index 100%
rename from content/canvas/test/reftest/clip-multiple-paths-badref.html
rename to dom/canvas/test/reftest/clip-multiple-paths-badref.html
diff --git a/content/canvas/test/reftest/clip-multiple-paths.html b/dom/canvas/test/reftest/clip-multiple-paths.html
similarity index 100%
rename from content/canvas/test/reftest/clip-multiple-paths.html
rename to dom/canvas/test/reftest/clip-multiple-paths.html
diff --git a/content/canvas/test/reftest/colors-half-alpha.png b/dom/canvas/test/reftest/colors-half-alpha.png
similarity index 100%
rename from content/canvas/test/reftest/colors-half-alpha.png
rename to dom/canvas/test/reftest/colors-half-alpha.png
diff --git a/content/canvas/test/reftest/colors.png b/dom/canvas/test/reftest/colors.png
similarity index 100%
rename from content/canvas/test/reftest/colors.png
rename to dom/canvas/test/reftest/colors.png
diff --git a/content/canvas/test/reftest/drawCustomFocusRing-ref.html b/dom/canvas/test/reftest/drawCustomFocusRing-ref.html
similarity index 100%
rename from content/canvas/test/reftest/drawCustomFocusRing-ref.html
rename to dom/canvas/test/reftest/drawCustomFocusRing-ref.html
diff --git a/content/canvas/test/reftest/drawCustomFocusRing.html b/dom/canvas/test/reftest/drawCustomFocusRing.html
similarity index 100%
rename from content/canvas/test/reftest/drawCustomFocusRing.html
rename to dom/canvas/test/reftest/drawCustomFocusRing.html
diff --git a/content/canvas/test/reftest/drawFocusIfNeeded-ref.html b/dom/canvas/test/reftest/drawFocusIfNeeded-ref.html
similarity index 100%
rename from content/canvas/test/reftest/drawFocusIfNeeded-ref.html
rename to dom/canvas/test/reftest/drawFocusIfNeeded-ref.html
diff --git a/content/canvas/test/reftest/drawFocusIfNeeded.html b/dom/canvas/test/reftest/drawFocusIfNeeded.html
similarity index 100%
rename from content/canvas/test/reftest/drawFocusIfNeeded.html
rename to dom/canvas/test/reftest/drawFocusIfNeeded.html
diff --git a/content/canvas/test/reftest/green.png b/dom/canvas/test/reftest/green.png
similarity index 100%
rename from content/canvas/test/reftest/green.png
rename to dom/canvas/test/reftest/green.png
diff --git a/content/canvas/test/reftest/half-colors-half-alpha.png b/dom/canvas/test/reftest/half-colors-half-alpha.png
similarity index 100%
rename from content/canvas/test/reftest/half-colors-half-alpha.png
rename to dom/canvas/test/reftest/half-colors-half-alpha.png
diff --git a/content/canvas/test/reftest/half-colors.png b/dom/canvas/test/reftest/half-colors.png
similarity index 100%
rename from content/canvas/test/reftest/half-colors.png
rename to dom/canvas/test/reftest/half-colors.png
diff --git a/content/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list
similarity index 100%
rename from content/canvas/test/reftest/reftest.list
rename to dom/canvas/test/reftest/reftest.list
diff --git a/content/canvas/test/reftest/stroketext-shadow-ref.html b/dom/canvas/test/reftest/stroketext-shadow-ref.html
similarity index 100%
rename from content/canvas/test/reftest/stroketext-shadow-ref.html
rename to dom/canvas/test/reftest/stroketext-shadow-ref.html
diff --git a/content/canvas/test/reftest/stroketext-shadow.html b/dom/canvas/test/reftest/stroketext-shadow.html
similarity index 100%
rename from content/canvas/test/reftest/stroketext-shadow.html
rename to dom/canvas/test/reftest/stroketext-shadow.html
diff --git a/content/canvas/test/reftest/webgl-clear-test.html b/dom/canvas/test/reftest/webgl-clear-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-clear-test.html
rename to dom/canvas/test/reftest/webgl-clear-test.html
diff --git a/content/canvas/test/reftest/webgl-color-alpha-test.html b/dom/canvas/test/reftest/webgl-color-alpha-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-color-alpha-test.html
rename to dom/canvas/test/reftest/webgl-color-alpha-test.html
diff --git a/content/canvas/test/reftest/webgl-color-test.html b/dom/canvas/test/reftest/webgl-color-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-color-test.html
rename to dom/canvas/test/reftest/webgl-color-test.html
diff --git a/content/canvas/test/reftest/webgl-disable-test.html b/dom/canvas/test/reftest/webgl-disable-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-disable-test.html
rename to dom/canvas/test/reftest/webgl-disable-test.html
diff --git a/content/canvas/test/reftest/webgl-hanging-fb-test.html b/dom/canvas/test/reftest/webgl-hanging-fb-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-hanging-fb-test.html
rename to dom/canvas/test/reftest/webgl-hanging-fb-test.html
diff --git a/content/canvas/test/reftest/webgl-hanging-scissor-test.html b/dom/canvas/test/reftest/webgl-hanging-scissor-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-hanging-scissor-test.html
rename to dom/canvas/test/reftest/webgl-hanging-scissor-test.html
diff --git a/content/canvas/test/reftest/webgl-orientation-test.html b/dom/canvas/test/reftest/webgl-orientation-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-orientation-test.html
rename to dom/canvas/test/reftest/webgl-orientation-test.html
diff --git a/content/canvas/test/reftest/webgl-resize-test.html b/dom/canvas/test/reftest/webgl-resize-test.html
similarity index 100%
rename from content/canvas/test/reftest/webgl-resize-test.html
rename to dom/canvas/test/reftest/webgl-resize-test.html
diff --git a/content/canvas/test/reftest/webgl-utils.js b/dom/canvas/test/reftest/webgl-utils.js
similarity index 100%
rename from content/canvas/test/reftest/webgl-utils.js
rename to dom/canvas/test/reftest/webgl-utils.js
diff --git a/content/canvas/test/reftest/white-top-left.png b/dom/canvas/test/reftest/white-top-left.png
similarity index 100%
rename from content/canvas/test/reftest/white-top-left.png
rename to dom/canvas/test/reftest/white-top-left.png
diff --git a/content/canvas/test/reftest/white.png b/dom/canvas/test/reftest/white.png
similarity index 100%
rename from content/canvas/test/reftest/white.png
rename to dom/canvas/test/reftest/white.png
diff --git a/content/canvas/test/reftest/wrapper.html b/dom/canvas/test/reftest/wrapper.html
similarity index 100%
rename from content/canvas/test/reftest/wrapper.html
rename to dom/canvas/test/reftest/wrapper.html
diff --git a/content/canvas/test/test_2d.clearRect.image.offscreen.html b/dom/canvas/test/test_2d.clearRect.image.offscreen.html
similarity index 100%
rename from content/canvas/test/test_2d.clearRect.image.offscreen.html
rename to dom/canvas/test/test_2d.clearRect.image.offscreen.html
diff --git a/content/canvas/test/test_2d.clip.winding.html b/dom/canvas/test/test_2d.clip.winding.html
similarity index 100%
rename from content/canvas/test/test_2d.clip.winding.html
rename to dom/canvas/test/test_2d.clip.winding.html
diff --git a/content/canvas/test/test_2d.composite.canvas.color-burn.html b/dom/canvas/test/test_2d.composite.canvas.color-burn.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.color-burn.html
rename to dom/canvas/test/test_2d.composite.canvas.color-burn.html
diff --git a/content/canvas/test/test_2d.composite.canvas.color-dodge.html b/dom/canvas/test/test_2d.composite.canvas.color-dodge.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.color-dodge.html
rename to dom/canvas/test/test_2d.composite.canvas.color-dodge.html
diff --git a/content/canvas/test/test_2d.composite.canvas.color.html b/dom/canvas/test/test_2d.composite.canvas.color.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.color.html
rename to dom/canvas/test/test_2d.composite.canvas.color.html
diff --git a/content/canvas/test/test_2d.composite.canvas.darken.html b/dom/canvas/test/test_2d.composite.canvas.darken.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.darken.html
rename to dom/canvas/test/test_2d.composite.canvas.darken.html
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-atop.html b/dom/canvas/test/test_2d.composite.canvas.destination-atop.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.destination-atop.html
rename to dom/canvas/test/test_2d.composite.canvas.destination-atop.html
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-in.html b/dom/canvas/test/test_2d.composite.canvas.destination-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.destination-in.html
rename to dom/canvas/test/test_2d.composite.canvas.destination-in.html
diff --git a/content/canvas/test/test_2d.composite.canvas.difference.html b/dom/canvas/test/test_2d.composite.canvas.difference.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.difference.html
rename to dom/canvas/test/test_2d.composite.canvas.difference.html
diff --git a/content/canvas/test/test_2d.composite.canvas.exclusion.html b/dom/canvas/test/test_2d.composite.canvas.exclusion.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.exclusion.html
rename to dom/canvas/test/test_2d.composite.canvas.exclusion.html
diff --git a/content/canvas/test/test_2d.composite.canvas.hard-light.html b/dom/canvas/test/test_2d.composite.canvas.hard-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.hard-light.html
rename to dom/canvas/test/test_2d.composite.canvas.hard-light.html
diff --git a/content/canvas/test/test_2d.composite.canvas.hue.html b/dom/canvas/test/test_2d.composite.canvas.hue.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.hue.html
rename to dom/canvas/test/test_2d.composite.canvas.hue.html
diff --git a/content/canvas/test/test_2d.composite.canvas.lighten.html b/dom/canvas/test/test_2d.composite.canvas.lighten.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.lighten.html
rename to dom/canvas/test/test_2d.composite.canvas.lighten.html
diff --git a/content/canvas/test/test_2d.composite.canvas.lighter.html b/dom/canvas/test/test_2d.composite.canvas.lighter.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.lighter.html
rename to dom/canvas/test/test_2d.composite.canvas.lighter.html
diff --git a/content/canvas/test/test_2d.composite.canvas.luminosity.html b/dom/canvas/test/test_2d.composite.canvas.luminosity.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.luminosity.html
rename to dom/canvas/test/test_2d.composite.canvas.luminosity.html
diff --git a/content/canvas/test/test_2d.composite.canvas.multiply.html b/dom/canvas/test/test_2d.composite.canvas.multiply.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.multiply.html
rename to dom/canvas/test/test_2d.composite.canvas.multiply.html
diff --git a/content/canvas/test/test_2d.composite.canvas.overlay.html b/dom/canvas/test/test_2d.composite.canvas.overlay.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.overlay.html
rename to dom/canvas/test/test_2d.composite.canvas.overlay.html
diff --git a/content/canvas/test/test_2d.composite.canvas.saturation.html b/dom/canvas/test/test_2d.composite.canvas.saturation.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.saturation.html
rename to dom/canvas/test/test_2d.composite.canvas.saturation.html
diff --git a/content/canvas/test/test_2d.composite.canvas.screen.html b/dom/canvas/test/test_2d.composite.canvas.screen.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.screen.html
rename to dom/canvas/test/test_2d.composite.canvas.screen.html
diff --git a/content/canvas/test/test_2d.composite.canvas.soft-light.html b/dom/canvas/test/test_2d.composite.canvas.soft-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.soft-light.html
rename to dom/canvas/test/test_2d.composite.canvas.soft-light.html
diff --git a/content/canvas/test/test_2d.composite.canvas.source-in.html b/dom/canvas/test/test_2d.composite.canvas.source-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.source-in.html
rename to dom/canvas/test/test_2d.composite.canvas.source-in.html
diff --git a/content/canvas/test/test_2d.composite.canvas.source-out.html b/dom/canvas/test/test_2d.composite.canvas.source-out.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.source-out.html
rename to dom/canvas/test/test_2d.composite.canvas.source-out.html
diff --git a/content/canvas/test/test_2d.composite.canvas.xor.html b/dom/canvas/test/test_2d.composite.canvas.xor.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.canvas.xor.html
rename to dom/canvas/test/test_2d.composite.canvas.xor.html
diff --git a/content/canvas/test/test_2d.composite.clip.lighter.html b/dom/canvas/test/test_2d.composite.clip.lighter.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.clip.lighter.html
rename to dom/canvas/test/test_2d.composite.clip.lighter.html
diff --git a/content/canvas/test/test_2d.composite.clip.xor.html b/dom/canvas/test/test_2d.composite.clip.xor.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.clip.xor.html
rename to dom/canvas/test/test_2d.composite.clip.xor.html
diff --git a/content/canvas/test/test_2d.composite.image.destination-atop.html b/dom/canvas/test/test_2d.composite.image.destination-atop.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.destination-atop.html
rename to dom/canvas/test/test_2d.composite.image.destination-atop.html
diff --git a/content/canvas/test/test_2d.composite.image.destination-in.html b/dom/canvas/test/test_2d.composite.image.destination-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.destination-in.html
rename to dom/canvas/test/test_2d.composite.image.destination-in.html
diff --git a/content/canvas/test/test_2d.composite.image.lighter.html b/dom/canvas/test/test_2d.composite.image.lighter.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.lighter.html
rename to dom/canvas/test/test_2d.composite.image.lighter.html
diff --git a/content/canvas/test/test_2d.composite.image.source-in.html b/dom/canvas/test/test_2d.composite.image.source-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.source-in.html
rename to dom/canvas/test/test_2d.composite.image.source-in.html
diff --git a/content/canvas/test/test_2d.composite.image.source-out.html b/dom/canvas/test/test_2d.composite.image.source-out.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.source-out.html
rename to dom/canvas/test/test_2d.composite.image.source-out.html
diff --git a/content/canvas/test/test_2d.composite.image.xor.html b/dom/canvas/test/test_2d.composite.image.xor.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.image.xor.html
rename to dom/canvas/test/test_2d.composite.image.xor.html
diff --git a/content/canvas/test/test_2d.composite.solid.color-burn.html b/dom/canvas/test/test_2d.composite.solid.color-burn.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.color-burn.html
rename to dom/canvas/test/test_2d.composite.solid.color-burn.html
diff --git a/content/canvas/test/test_2d.composite.solid.color-dodge.html b/dom/canvas/test/test_2d.composite.solid.color-dodge.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.color-dodge.html
rename to dom/canvas/test/test_2d.composite.solid.color-dodge.html
diff --git a/content/canvas/test/test_2d.composite.solid.color.html b/dom/canvas/test/test_2d.composite.solid.color.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.color.html
rename to dom/canvas/test/test_2d.composite.solid.color.html
diff --git a/content/canvas/test/test_2d.composite.solid.darken.html b/dom/canvas/test/test_2d.composite.solid.darken.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.darken.html
rename to dom/canvas/test/test_2d.composite.solid.darken.html
diff --git a/content/canvas/test/test_2d.composite.solid.difference.html b/dom/canvas/test/test_2d.composite.solid.difference.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.difference.html
rename to dom/canvas/test/test_2d.composite.solid.difference.html
diff --git a/content/canvas/test/test_2d.composite.solid.exclusion.html b/dom/canvas/test/test_2d.composite.solid.exclusion.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.exclusion.html
rename to dom/canvas/test/test_2d.composite.solid.exclusion.html
diff --git a/content/canvas/test/test_2d.composite.solid.hard-light.html b/dom/canvas/test/test_2d.composite.solid.hard-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.hard-light.html
rename to dom/canvas/test/test_2d.composite.solid.hard-light.html
diff --git a/content/canvas/test/test_2d.composite.solid.hue.html b/dom/canvas/test/test_2d.composite.solid.hue.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.hue.html
rename to dom/canvas/test/test_2d.composite.solid.hue.html
diff --git a/content/canvas/test/test_2d.composite.solid.lighten.html b/dom/canvas/test/test_2d.composite.solid.lighten.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.lighten.html
rename to dom/canvas/test/test_2d.composite.solid.lighten.html
diff --git a/content/canvas/test/test_2d.composite.solid.lighter.html b/dom/canvas/test/test_2d.composite.solid.lighter.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.lighter.html
rename to dom/canvas/test/test_2d.composite.solid.lighter.html
diff --git a/content/canvas/test/test_2d.composite.solid.luminosity.html b/dom/canvas/test/test_2d.composite.solid.luminosity.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.luminosity.html
rename to dom/canvas/test/test_2d.composite.solid.luminosity.html
diff --git a/content/canvas/test/test_2d.composite.solid.multiply.html b/dom/canvas/test/test_2d.composite.solid.multiply.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.multiply.html
rename to dom/canvas/test/test_2d.composite.solid.multiply.html
diff --git a/content/canvas/test/test_2d.composite.solid.overlay.html b/dom/canvas/test/test_2d.composite.solid.overlay.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.overlay.html
rename to dom/canvas/test/test_2d.composite.solid.overlay.html
diff --git a/content/canvas/test/test_2d.composite.solid.saturation.html b/dom/canvas/test/test_2d.composite.solid.saturation.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.saturation.html
rename to dom/canvas/test/test_2d.composite.solid.saturation.html
diff --git a/content/canvas/test/test_2d.composite.solid.screen.html b/dom/canvas/test/test_2d.composite.solid.screen.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.screen.html
rename to dom/canvas/test/test_2d.composite.solid.screen.html
diff --git a/content/canvas/test/test_2d.composite.solid.soft-light.html b/dom/canvas/test/test_2d.composite.solid.soft-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.soft-light.html
rename to dom/canvas/test/test_2d.composite.solid.soft-light.html
diff --git a/content/canvas/test/test_2d.composite.solid.xor.html b/dom/canvas/test/test_2d.composite.solid.xor.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.solid.xor.html
rename to dom/canvas/test/test_2d.composite.solid.xor.html
diff --git a/content/canvas/test/test_2d.composite.transparent.lighter.html b/dom/canvas/test/test_2d.composite.transparent.lighter.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.transparent.lighter.html
rename to dom/canvas/test/test_2d.composite.transparent.lighter.html
diff --git a/content/canvas/test/test_2d.composite.transparent.xor.html b/dom/canvas/test/test_2d.composite.transparent.xor.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.transparent.xor.html
rename to dom/canvas/test/test_2d.composite.transparent.xor.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.color.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.color.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.darken.html b/dom/canvas/test/test_2d.composite.uncovered.fill.darken.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.darken.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.darken.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.difference.html b/dom/canvas/test/test_2d.composite.uncovered.fill.difference.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.difference.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.difference.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html b/dom/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html b/dom/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hue.html b/dom/canvas/test/test_2d.composite.uncovered.fill.hue.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.hue.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.hue.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html b/dom/canvas/test/test_2d.composite.uncovered.fill.lighten.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.lighten.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.lighten.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html b/dom/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html b/dom/canvas/test/test_2d.composite.uncovered.fill.multiply.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.multiply.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.multiply.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html b/dom/canvas/test/test_2d.composite.uncovered.fill.overlay.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.overlay.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.overlay.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html b/dom/canvas/test/test_2d.composite.uncovered.fill.saturation.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.saturation.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.saturation.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.screen.html b/dom/canvas/test/test_2d.composite.uncovered.fill.screen.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.screen.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.screen.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html b/dom/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.fill.source-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.source-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.fill.source-out.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
rename to dom/canvas/test/test_2d.composite.uncovered.fill.source-out.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
rename to dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.image.destination-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.image.source-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.image.source-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.image.source-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.image.source-out.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.image.source-out.html
rename to dom/canvas/test/test_2d.composite.uncovered.image.source-out.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
rename to dom/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
rename to dom/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
similarity index 100%
rename from content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
rename to dom/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
diff --git a/content/canvas/test/test_2d.drawImage.zerocanvas.html b/dom/canvas/test/test_2d.drawImage.zerocanvas.html
similarity index 100%
rename from content/canvas/test/test_2d.drawImage.zerocanvas.html
rename to dom/canvas/test/test_2d.drawImage.zerocanvas.html
diff --git a/content/canvas/test/test_2d.fill.winding.html b/dom/canvas/test/test_2d.fill.winding.html
similarity index 100%
rename from content/canvas/test/test_2d.fill.winding.html
rename to dom/canvas/test/test_2d.fill.winding.html
diff --git a/content/canvas/test/test_2d.fillText.gradient.html b/dom/canvas/test/test_2d.fillText.gradient.html
similarity index 100%
rename from content/canvas/test/test_2d.fillText.gradient.html
rename to dom/canvas/test/test_2d.fillText.gradient.html
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.behind.html b/dom/canvas/test/test_2d.gradient.radial.cone.behind.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.cone.behind.html
rename to dom/canvas/test/test_2d.gradient.radial.cone.behind.html
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.beside.html b/dom/canvas/test/test_2d.gradient.radial.cone.beside.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.cone.beside.html
rename to dom/canvas/test/test_2d.gradient.radial.cone.beside.html
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.front.html b/dom/canvas/test/test_2d.gradient.radial.cone.front.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.cone.front.html
rename to dom/canvas/test/test_2d.gradient.radial.cone.front.html
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape2.html b/dom/canvas/test/test_2d.gradient.radial.cone.shape2.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.cone.shape2.html
rename to dom/canvas/test/test_2d.gradient.radial.cone.shape2.html
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.top.html b/dom/canvas/test/test_2d.gradient.radial.cone.top.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.cone.top.html
rename to dom/canvas/test/test_2d.gradient.radial.cone.top.html
diff --git a/content/canvas/test/test_2d.gradient.radial.equal.html b/dom/canvas/test/test_2d.gradient.radial.equal.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.equal.html
rename to dom/canvas/test/test_2d.gradient.radial.equal.html
diff --git a/content/canvas/test/test_2d.gradient.radial.inside2.html b/dom/canvas/test/test_2d.gradient.radial.inside2.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.inside2.html
rename to dom/canvas/test/test_2d.gradient.radial.inside2.html
diff --git a/content/canvas/test/test_2d.gradient.radial.inside3.html b/dom/canvas/test/test_2d.gradient.radial.inside3.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.inside3.html
rename to dom/canvas/test/test_2d.gradient.radial.inside3.html
diff --git a/content/canvas/test/test_2d.gradient.radial.outside1.html b/dom/canvas/test/test_2d.gradient.radial.outside1.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.outside1.html
rename to dom/canvas/test/test_2d.gradient.radial.outside1.html
diff --git a/content/canvas/test/test_2d.gradient.radial.outside2.html b/dom/canvas/test/test_2d.gradient.radial.outside2.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.outside2.html
rename to dom/canvas/test/test_2d.gradient.radial.outside2.html
diff --git a/content/canvas/test/test_2d.gradient.radial.outside3.html b/dom/canvas/test/test_2d.gradient.radial.outside3.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.outside3.html
rename to dom/canvas/test/test_2d.gradient.radial.outside3.html
diff --git a/content/canvas/test/test_2d.gradient.radial.touch1.html b/dom/canvas/test/test_2d.gradient.radial.touch1.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.touch1.html
rename to dom/canvas/test/test_2d.gradient.radial.touch1.html
diff --git a/content/canvas/test/test_2d.gradient.radial.touch2.html b/dom/canvas/test/test_2d.gradient.radial.touch2.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.touch2.html
rename to dom/canvas/test/test_2d.gradient.radial.touch2.html
diff --git a/content/canvas/test/test_2d.gradient.radial.touch3.html b/dom/canvas/test/test_2d.gradient.radial.touch3.html
similarity index 100%
rename from content/canvas/test/test_2d.gradient.radial.touch3.html
rename to dom/canvas/test/test_2d.gradient.radial.touch3.html
diff --git a/content/canvas/test/test_2d.isPointInPath.winding.html b/dom/canvas/test/test_2d.isPointInPath.winding.html
similarity index 100%
rename from content/canvas/test/test_2d.isPointInPath.winding.html
rename to dom/canvas/test/test_2d.isPointInPath.winding.html
diff --git a/content/canvas/test/test_2d.line.cap.closed.html b/dom/canvas/test/test_2d.line.cap.closed.html
similarity index 100%
rename from content/canvas/test/test_2d.line.cap.closed.html
rename to dom/canvas/test/test_2d.line.cap.closed.html
diff --git a/content/canvas/test/test_2d.line.join.parallel.html b/dom/canvas/test/test_2d.line.join.parallel.html
similarity index 100%
rename from content/canvas/test/test_2d.line.join.parallel.html
rename to dom/canvas/test/test_2d.line.join.parallel.html
diff --git a/content/canvas/test/test_2d.path.arc.shape.3.html b/dom/canvas/test/test_2d.path.arc.shape.3.html
similarity index 100%
rename from content/canvas/test/test_2d.path.arc.shape.3.html
rename to dom/canvas/test/test_2d.path.arc.shape.3.html
diff --git a/content/canvas/test/test_2d.path.rect.selfintersect.html b/dom/canvas/test/test_2d.path.rect.selfintersect.html
similarity index 100%
rename from content/canvas/test/test_2d.path.rect.selfintersect.html
rename to dom/canvas/test/test_2d.path.rect.selfintersect.html
diff --git a/content/canvas/test/test_2d.path.rect.zero.6.html b/dom/canvas/test/test_2d.path.rect.zero.6.html
similarity index 100%
rename from content/canvas/test/test_2d.path.rect.zero.6.html
rename to dom/canvas/test/test_2d.path.rect.zero.6.html
diff --git a/content/canvas/test/test_2d.strokeRect.zero.5.html b/dom/canvas/test/test_2d.strokeRect.zero.5.html
similarity index 100%
rename from content/canvas/test/test_2d.strokeRect.zero.5.html
rename to dom/canvas/test/test_2d.strokeRect.zero.5.html
diff --git a/content/canvas/test/test_2d_composite_canvaspattern_setTransform.html b/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html
similarity index 100%
rename from content/canvas/test/test_2d_composite_canvaspattern_setTransform.html
rename to dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html
diff --git a/content/canvas/test/test_ImageData_ctor.html b/dom/canvas/test/test_ImageData_ctor.html
similarity index 100%
rename from content/canvas/test/test_ImageData_ctor.html
rename to dom/canvas/test/test_ImageData_ctor.html
diff --git a/content/canvas/test/test_bug613794.html b/dom/canvas/test/test_bug613794.html
similarity index 100%
rename from content/canvas/test/test_bug613794.html
rename to dom/canvas/test/test_bug613794.html
diff --git a/content/canvas/test/test_bug753758.html b/dom/canvas/test/test_bug753758.html
similarity index 100%
rename from content/canvas/test/test_bug753758.html
rename to dom/canvas/test/test_bug753758.html
diff --git a/content/canvas/test/test_bug764125.html b/dom/canvas/test/test_bug764125.html
similarity index 100%
rename from content/canvas/test/test_bug764125.html
rename to dom/canvas/test/test_bug764125.html
diff --git a/content/canvas/test/test_bug856472.html b/dom/canvas/test/test_bug856472.html
similarity index 100%
rename from content/canvas/test/test_bug856472.html
rename to dom/canvas/test/test_bug856472.html
diff --git a/content/canvas/test/test_bug866575.html b/dom/canvas/test/test_bug866575.html
similarity index 100%
rename from content/canvas/test/test_bug866575.html
rename to dom/canvas/test/test_bug866575.html
diff --git a/content/canvas/test/test_bug902651.html b/dom/canvas/test/test_bug902651.html
similarity index 100%
rename from content/canvas/test/test_bug902651.html
rename to dom/canvas/test/test_bug902651.html
diff --git a/content/canvas/test/test_canvas.html b/dom/canvas/test/test_canvas.html
similarity index 99%
rename from content/canvas/test/test_canvas.html
rename to dom/canvas/test/test_canvas.html
index 4609b883254..6a241fcf756 100644
--- a/content/canvas/test/test_canvas.html
+++ b/dom/canvas/test/test_canvas.html
@@ -81,7 +81,7 @@ function IsAzureCairo() {
 }
 
 </script>
-<!-- Includes all the tests in the content/canvas/tests except for test_bug397524.html -->
+<!-- Includes all the tests in the dom/canvas/tests except for test_bug397524.html -->
 
 <!-- [[[ test_2d.canvas.readonly.html ]]] -->
 
@@ -19594,7 +19594,7 @@ ok(ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined,
   <canvas id="canvas2" width="1" height="1"></canvas>
   <canvas id="canvas3" width="1" height="1"></canvas>
   <img id="i1", src="image_green-1x1.png">
-  <img id="i2" src="http://example.com/tests/content/canvas/test/image_green-1x1.png">
+  <img id="i2" src="http://example.com/tests/dom/canvas/test/image_green-1x1.png">
   <img id="i3" src="image_green-redirect">
 </p>
 <div id="content" style="display: none">
diff --git a/content/canvas/test/test_canvas_focusring.html b/dom/canvas/test/test_canvas_focusring.html
similarity index 100%
rename from content/canvas/test/test_canvas_focusring.html
rename to dom/canvas/test/test_canvas_focusring.html
diff --git a/content/canvas/test/test_canvas_font_setter.html b/dom/canvas/test/test_canvas_font_setter.html
similarity index 100%
rename from content/canvas/test/test_canvas_font_setter.html
rename to dom/canvas/test/test_canvas_font_setter.html
diff --git a/content/canvas/test/test_canvas_path.html b/dom/canvas/test/test_canvas_path.html
similarity index 100%
rename from content/canvas/test/test_canvas_path.html
rename to dom/canvas/test/test_canvas_path.html
diff --git a/content/canvas/test/test_canvas_strokeStyle_getter.html b/dom/canvas/test/test_canvas_strokeStyle_getter.html
similarity index 100%
rename from content/canvas/test/test_canvas_strokeStyle_getter.html
rename to dom/canvas/test/test_canvas_strokeStyle_getter.html
diff --git a/content/canvas/test/test_createPattern_broken.html b/dom/canvas/test/test_createPattern_broken.html
similarity index 100%
rename from content/canvas/test/test_createPattern_broken.html
rename to dom/canvas/test/test_createPattern_broken.html
diff --git a/content/canvas/test/test_drawImageIncomplete.html b/dom/canvas/test/test_drawImageIncomplete.html
similarity index 100%
rename from content/canvas/test/test_drawImageIncomplete.html
rename to dom/canvas/test/test_drawImageIncomplete.html
diff --git a/content/canvas/test/test_drawImage_document_domain.html b/dom/canvas/test/test_drawImage_document_domain.html
similarity index 100%
rename from content/canvas/test/test_drawImage_document_domain.html
rename to dom/canvas/test/test_drawImage_document_domain.html
diff --git a/content/canvas/test/test_drawImage_edge_cases.html b/dom/canvas/test/test_drawImage_edge_cases.html
similarity index 100%
rename from content/canvas/test/test_drawImage_edge_cases.html
rename to dom/canvas/test/test_drawImage_edge_cases.html
diff --git a/content/canvas/test/test_drawWindow.html b/dom/canvas/test/test_drawWindow.html
similarity index 100%
rename from content/canvas/test/test_drawWindow.html
rename to dom/canvas/test/test_drawWindow.html
diff --git a/content/canvas/test/test_hitregion_canvas.html b/dom/canvas/test/test_hitregion_canvas.html
similarity index 100%
rename from content/canvas/test/test_hitregion_canvas.html
rename to dom/canvas/test/test_hitregion_canvas.html
diff --git a/content/canvas/test/test_hitregion_event.html b/dom/canvas/test/test_hitregion_event.html
similarity index 100%
rename from content/canvas/test/test_hitregion_event.html
rename to dom/canvas/test/test_hitregion_event.html
diff --git a/content/canvas/test/test_isPointInStroke.html b/dom/canvas/test/test_isPointInStroke.html
similarity index 100%
rename from content/canvas/test/test_isPointInStroke.html
rename to dom/canvas/test/test_isPointInStroke.html
diff --git a/content/canvas/test/test_mozDashOffset.html b/dom/canvas/test/test_mozDashOffset.html
similarity index 100%
rename from content/canvas/test/test_mozDashOffset.html
rename to dom/canvas/test/test_mozDashOffset.html
diff --git a/content/canvas/test/test_mozGetAsFile.html b/dom/canvas/test/test_mozGetAsFile.html
similarity index 100%
rename from content/canvas/test/test_mozGetAsFile.html
rename to dom/canvas/test/test_mozGetAsFile.html
diff --git a/content/canvas/test/test_setlinedash.html b/dom/canvas/test/test_setlinedash.html
similarity index 100%
rename from content/canvas/test/test_setlinedash.html
rename to dom/canvas/test/test_setlinedash.html
diff --git a/content/canvas/test/test_strokeText_throw.html b/dom/canvas/test/test_strokeText_throw.html
similarity index 100%
rename from content/canvas/test/test_strokeText_throw.html
rename to dom/canvas/test/test_strokeText_throw.html
diff --git a/content/canvas/test/test_toBlob.html b/dom/canvas/test/test_toBlob.html
similarity index 100%
rename from content/canvas/test/test_toBlob.html
rename to dom/canvas/test/test_toBlob.html
diff --git a/content/canvas/test/test_toDataURL_alpha.html b/dom/canvas/test/test_toDataURL_alpha.html
similarity index 100%
rename from content/canvas/test/test_toDataURL_alpha.html
rename to dom/canvas/test/test_toDataURL_alpha.html
diff --git a/content/canvas/test/test_toDataURL_lowercase_ascii.html b/dom/canvas/test/test_toDataURL_lowercase_ascii.html
similarity index 100%
rename from content/canvas/test/test_toDataURL_lowercase_ascii.html
rename to dom/canvas/test/test_toDataURL_lowercase_ascii.html
diff --git a/content/canvas/test/test_toDataURL_parameters.html b/dom/canvas/test/test_toDataURL_parameters.html
similarity index 100%
rename from content/canvas/test/test_toDataURL_parameters.html
rename to dom/canvas/test/test_toDataURL_parameters.html
diff --git a/content/canvas/test/test_windingRuleUndefined.html b/dom/canvas/test/test_windingRuleUndefined.html
similarity index 100%
rename from content/canvas/test/test_windingRuleUndefined.html
rename to dom/canvas/test/test_windingRuleUndefined.html
diff --git a/content/canvas/test/webgl-conformance/00_test_list.txt b/dom/canvas/test/webgl-conformance/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/README.mozilla b/dom/canvas/test/webgl-conformance/README.mozilla
similarity index 100%
rename from content/canvas/test/webgl-conformance/README.mozilla
rename to dom/canvas/test/webgl-conformance/README.mozilla
diff --git a/content/canvas/test/webgl-conformance/README.txt b/dom/canvas/test/webgl-conformance/README.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/README.txt
rename to dom/canvas/test/webgl-conformance/README.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/00_readme.txt b/dom/canvas/test/webgl-conformance/conformance/00_readme.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/00_readme.txt
rename to dom/canvas/test/webgl-conformance/conformance/00_readme.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM b/dom/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM
rename to dom/canvas/test/webgl-conformance/conformance/LICENSE_CHROMIUM
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/attribs/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html b/dom/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html
rename to dom/canvas/test/webgl-conformance/conformance/attribs/gl-enable-vertex-attrib.html
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html b/dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html
rename to dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib-zero-issues.html
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html b/dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html
rename to dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertex-attrib.html
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html b/dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html
rename to dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer-offsets.html
diff --git a/content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html b/dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html
rename to dom/canvas/test/webgl-conformance/conformance/attribs/gl-vertexattribpointer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/buffers/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html b/dom/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/buffer-bind-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html b/dom/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/buffer-data-array-buffer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html b/dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-copies-indices.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html b/dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-crash-with-buffer-sub-data.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html b/dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-verifies-too-many-indices.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html b/dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/index-validation-with-resized-buffer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/buffers/index-validation.html b/dom/canvas/test/webgl-conformance/conformance/buffers/index-validation.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/buffers/index-validation.html
rename to dom/canvas/test/webgl-conformance/conformance/buffers/index-validation.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/canvas/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html b/dom/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/buffer-offscreen-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html b/dom/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/buffer-preserve-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html b/dom/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/canvas-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html b/dom/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/canvas-zero-size.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html b/dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-static-canvas-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html b/dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/drawingbuffer-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html b/dom/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html
rename to dom/canvas/test/webgl-conformance/conformance/canvas/viewport-unchanged-upon-resize.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/context/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/context/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/context/constants.html b/dom/canvas/test/webgl-conformance/conformance/context/constants.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/constants.html
rename to dom/canvas/test/webgl-conformance/conformance/context/constants.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html b/dom/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html
rename to dom/canvas/test/webgl-conformance/conformance/context/context-attribute-preserve-drawing-buffer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html b/dom/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html
rename to dom/canvas/test/webgl-conformance/conformance/context/context-attributes-alpha-depth-stencil-antialias.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html b/dom/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html
rename to dom/canvas/test/webgl-conformance/conformance/context/context-lost-restored.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/context-lost.html b/dom/canvas/test/webgl-conformance/conformance/context/context-lost.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/context-lost.html
rename to dom/canvas/test/webgl-conformance/conformance/context/context-lost.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/context-type-test.html b/dom/canvas/test/webgl-conformance/conformance/context/context-type-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/context-type-test.html
rename to dom/canvas/test/webgl-conformance/conformance/context/context-type-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html b/dom/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html
rename to dom/canvas/test/webgl-conformance/conformance/context/incorrect-context-object-behaviour.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/methods.html b/dom/canvas/test/webgl-conformance/conformance/context/methods.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/methods.html
rename to dom/canvas/test/webgl-conformance/conformance/context/methods.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html b/dom/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html
rename to dom/canvas/test/webgl-conformance/conformance/context/premultiplyalpha-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html b/dom/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html
rename to dom/canvas/test/webgl-conformance/conformance/context/resource-sharing-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/extensions/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html b/dom/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/ext-sRGB.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html b/dom/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/ext-texture-filter-anisotropic.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html b/dom/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/oes-standard-derivatives.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html b/dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html b/dom/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/oes-vertex-array-object.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html b/dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-etc1.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html b/dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/webgl-compressed-texture-s3tc.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html b/dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-renderer-info.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html b/dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/webgl-debug-shaders.html
diff --git a/content/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html b/dom/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html
rename to dom/canvas/test/webgl-conformance/conformance/extensions/webgl-depth-texture.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-abs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-acos.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-asin.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan-xy.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-atan.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-ceil.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-clamp-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cos.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-cross.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-distance.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-dot.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-faceforward.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-floor.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-fract.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-length.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-lessThan.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-max-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-min-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mix-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-mod-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-normalize.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-reflect.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-refract.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sign.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-sin.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-smoothstep-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-float.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function-step-gentype.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html b/dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/functions/glsl-function.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_mat4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_int_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/add_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_int_to_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/construct_struct.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_mat4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_int_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/divide_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/equal_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/function_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/greater_than_equal.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/less_than_equal.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_mat4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_int_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/multiply_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_mat4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_int_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/subtract_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_int_float.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec2_vec2.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec3_vec3.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/implicit/ternary_ivec4_vec4.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/matrices/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html b/dom/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/matrices/glsl-mat4-to-mat3.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/attrib-location-length-limits.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/embedded-struct-definitions-forbidden.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-function-nodes.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-long-variable-names.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/glsl-vertex-branch.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/include.vs
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii-comments.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/non-ascii.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/re-compile-re-link.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-256-character-identifier.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-257-character-identifier.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-_webgl-identifier.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-array.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-attrib-struct.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-clipvertex.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-assignment.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-comma-conditional-assignment.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-conditional-scoping.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-default-precision.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-define-line-continuation.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-dfdx.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-do-scoping.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-error-directive.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-explicit-int-cast.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-float-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-loop.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-for-scoping.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-frag-depth.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-recursion.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-function-scoped-struct.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-functional-scoping.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glcolor.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-1.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-gles-symbol.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-hex-int-constant-macro.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-include.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-int-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-invalid-identifier.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec2-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-ivec4-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-limited-indexing.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-line-directive.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-long-line.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-non-ascii-error.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-precision.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-quoted-error.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec2-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec3-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-return-value.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-100.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-120.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-version-130.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-with-webgl-identifier.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shader-without-precision.frag.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/shared.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-exceeds-maximum.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/struct-nesting-under-maximum.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html b/dom/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/misc/uniform-location-length-limits.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_field.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_function.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_struct.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/_webgl_variable.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_field.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_function.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_struct.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html b/dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/reserved/webgl_variable.vert.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/samplers/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html b/dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2d-bias.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html b/dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dlod.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html b/dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/samplers/glsl-function-texture2dproj.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/glsl/variables/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html b/dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-fragcoord.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html b/dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-frontfacing.html
diff --git a/content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html b/dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html
rename to dom/canvas/test/webgl-conformance/conformance/glsl/variables/gl-pointcoord.html
diff --git a/content/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/limits/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html b/dom/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html
rename to dom/canvas/test/webgl-conformance/conformance/limits/gl-max-texture-dimensions.html
diff --git a/content/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html b/dom/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html
rename to dom/canvas/test/webgl-conformance/conformance/limits/gl-min-attribs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html b/dom/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html
rename to dom/canvas/test/webgl-conformance/conformance/limits/gl-min-textures.html
diff --git a/content/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html b/dom/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html
rename to dom/canvas/test/webgl-conformance/conformance/limits/gl-min-uniforms.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/misc/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html b/dom/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/bad-arguments-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html b/dom/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/delayed-drawing.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/error-reporting.html b/dom/canvas/test/webgl-conformance/conformance/misc/error-reporting.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/error-reporting.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/error-reporting.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html b/dom/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/functions-returning-strings.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html b/dom/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/instanceof-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html b/dom/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/invalid-passed-params.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/is-object.html b/dom/canvas/test/webgl-conformance/conformance/misc/is-object.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/is-object.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/is-object.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html b/dom/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/null-object-behaviour.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html b/dom/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/object-deletion-behaviour.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html b/dom/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/shader-precision-format.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html b/dom/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/type-conversion-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html b/dom/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/uninitialized-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html b/dom/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html
rename to dom/canvas/test/webgl-conformance/conformance/misc/webgl-specific.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/more/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/more/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/more/README.md b/dom/canvas/test/webgl-conformance/conformance/more/README.md
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/README.md
rename to dom/canvas/test/webgl-conformance/conformance/more/README.md
diff --git a/content/canvas/test/webgl-conformance/conformance/more/all_tests.html b/dom/canvas/test/webgl-conformance/conformance/more/all_tests.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/all_tests.html
rename to dom/canvas/test/webgl-conformance/conformance/more/all_tests.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html b/dom/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html
rename to dom/canvas/test/webgl-conformance/conformance/more/all_tests_linkonly.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html b/dom/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html
rename to dom/canvas/test/webgl-conformance/conformance/more/all_tests_sequential.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-A.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B1.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B2.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B3.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-B4.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-C.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-D_G.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-G_I.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-L_S.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/argGenerators-S_V.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/badArgsArityLessThanArgc.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/constants.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/constants.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/constants.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/constants.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/fuzzTheAPI.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/getContext.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/methods.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/methods.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/methods.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/methods.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-A.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B1.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B2.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B3.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-B4.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-C.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-D_G.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-G_I.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-L_S.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI-S_V.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPI.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/quickCheckAPIBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html b/dom/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html
rename to dom/canvas/test/webgl-conformance/conformance/more/conformance/webGLArrays.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html b/dom/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html
rename to dom/canvas/test/webgl-conformance/conformance/more/demos/opengl_web.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/demos/video.html b/dom/canvas/test/webgl-conformance/conformance/more/demos/video.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/demos/video.html
rename to dom/canvas/test/webgl-conformance/conformance/more/demos/video.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bindBuffer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bindBufferBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bindFramebufferLeaveNonZero.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bufferData.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bufferDataBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubData.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/bufferSubDataBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2D.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexImage2DBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2D.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/copyTexSubImage2DBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/deleteBufferBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/drawArrays.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/drawArraysOutOfBounds.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/drawElements.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/drawElementsBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/isTests.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/isTests.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/isTests.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/isTests.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/readPixels.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/readPixelsBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2D.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTML.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texImage2DHTMLBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2D.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTML.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/texSubImage2DHTMLBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrix.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformMatrixBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformf.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfArrayLen1.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformfBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformi.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/uniformiBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttrib.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointer.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html b/dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html
rename to dom/canvas/test/webgl-conformance/conformance/more/functions/vertexAttribPointerBadArgs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html b/dom/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html
rename to dom/canvas/test/webgl-conformance/conformance/more/glsl/arrayOutOfBounds.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html b/dom/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html
rename to dom/canvas/test/webgl-conformance/conformance/more/glsl/longLoops.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html b/dom/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html
rename to dom/canvas/test/webgl-conformance/conformance/more/glsl/uniformOutOfBounds.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html b/dom/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html
rename to dom/canvas/test/webgl-conformance/conformance/more/glsl/unusedAttribsUniforms.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/index.html b/dom/canvas/test/webgl-conformance/conformance/more/index.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/index.html
rename to dom/canvas/test/webgl-conformance/conformance/more/index.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html b/dom/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html
rename to dom/canvas/test/webgl-conformance/conformance/more/performance/CPUvsGPU.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html b/dom/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html
rename to dom/canvas/test/webgl-conformance/conformance/more/performance/bandwidth.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html b/dom/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html
rename to dom/canvas/test/webgl-conformance/conformance/more/performance/jsGCPause.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html b/dom/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html
rename to dom/canvas/test/webgl-conformance/conformance/more/performance/jsMatrixMult.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html b/dom/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html
rename to dom/canvas/test/webgl-conformance/conformance/more/performance/jsToGLOverhead.html
diff --git a/content/canvas/test/webgl-conformance/conformance/more/unit.css b/dom/canvas/test/webgl-conformance/conformance/more/unit.css
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/unit.css
rename to dom/canvas/test/webgl-conformance/conformance/more/unit.css
diff --git a/content/canvas/test/webgl-conformance/conformance/more/unit.js b/dom/canvas/test/webgl-conformance/conformance/more/unit.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/unit.js
rename to dom/canvas/test/webgl-conformance/conformance/more/unit.js
diff --git a/content/canvas/test/webgl-conformance/conformance/more/util.js b/dom/canvas/test/webgl-conformance/conformance/more/util.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/more/util.js
rename to dom/canvas/test/webgl-conformance/conformance/more/util.js
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/programs/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/get-active-test.html b/dom/canvas/test/webgl-conformance/conformance/programs/get-active-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/get-active-test.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/get-active-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html b/dom/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/gl-bind-attrib-location-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html b/dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-attribute.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html b/dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/gl-get-active-uniform.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html b/dom/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/gl-getshadersource.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html b/dom/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/gl-shader-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html b/dom/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/invalid-UTF-16.html
diff --git a/content/canvas/test/webgl-conformance/conformance/programs/program-test.html b/dom/canvas/test/webgl-conformance/conformance/programs/program-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/programs/program-test.html
rename to dom/canvas/test/webgl-conformance/conformance/programs/program-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/reading/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html b/dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html
rename to dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-pack-alignment.html
diff --git a/content/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html b/dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html
rename to dom/canvas/test/webgl-conformance/conformance/reading/read-pixels-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/renderbuffers/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html b/dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html
rename to dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-object-attachment.html
diff --git a/content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html b/dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html
rename to dom/canvas/test/webgl-conformance/conformance/renderbuffers/framebuffer-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html b/dom/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html
rename to dom/canvas/test/webgl-conformance/conformance/renderbuffers/renderbuffer-initialization.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/rendering/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html b/dom/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/draw-arrays-out-of-bounds.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html b/dom/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/draw-elements-out-of-bounds.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html b/dom/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/gl-clear.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html b/dom/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/gl-drawelements.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html b/dom/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/gl-scissor-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html b/dom/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/line-loop-tri-fan.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html b/dom/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/more-than-65536-indices.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/point-size.html b/dom/canvas/test/webgl-conformance/conformance/rendering/point-size.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/point-size.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/point-size.html
diff --git a/content/canvas/test/webgl-conformance/conformance/rendering/triangle.html b/dom/canvas/test/webgl-conformance/conformance/rendering/triangle.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/rendering/triangle.html
rename to dom/canvas/test/webgl-conformance/conformance/rendering/triangle.html
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/3x3.png b/dom/canvas/test/webgl-conformance/conformance/resources/3x3.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/3x3.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/3x3.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg b/dom/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg
rename to dom/canvas/test/webgl-conformance/conformance/resources/blue-1x1.jpg
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/boolUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png b/dom/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/bug-32888-texture.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/floatUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag b/dom/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag
rename to dom/canvas/test/webgl-conformance/conformance/resources/fragmentShader.frag
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js b/dom/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js
rename to dom/canvas/test/webgl-conformance/conformance/resources/glsl-conformance-test.js
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css b/dom/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css
rename to dom/canvas/test/webgl-conformance/conformance/resources/glsl-feature-tests.css
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js b/dom/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js
rename to dom/canvas/test/webgl-conformance/conformance/resources/glsl-generator.js
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256-with-128-alpha.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-256.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-default-gamma.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma0.1.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma1.0.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma2.0.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma4.0.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp-gamma9.0.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png b/dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/gray-ramp.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png b/dom/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/green-2x2-16bit.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/intArrayUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/intUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/matUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag b/dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag
rename to dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.frag
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/noopUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4 b/dom/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4
rename to dom/canvas/test/webgl-conformance/conformance/resources/npot-video.mp4
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv b/dom/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv
rename to dom/canvas/test/webgl-conformance/conformance/resources/npot-video.theora.ogv
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm b/dom/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm
rename to dom/canvas/test/webgl-conformance/conformance/resources/npot-video.webmvp8.webm
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/pnglib.js b/dom/canvas/test/webgl-conformance/conformance/resources/pnglib.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/pnglib.js
rename to dom/canvas/test/webgl-conformance/conformance/resources/pnglib.js
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/red-green.mp4 b/dom/canvas/test/webgl-conformance/conformance/resources/red-green.mp4
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/red-green.mp4
rename to dom/canvas/test/webgl-conformance/conformance/resources/red-green.mp4
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/red-green.png b/dom/canvas/test/webgl-conformance/conformance/resources/red-green.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/red-green.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/red-green.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv b/dom/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv
rename to dom/canvas/test/webgl-conformance/conformance/resources/red-green.theora.ogv
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm b/dom/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm
rename to dom/canvas/test/webgl-conformance/conformance/resources/red-green.webmvp8.webm
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/red-indexed.png b/dom/canvas/test/webgl-conformance/conformance/resources/red-indexed.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/red-indexed.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/red-indexed.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag b/dom/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag
rename to dom/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-cie-rgb-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colormatch-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.jpg
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-colorspin-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-e-srgb-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-smpte-c-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png b/dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/structUniformShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert b/dom/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert
rename to dom/canvas/test/webgl-conformance/conformance/resources/vertexShader.vert
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js b/dom/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js
rename to dom/canvas/test/webgl-conformance/conformance/resources/webgl-test-utils.js
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/webgl-test.js b/dom/canvas/test/webgl-conformance/conformance/resources/webgl-test.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/webgl-test.js
rename to dom/canvas/test/webgl-conformance/conformance/resources/webgl-test.js
diff --git a/content/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png b/dom/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png
rename to dom/canvas/test/webgl-conformance/conformance/resources/zero-alpha.png
diff --git a/content/canvas/test/webgl-conformance/conformance/state/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/state/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/state/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-enable-enum-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-enum-tests.html
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-get-calls.html
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-geterror.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-geterror.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-geterror.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-geterror.html
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-getstring.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-getstring.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-getstring.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-getstring.html
diff --git a/content/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html b/dom/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html
rename to dom/canvas/test/webgl-conformance/conformance/state/gl-object-get-calls.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/textures/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html b/dom/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/compressed-tex-image.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html b/dom/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/copy-tex-image-and-sub-image-2d.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html b/dom/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/gl-pixelstorei.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html b/dom/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/gl-teximage.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html b/dom/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/origin-clean-conformance.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-image.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-sub-image-2d-with-video.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-and-uniform-binding-bugs.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-format-and-type.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-image-with-invalid-data.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-input-validation.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d-bad-args.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html b/dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/tex-sub-image-2d.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html b/dom/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texparameter-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind-2.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-active-bind.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-clear.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-clear.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-clear.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-clear.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-complete.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-complete.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-complete.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-complete.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-formats-test.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-mips.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-mips.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-mips.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-mips.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-npot-video.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-npot.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-npot.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-npot.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-npot.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-size-cube-maps.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-size.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-size.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-size.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-size.html
diff --git a/content/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html b/dom/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html
rename to dom/canvas/test/webgl-conformance/conformance/textures/texture-transparent-pixels-initialized.html
diff --git a/content/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/typedarrays/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html b/dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html
rename to dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-crash.html
diff --git a/content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html b/dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html
rename to dom/canvas/test/webgl-conformance/conformance/typedarrays/array-buffer-view-crash.html
diff --git a/content/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html b/dom/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html
rename to dom/canvas/test/webgl-conformance/conformance/typedarrays/array-unit-tests.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt b/dom/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/00_test_list.txt
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-arrays.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniform-bool.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/gl-uniformmatrix4fv.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/gl-unknown-uniform.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/null-uniform-location.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-location.html
diff --git a/content/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html b/dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html
rename to dom/canvas/test/webgl-conformance/conformance/uniforms/uniform-samplers-test.html
diff --git a/content/canvas/test/webgl-conformance/dont-load-image-from-internet.patch b/dom/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
similarity index 98%
rename from content/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
rename to dom/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
index 648057cf3a1..d31aa63f942 100644
--- a/content/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
+++ b/dom/canvas/test/webgl-conformance/dont-load-image-from-internet.patch
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 7840bd30b599390361d5afb91d40b4635b3a6f34
 
-diff --git a/content/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html b/content/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
---- a/content/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
-+++ b/content/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
+diff --git a/dom/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html b/dom/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
+--- a/dom/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
++++ b/dom/canvas/test/webgl/conformance/more/functions/readPixelsBadArgs.html
 @@ -110,10 +110,10 @@ Tests.testReadPixelsSOPCanvas = function
  
  Tests.endUnit = function(gl) {
@@ -14,11 +14,11 @@ diff --git a/content/canvas/test/webgl/conformance/more/functions/readPixelsBadA
  <canvas id="gl" width="16" height="16"></canvas>
  <canvas id="c" width="128" height="128"></canvas>
 -<img id="i" src="http://www.opengl.org/img/opengl_logo.jpg">
-+<img id="i" src="http://example.com/tests/content/canvas/test/webgl/resources/opengl_logo.jpg">
++<img id="i" src="http://example.com/tests/dom/canvas/test/webgl/resources/opengl_logo.jpg">
  </body></html>
-diff --git a/content/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html b/content/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
---- a/content/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
-+++ b/content/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
+diff --git a/dom/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html b/dom/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
+--- a/dom/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
++++ b/dom/canvas/test/webgl/conformance/more/functions/texImage2DHTML.html
 @@ -142,11 +142,11 @@ void main()
      vec4 c = texture2D(Texture, texCoord0.st);
      gl_FragColor = c;
@@ -29,12 +29,12 @@ diff --git a/content/canvas/test/webgl/conformance/more/functions/texImage2DHTML
  <canvas id="c" width="256" height="256"></canvas>
  <img id="i" width="256" height="256"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAATVElEQVR4nO3d+VPUd57Hcf2b9k9Y+z44+qK7OZoGFVA5VfBGzah9cxpNzGEOoRua5lBEue/DK4fZ7MapmSm3Mlshu8xOdCpDJt3v/aEBAUHAOMG4z0fV53fqU/V6fd7fT/e32bEDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwOvBkar7l+3+GwBsk8xUrT0rTb8vx2Q45janlu7YsWPnsgXgTeYwak85U3Xv5ZiM3+XbUh/l2dICBc6080WZ1ur92baSHRQB8GayGdUWu1HzoSNFO+ZM1f2cbTLM51lT5woc5rkDObbZ/Vm2SEm23VvsyjhV5nJQBsCbxGZQVtmN6p4Mo/YPdqNGHKlayUrXJ9zWlESh0xIvzsmYL3HZ54pzMm6VuRyRMpfTW+pyUAbAm8BmVNVnGNTTdqP6vzOMGrGnaMSZqpNsk17ybKlS6DTL/ixbotRlj5flOubL3I65MpfjVrnbEalYKINSl335vQGA3wKbUW2xGdWRDKP66wyjWhYLwJGiFWeaTrJNBnFbU2SP3ST7s6xSmmuXcrczUe52xstzHfPlbsdcudt5qyzX3lKWlxkszXGeK8mxnyzJySjeQRkArzebQVllM6p7bUb149UF4EjVSmaaTrLS9eKypMgee7ocyLZJmdshFXmZUpHnXFEGB/OzJsrdjqEyt/NmWa49XJbt9Ja6Mk4Vu7hEBF5LNr2q3mZQz9gM6u9XFEBqsgCcaTrJXJgEci0pstdhkv3ZNinNTZbAofwsOZSfJQfzMqU8z5kodzsSZbmOeIXb+XW52zFa5nLcKnPZI2ULl4jFfKIAvB7MOrXFZlBHbAb11zaj+kmGUbNuAWSm65dKYHdGmhRlWqQ8zyFHCnLk+L5cOV6UK0cKXVK5J1sO5mdKhdspZavKoDTX0VPiciTLIHtFGVAIwK/NYlBW2fTqXptB/dhmSJ7+LyqArHS95JiTJVDgNEllQZZ4KgulrrpU6qtLJXBsv5wt3yMn9rvlaIFLDi8vg1xH4mB+5p+Wl0Fpjr2lJMcRLM6ynyvOzjhxIIt7A+BXY9Gr6q0L4/9SAaRoxL7w/L9WAWSbDJJrTZFid4Z4jxZJU/1xufHhOem+ek6il0/LB74qaTxTJoGj++Vs2R45vj9XjhTkyOHdC48JC2VwaHfmnyrczn+vcDsmynLtQyU5GTeLczLCpTk2T3GW7VhxVsae7d4f4I1l1qktVoM6YjOovrYa1D8sFoB9WQE415kA8u1pcvRAjnwUOiLDLQG5190o9242ylRHnQyG/XLz6nmJXqqWD3yV0nC6VPxH98nZst1yfF+uHC10SdXebDmUnyyDqoLs7w7lZ35b7nb8scxt/7dSl32kJCejqyQn40pJTkbZDiYC4NWzaJVVVr2q12ZQPbYa1H9fuwB0SwWQla6XLFOyAAoyTfLW4T3SfuWM3L3RIA/7L8vD/svyZe8l+ezW23Kvu1EmO2ploNkn3VfPSevb1fK+t1Iaz5RJ7cli8R0pktOl+XKsKFkGBxfKoHJv1l8P5mf+uSLP8fvyXMdMmdsRKXc5qotdGQXbvV/AG8WiV9Vb9aoZq141azOoxWbcXAHkWlOkJC9Dak8Xy61PL8iDnotLBbBUBH2X5Yvbl+RBz0W5e6NBJtprpL/ZJzc/Oi/XP3hLWi6ekvc8h6WuukS8Vc/KYPEC8WhhzpOqguzvKvdmfXV4d2b3wfzM9w/lZTENAK+CWaewWHWqiE2v+tqqV/2w2QLINhkkP2Nh/K89ImNtIfmi99Kz8Pcl15dL65J80XtJPr/1tty/2Sh3uxvkzvV6GY+FpO+aV65/8DuJXDwpVzyHpO7UQhmU5MvRIpdU7c2RQ7uz5MR+9x+OFbnuHi3MiVQVuKoP784u2u79A37TLFpllVWn6rXqVY+tetWPGxbAsgvAvU6TvHVot8SunJY7N+rly761g/9lb3J9sWx9fvuSfH77bXnQc1HudTfITFedjLWFpPeaR7o+eEvCjSflyoVDUlddKsHjB+TC4UI5VZwnVQU5ibcq9nx1ujS/58QB99XqYnf5DqYB4OVYdM/Gf6te9Y/k8//GBeCyGKXEnSE11Qek55Pzcv9m48rQrxP8L25fki9uvy2fr1qf3bqYnAxuNMh0Z52MRINy+1OPXP/wd9J+5Yw015+Qd84flJqTxXLhcIGcLM77+UhBzt8uVBa2nqvce/ZsxZ6y7d5L4Ddlcfy36FVfW/SqH6wGlawugMWvATvTlhWAySB5GalydH+OfFRzREajQfn81tvrh/6FwV9cF+WzWxflwa2Lcr/notzrbpSZ6/Uy1VUnkx21MtwSkJ5PLkjHe2elqf64XD53UEInDiQuHC6Yry7Omz1W5HrY+FbF4R1MA8DmWLTKKsuy8d9qUL+wAJZ/C3CPM13OHtwtbe+elunr9fLFusF/PvSf31o7+A96nq37PRflfk+j3L+Z/Fjx7o0Gme6qk4n2Ghlq8UvPx+el/coZuVZ3XC6fq/i57lTx32pOHngUOlUc/jR4lEtCYCMWnareolfNWPSqWatB9dOaBbDGl4BcFqMUu20SOnVAbn58Tu52N27qtP98g9A/WAz9QvAX173FEuhukLvdDcnJoLNWxmM1Mhjxy82Pzknn+2cSsXdPz4cbT8x+GKh8+FHwSO0OSgBYm1mnsJh1qohFr1wY/5XxZwWw/teAs9KTvwtwZH+2XA1VyXBrUB70XFz/tF9nzN9K8O91N8i9hfAvrjs3GuTOjXqZXnhEGG+vkdFoUAbD/p97Pj7/t56r57/pu+b5pOXd6qPbvdfAa8ei3VVl0al6LXrlY4tO+aNFr0pstgD2ONLlzMHdEn2nWqY66+SzlxzzHywb858L/TrBv3vjWfgX18z15JruqpOpzlqZaA8lxmKhv49Gg3/oD/s+3u69Bl47Fp2i3qJVzVh0ylmrTvmTVZ+8AFz5HsDzBZBjNkpxrk2Cpw5I90fn5M6Nhhee9lsOfvfmg3/n+rPwz1yvk5muOpleWJMdtfHJjprvJjtqKABgueT4r4iYdcqvzbpdP1j0yvjqArCv9SJQul7ctlSp2pctHwYrZaglIPdvNq5/2r/gYm9Twb+x9eBPd9XJVHISmJ/qrP1murOGRwBgOZN2V5VFp+y1aBfGf50ysVQAa3wHYLEAstL1stuRLqcr8qX18imZ7KiVBz0XXxj6jZ/vNxn86xsHP/kIUCdTnXXx6c7av0x11PRs914Drx2TTlFv0ipmzDrlrEWn/MmiV8lmCiDbbJADuTYJntwvN67+Tmau1ydDvmbot36x9yz49S8Z/NrFNT/dVfv7qc66k9u918BrxaxePf4r4hsVgHPh9wBzrSlSVZQtHwQqZTDil7vdjVs77bcY/JmtB1+mOmsTkx21T6a6ake2e6+B145Ju6vKpFP2mrTKx2bts/F/8VuALyqA3fY0OV2eLy2XTspEe43cf8Gz/TYEXyY7amWyoyY+1VHz/VRnXfN27zXw2lka/7XKWYtW+ZNFp5TNFEC2ySD7XVYJnNgnXR++JdNddZs+7X+d4NfKZEeNTHbUzE921Dya5PIPWClNrbCYtcnx36Td9YNZp4hbdKqNC2Bh/K8szJL3/YdlIOyTOzcatvwx3sY3+r8o+DLZEUpMtNc8mehg/AeeY1LvqjJplb0mjeKxWav40axVJlYXwFpvAmam6STfnibVZXkSefukjMVCcrd7EyP+eqf9loJfu2HwJzpqZKK9RsbbQ/HJ9tD3k501jP/AaiaNot6kSY7/Zq3iJ7NOKYsXgC8qgCyTQfblWMV/fJ90fnBWJjtrV4z3Wzntn7vRv/586Lca/GcrND/RHno02c74D6yQplZYTFpFxKRVLI3/Kwvg+ReB7CnJ3wFwWVLkcGGWvOc/LP3NXpm5Xv/LT/tNBn9yE8EfT4Y/MR4LPRlvDzH+A6uZNYpKk3ZXb/rC+G/SKhKbLYC8jDQ5VZYn4YsnZLQtKHdubC70mx3zf0nwx9tDMh4LyVgsFB+PBb8fb2f8B56TrlHUp2sV0yaNYmn830wBZKXrZV+2RXzH90nH+2dloqMmWQCv4LR/+eCHloK/EH4ZjwXnx2PBR2PtQcZ/YDmTRpmarlY0mTS7vkrTKP5q0ip+NuuUYtmgABypWnFZjHKoIFOueA9JX5NHprvqNh36zZ72vyT4C+FPjLYFn4zHgoz/wGomza7d6ZpdMZNG8Y1Jo3hi1i48/2+iAPIyUuVkqVuaGk/ISDQoM9df3Wm/Mvg1Ww7+WCwkY21BGW0Lxkfbgt+PxUKM/8BqaZpdu9PUiiaTRvGVSav4y9InABsUQGa6XoqyLeI9ViTt752R8fbQqsC/4tN+i8EfawvKaDQoI9HA/Ghb8JuxKOM/8ByT5l9T09SKQLpGMWTSKv7TrFU8NeuUieUFYFv1YyCOVK3kmJPj/7veg9J7zSNTnbWv6LR/BcFfWCPRQHwkGvjLSDTAm3/AetLVyjyTRvmOSauYNOsU35p1yn9sVABuW6qcLM2Vaw3HZbg1INNdr+a0X/sz/K0FfzQalNFoIHn6RwO/H2kL8uYf8CImza5Ck27Xe2atcsqiU8bXLYAUjWSm66QwyyzeY4USu3JaxmKhtUP/i0/7mhWhXxH8tvWCH5SRaEBGo4HESKv/yWhrgMs/YDPSdcois1bxvkWnfGrRK+NrFYA9RSvZZoMc3OuUdzwH5fa1CzLRUfNPPe3H1zjt1wv+4hpuDcRHooHvR6IBLv+AzTLrlEVmnfKhRad8al3z58C04ralyImSXLnWcEyGWv0y2VkrU13Ph/6lTvsNgj+6QfBHWgMy3BqQ4Vb//HBr4NFI1M/lH7AVFr0qYNGrHlr1qqc2gyq+/E1AZ5pOCrNM4jlaIG1XTstoW/Cfd9q/VPADMtzqTwy3+J8MM/4DL2XnihIwquI2o1rsKRrJNhmkYq9DLl+okFufnJfx9ppnoV/vc/utnvaxNcb8TQU/IMOtfhlq8ceHW/zfD0cDF7Z7I4Hfqp02vSpg06se2gzqpxlGTdyeopFca4ocL3HJp/VHZTDik4mOzY34L33ab+7EXwz+wvLND7cEbo20BjK3exOB37KdNqM6YDOoH2YY1U+dabp4QaZJLhzZK9F3q2UkGpCJDU/70Ks77TcMvl+GWnyJwYjvyVBL4J3t3jzgTbDTZlQHMoyah9lm/dOKPc74pfPl0vPxORmLhX6d035TwV9YEV98sMU/NRDm8g94VXbaU7UBl8X48ESJ6+kn9Ud+Hgh7EuPtoVdz2rdtJvQvDv5gxLewvH8ciHg7hloClu3eNOBNstNtSw34jxc9bH2nenaoxTc33h6aH4uF4uPtwcR48n/u/RNO+80G3ydDEd//DIR99wbCvsbt3izgTbTzaqgy0PPxufBINBAbbw89Go+FZsdjobnx9tDcaCw4P9oWjI/FgomxWCAx+gpO++G1xvxVwR+M+GQw7P1xMOx7PBj29fZHvFXbvVHAm2rn4prsrKkd6wiFR9tDsfH2mthILPRorC04O9YWmhuNheZG2wLzI9FgfLQtkBiNBhLPhf4XnPaLayDik4GwTwbC3v8daPY+HIj4Pupv9jL+A7+CncvXeHtN7WgsGB6NhWKjsVBsJBp8NBoNzo5EA3MLa364NRAfafUnhpPr5U77lcGXgbD37wNhz5/7m70jA2HPmW3eE+D/rZWF0BasHW4LhkeigdhILBQbbg08Gm4NzA63+OeGW/xzQ63++aEWf3yoxZdIrmWhb3k+9INLoV8KvvQ3e+MDzd4f+ps9/9Ef9rYNRHyObd4DAAtWFMJoW7B2uDUYHooGYkPRQGyoxf9oqMU3OxTxzQ1FfHNDLb75oYgvPhjxJpZWeO3gJ8PvSfQ3eX8aCHtn+5u9M33NXP4Br7MVhTDcGqgdbvWHB1v9scFWf2ww4n80GPHNDoa9c4MR39xg2Ds3EPbOD4S98YGwJzEQ9iT6m73S3+yVvmbPfH+zZ76vyfO0v9n7p75mb29/M5d/wG/Jc4Uw1OIP90f8scGIP9Yf8ccGwr5HA2Hv7ECzd26g2TvXlwx9vK/Z821/s+e/+po83/Y3eT7ra/Y0cfkH/LbtXL2GWny1A2FfuC/sjfWHvbH+Zs+jvrD3Zm+TZ6i3yTPW1+yZ7GvyXO9r9vi3908H8M+wohB6m7xlt695Tw6EfecGw15ff5Pnnb5mT6D32oUD2/x3AvgV7dyxY8fOgSavu7/Jk9V3zave7j8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICV/g9tPJEQu1XvmQAAAABJRU5ErkJggg==">
 -<img id="i2" src="http://mashable.com/wp-content/uploads/2008/08/thunderbird-logo-64x64.png">
-+<img id="i2" src="http://example.com/tests/content/canvas/test/webgl/resources/thunderbird-logo-64x64.png">
++<img id="i2" src="http://example.com/tests/dom/canvas/test/webgl/resources/thunderbird-logo-64x64.png">
  
  </body></html>
-diff --git a/content/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html b/content/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
---- a/content/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
-+++ b/content/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
+diff --git a/dom/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html b/dom/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
+--- a/dom/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
++++ b/dom/canvas/test/webgl/conformance/more/functions/texSubImage2DHTML.html
 @@ -154,11 +154,11 @@ void main()
      vec4 c = texture2D(Texture, texCoord0.st);
      gl_FragColor = c;
@@ -45,12 +45,12 @@ diff --git a/content/canvas/test/webgl/conformance/more/functions/texSubImage2DH
  <canvas id="c" width="256" height="256"></canvas>
  <img id="i" width="256" height="256"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAATVElEQVR4nO3d+VPUd57Hcf2b9k9Y+z44+qK7OZoGFVA5VfBGzah9cxpNzGEOoRua5lBEue/DK4fZ7MapmSm3Mlshu8xOdCpDJt3v/aEBAUHAOMG4z0fV53fqU/V6fd7fT/e32bEDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwOvBkar7l+3+GwBsk8xUrT0rTb8vx2Q45janlu7YsWPnsgXgTeYwak85U3Xv5ZiM3+XbUh/l2dICBc6080WZ1ur92baSHRQB8GayGdUWu1HzoSNFO+ZM1f2cbTLM51lT5woc5rkDObbZ/Vm2SEm23VvsyjhV5nJQBsCbxGZQVtmN6p4Mo/YPdqNGHKlayUrXJ9zWlESh0xIvzsmYL3HZ54pzMm6VuRyRMpfTW+pyUAbAm8BmVNVnGNTTdqP6vzOMGrGnaMSZqpNsk17ybKlS6DTL/ixbotRlj5flOubL3I65MpfjVrnbEalYKINSl335vQGA3wKbUW2xGdWRDKP66wyjWhYLwJGiFWeaTrJNBnFbU2SP3ST7s6xSmmuXcrczUe52xstzHfPlbsdcudt5qyzX3lKWlxkszXGeK8mxnyzJySjeQRkArzebQVllM6p7bUb149UF4EjVSmaaTrLS9eKypMgee7ocyLZJmdshFXmZUpHnXFEGB/OzJsrdjqEyt/NmWa49XJbt9Ja6Mk4Vu7hEBF5LNr2q3mZQz9gM6u9XFEBqsgCcaTrJXJgEci0pstdhkv3ZNinNTZbAofwsOZSfJQfzMqU8z5kodzsSZbmOeIXb+XW52zFa5nLcKnPZI2ULl4jFfKIAvB7MOrXFZlBHbAb11zaj+kmGUbNuAWSm65dKYHdGmhRlWqQ8zyFHCnLk+L5cOV6UK0cKXVK5J1sO5mdKhdspZavKoDTX0VPiciTLIHtFGVAIwK/NYlBW2fTqXptB/dhmSJ7+LyqArHS95JiTJVDgNEllQZZ4KgulrrpU6qtLJXBsv5wt3yMn9rvlaIFLDi8vg1xH4mB+5p+Wl0Fpjr2lJMcRLM6ynyvOzjhxIIt7A+BXY9Gr6q0L4/9SAaRoxL7w/L9WAWSbDJJrTZFid4Z4jxZJU/1xufHhOem+ek6il0/LB74qaTxTJoGj++Vs2R45vj9XjhTkyOHdC48JC2VwaHfmnyrczn+vcDsmynLtQyU5GTeLczLCpTk2T3GW7VhxVsae7d4f4I1l1qktVoM6YjOovrYa1D8sFoB9WQE415kA8u1pcvRAjnwUOiLDLQG5190o9242ylRHnQyG/XLz6nmJXqqWD3yV0nC6VPxH98nZst1yfF+uHC10SdXebDmUnyyDqoLs7w7lZ35b7nb8scxt/7dSl32kJCejqyQn40pJTkbZDiYC4NWzaJVVVr2q12ZQPbYa1H9fuwB0SwWQla6XLFOyAAoyTfLW4T3SfuWM3L3RIA/7L8vD/svyZe8l+ezW23Kvu1EmO2ploNkn3VfPSevb1fK+t1Iaz5RJ7cli8R0pktOl+XKsKFkGBxfKoHJv1l8P5mf+uSLP8fvyXMdMmdsRKXc5qotdGQXbvV/AG8WiV9Vb9aoZq141azOoxWbcXAHkWlOkJC9Dak8Xy61PL8iDnotLBbBUBH2X5Yvbl+RBz0W5e6NBJtprpL/ZJzc/Oi/XP3hLWi6ekvc8h6WuukS8Vc/KYPEC8WhhzpOqguzvKvdmfXV4d2b3wfzM9w/lZTENAK+CWaewWHWqiE2v+tqqV/2w2QLINhkkP2Nh/K89ImNtIfmi99Kz8Pcl15dL65J80XtJPr/1tty/2Sh3uxvkzvV6GY+FpO+aV65/8DuJXDwpVzyHpO7UQhmU5MvRIpdU7c2RQ7uz5MR+9x+OFbnuHi3MiVQVuKoP784u2u79A37TLFpllVWn6rXqVY+tetWPGxbAsgvAvU6TvHVot8SunJY7N+rly761g/9lb3J9sWx9fvuSfH77bXnQc1HudTfITFedjLWFpPeaR7o+eEvCjSflyoVDUlddKsHjB+TC4UI5VZwnVQU5ibcq9nx1ujS/58QB99XqYnf5DqYB4OVYdM/Gf6te9Y/k8//GBeCyGKXEnSE11Qek55Pzcv9m48rQrxP8L25fki9uvy2fr1qf3bqYnAxuNMh0Z52MRINy+1OPXP/wd9J+5Yw015+Qd84flJqTxXLhcIGcLM77+UhBzt8uVBa2nqvce/ZsxZ6y7d5L4Ddlcfy36FVfW/SqH6wGlawugMWvATvTlhWAySB5GalydH+OfFRzREajQfn81tvrh/6FwV9cF+WzWxflwa2Lcr/notzrbpSZ6/Uy1VUnkx21MtwSkJ5PLkjHe2elqf64XD53UEInDiQuHC6Yry7Omz1W5HrY+FbF4R1MA8DmWLTKKsuy8d9qUL+wAJZ/C3CPM13OHtwtbe+elunr9fLFusF/PvSf31o7+A96nq37PRflfk+j3L+Z/Fjx7o0Gme6qk4n2Ghlq8UvPx+el/coZuVZ3XC6fq/i57lTx32pOHngUOlUc/jR4lEtCYCMWnareolfNWPSqWatB9dOaBbDGl4BcFqMUu20SOnVAbn58Tu52N27qtP98g9A/WAz9QvAX173FEuhukLvdDcnJoLNWxmM1Mhjxy82Pzknn+2cSsXdPz4cbT8x+GKh8+FHwSO0OSgBYm1mnsJh1qohFr1wY/5XxZwWw/teAs9KTvwtwZH+2XA1VyXBrUB70XFz/tF9nzN9K8O91N8i9hfAvrjs3GuTOjXqZXnhEGG+vkdFoUAbD/p97Pj7/t56r57/pu+b5pOXd6qPbvdfAa8ei3VVl0al6LXrlY4tO+aNFr0pstgD2ONLlzMHdEn2nWqY66+SzlxzzHywb858L/TrBv3vjWfgX18z15JruqpOpzlqZaA8lxmKhv49Gg3/oD/s+3u69Bl47Fp2i3qJVzVh0ylmrTvmTVZ+8AFz5HsDzBZBjNkpxrk2Cpw5I90fn5M6Nhhee9lsOfvfmg3/n+rPwz1yvk5muOpleWJMdtfHJjprvJjtqKABgueT4r4iYdcqvzbpdP1j0yvjqArCv9SJQul7ctlSp2pctHwYrZaglIPdvNq5/2r/gYm9Twb+x9eBPd9XJVHISmJ/qrP1murOGRwBgOZN2V5VFp+y1aBfGf50ysVQAa3wHYLEAstL1stuRLqcr8qX18imZ7KiVBz0XXxj6jZ/vNxn86xsHP/kIUCdTnXXx6c7av0x11PRs914Drx2TTlFv0ipmzDrlrEWn/MmiV8lmCiDbbJADuTYJntwvN67+Tmau1ydDvmbot36x9yz49S8Z/NrFNT/dVfv7qc66k9u918BrxaxePf4r4hsVgHPh9wBzrSlSVZQtHwQqZTDil7vdjVs77bcY/JmtB1+mOmsTkx21T6a6ake2e6+B145Ju6vKpFP2mrTKx2bts/F/8VuALyqA3fY0OV2eLy2XTspEe43cf8Gz/TYEXyY7amWyoyY+1VHz/VRnXfN27zXw2lka/7XKWYtW+ZNFp5TNFEC2ySD7XVYJnNgnXR++JdNddZs+7X+d4NfKZEeNTHbUzE921Dya5PIPWClNrbCYtcnx36Td9YNZp4hbdKqNC2Bh/K8szJL3/YdlIOyTOzcatvwx3sY3+r8o+DLZEUpMtNc8mehg/AeeY1LvqjJplb0mjeKxWav40axVJlYXwFpvAmam6STfnibVZXkSefukjMVCcrd7EyP+eqf9loJfu2HwJzpqZKK9RsbbQ/HJ9tD3k501jP/AaiaNot6kSY7/Zq3iJ7NOKYsXgC8qgCyTQfblWMV/fJ90fnBWJjtrV4z3Wzntn7vRv/586Lca/GcrND/RHno02c74D6yQplZYTFpFxKRVLI3/Kwvg+ReB7CnJ3wFwWVLkcGGWvOc/LP3NXpm5Xv/LT/tNBn9yE8EfT4Y/MR4LPRlvDzH+A6uZNYpKk3ZXb/rC+G/SKhKbLYC8jDQ5VZYn4YsnZLQtKHdubC70mx3zf0nwx9tDMh4LyVgsFB+PBb8fb2f8B56TrlHUp2sV0yaNYmn830wBZKXrZV+2RXzH90nH+2dloqMmWQCv4LR/+eCHloK/EH4ZjwXnx2PBR2PtQcZ/YDmTRpmarlY0mTS7vkrTKP5q0ip+NuuUYtmgABypWnFZjHKoIFOueA9JX5NHprvqNh36zZ72vyT4C+FPjLYFn4zHgoz/wGomza7d6ZpdMZNG8Y1Jo3hi1i48/2+iAPIyUuVkqVuaGk/ISDQoM9df3Wm/Mvg1Ww7+WCwkY21BGW0Lxkfbgt+PxUKM/8BqaZpdu9PUiiaTRvGVSav4y9InABsUQGa6XoqyLeI9ViTt752R8fbQqsC/4tN+i8EfawvKaDQoI9HA/Ghb8JuxKOM/8ByT5l9T09SKQLpGMWTSKv7TrFU8NeuUieUFYFv1YyCOVK3kmJPj/7veg9J7zSNTnbWv6LR/BcFfWCPRQHwkGvjLSDTAm3/AetLVyjyTRvmOSauYNOsU35p1yn9sVABuW6qcLM2Vaw3HZbg1INNdr+a0X/sz/K0FfzQalNFoIHn6RwO/H2kL8uYf8CImza5Ck27Xe2atcsqiU8bXLYAUjWSm66QwyyzeY4USu3JaxmKhtUP/i0/7mhWhXxH8tvWCH5SRaEBGo4HESKv/yWhrgMs/YDPSdcois1bxvkWnfGrRK+NrFYA9RSvZZoMc3OuUdzwH5fa1CzLRUfNPPe3H1zjt1wv+4hpuDcRHooHvR6IBLv+AzTLrlEVmnfKhRad8al3z58C04ralyImSXLnWcEyGWv0y2VkrU13Ph/6lTvsNgj+6QfBHWgMy3BqQ4Vb//HBr4NFI1M/lH7AVFr0qYNGrHlr1qqc2gyq+/E1AZ5pOCrNM4jlaIG1XTstoW/Cfd9q/VPADMtzqTwy3+J8MM/4DL2XnihIwquI2o1rsKRrJNhmkYq9DLl+okFufnJfx9ppnoV/vc/utnvaxNcb8TQU/IMOtfhlq8ceHW/zfD0cDF7Z7I4Hfqp02vSpg06se2gzqpxlGTdyeopFca4ocL3HJp/VHZTDik4mOzY34L33ab+7EXwz+wvLND7cEbo20BjK3exOB37KdNqM6YDOoH2YY1U+dabp4QaZJLhzZK9F3q2UkGpCJDU/70Ks77TcMvl+GWnyJwYjvyVBL4J3t3jzgTbDTZlQHMoyah9lm/dOKPc74pfPl0vPxORmLhX6d035TwV9YEV98sMU/NRDm8g94VXbaU7UBl8X48ESJ6+kn9Ud+Hgh7EuPtoVdz2rdtJvQvDv5gxLewvH8ciHg7hloClu3eNOBNstNtSw34jxc9bH2nenaoxTc33h6aH4uF4uPtwcR48n/u/RNO+80G3ydDEd//DIR99wbCvsbt3izgTbTzaqgy0PPxufBINBAbbw89Go+FZsdjobnx9tDcaCw4P9oWjI/FgomxWCAx+gpO++G1xvxVwR+M+GQw7P1xMOx7PBj29fZHvFXbvVHAm2rn4prsrKkd6wiFR9tDsfH2mthILPRorC04O9YWmhuNheZG2wLzI9FgfLQtkBiNBhLPhf4XnPaLayDik4GwTwbC3v8daPY+HIj4Pupv9jL+A7+CncvXeHtN7WgsGB6NhWKjsVBsJBp8NBoNzo5EA3MLa364NRAfafUnhpPr5U77lcGXgbD37wNhz5/7m70jA2HPmW3eE+D/rZWF0BasHW4LhkeigdhILBQbbg08Gm4NzA63+OeGW/xzQ63++aEWf3yoxZdIrmWhb3k+9INLoV8KvvQ3e+MDzd4f+ps9/9Ef9rYNRHyObd4DAAtWFMJoW7B2uDUYHooGYkPRQGyoxf9oqMU3OxTxzQ1FfHNDLb75oYgvPhjxJpZWeO3gJ8PvSfQ3eX8aCHtn+5u9M33NXP4Br7MVhTDcGqgdbvWHB1v9scFWf2ww4n80GPHNDoa9c4MR39xg2Ds3EPbOD4S98YGwJzEQ9iT6m73S3+yVvmbPfH+zZ76vyfO0v9n7p75mb29/M5d/wG/Jc4Uw1OIP90f8scGIP9Yf8ccGwr5HA2Hv7ECzd26g2TvXlwx9vK/Z821/s+e/+po83/Y3eT7ra/Y0cfkH/LbtXL2GWny1A2FfuC/sjfWHvbH+Zs+jvrD3Zm+TZ6i3yTPW1+yZ7GvyXO9r9vi3908H8M+wohB6m7xlt695Tw6EfecGw15ff5Pnnb5mT6D32oUD2/x3AvgV7dyxY8fOgSavu7/Jk9V3zave7j8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICV/g9tPJEQu1XvmQAAAABJRU5ErkJggg==">
 -<img id="i2" src="http://mashable.com/wp-content/uploads/2008/08/thunderbird-logo-64x64.png">
-+<img id="i2" src="http://example.com/tests/content/canvas/test/webgl/resources/thunderbird-logo-64x64.png">
++<img id="i2" src="http://example.com/tests/dom/canvas/test/webgl/resources/thunderbird-logo-64x64.png">
  
  </body></html>
-diff --git a/content/canvas/test/webgl/conformance/textures/origin-clean-conformance.html b/content/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
---- a/content/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
-+++ b/content/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
+diff --git a/dom/canvas/test/webgl/conformance/textures/origin-clean-conformance.html b/dom/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
+--- a/dom/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
++++ b/dom/canvas/test/webgl/conformance/textures/origin-clean-conformance.html
 @@ -118,11 +118,11 @@ window.onload = function() {
  }
  </script>
@@ -61,10 +61,10 @@ diff --git a/content/canvas/test/webgl/conformance/textures/origin-clean-conform
  <canvas id="canvas1"></canvas>
  <canvas id="canvas2"></canvas>
 -<img id="img" src="http://www.opengl.org/img/opengl_logo.jpg" style="display:none;">
-+<img id="img" src="http://example.com/tests/content/canvas/test/webgl/resources/opengl_logo.jpg" style="display:none;">
++<img id="img" src="http://example.com/tests/dom/canvas/test/webgl/resources/opengl_logo.jpg" style="display:none;">
  </body>
  </html>
-diff --git a/content/canvas/test/webgl/resources/opengl_logo.jpg b/content/canvas/test/webgl/resources/opengl_logo.jpg
+diff --git a/dom/canvas/test/webgl/resources/opengl_logo.jpg b/dom/canvas/test/webgl/resources/opengl_logo.jpg
 new file mode 100644
 index 0000000000000000000000000000000000000000..e3b70bef3f2c78736c72e263b63acea8d9a9467a
 GIT binary patch
@@ -181,7 +181,7 @@ z=iUN*6P526MKx5(vuDYuK<94#%&o^t6+xl8o=z}hPU9RN<*>do6PDn#f)9kB0;Q;!
 zfYcVwLp^QywE1HHD8c{Rm?Wo&8P7<zX&n@zPJY-!6L!Ry5{bdG?<5>0Va(zMpZ`||
 I?(NKf0MJeN7XSbN
 
-diff --git a/content/canvas/test/webgl/resources/thunderbird-logo-64x64.png b/content/canvas/test/webgl/resources/thunderbird-logo-64x64.png
+diff --git a/dom/canvas/test/webgl/resources/thunderbird-logo-64x64.png b/dom/canvas/test/webgl/resources/thunderbird-logo-64x64.png
 new file mode 100644
 index 0000000000000000000000000000000000000000..e2326f5510a0d2f89601c62459032be9d64585da
 GIT binary patch
diff --git a/content/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch b/dom/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
similarity index 92%
rename from content/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
rename to dom/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
index a3b9412f772..79c603a40d5 100644
--- a/content/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
+++ b/dom/canvas/test/webgl-conformance/ext-texture-filter-anisotropic.patch
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent b21ff47f08bc84b2f4b76348421f9144661da44f
 
-diff --git a/content/canvas/test/webgl/conformance/extensions/00_test_list.txt b/content/canvas/test/webgl/conformance/extensions/00_test_list.txt
---- a/content/canvas/test/webgl/conformance/extensions/00_test_list.txt
-+++ b/content/canvas/test/webgl/conformance/extensions/00_test_list.txt
+diff --git a/dom/canvas/test/webgl/conformance/extensions/00_test_list.txt b/dom/canvas/test/webgl/conformance/extensions/00_test_list.txt
+--- a/dom/canvas/test/webgl/conformance/extensions/00_test_list.txt
++++ b/dom/canvas/test/webgl/conformance/extensions/00_test_list.txt
 @@ -1,7 +1,8 @@
  oes-standard-derivatives.html
 +ext-texture-filter-anisotropic.html
@@ -13,10 +13,10 @@ diff --git a/content/canvas/test/webgl/conformance/extensions/00_test_list.txt b
  webgl-debug-shaders.html
  --min-version 1.0.2 webgl-compressed-texture-s3tc.html
  
-diff --git a/content/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html b/content/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html
+diff --git a/dom/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html b/dom/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html
 new file mode 100644
 --- /dev/null
-+++ b/content/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html
++++ b/dom/canvas/test/webgl/conformance/extensions/ext-texture-filter-anisotropic.html
 @@ -0,0 +1,177 @@
 +<!--
 +Copyright (c) 2012 Florian Boesch <pyalot@gmail.com>. All rights reserved.
diff --git a/content/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png b/dom/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png
rename to dom/canvas/test/webgl-conformance/extra/50x50pixel-black-with-red-triangle.png
diff --git a/content/canvas/test/webgl-conformance/extra/big-fbos-example.html b/dom/canvas/test/webgl-conformance/extra/big-fbos-example.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/big-fbos-example.html
rename to dom/canvas/test/webgl-conformance/extra/big-fbos-example.html
diff --git a/content/canvas/test/webgl-conformance/extra/canvas-compositing-test.html b/dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/canvas-compositing-test.html
rename to dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.html
diff --git a/content/canvas/test/webgl-conformance/extra/canvas-compositing-test.png b/dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/canvas-compositing-test.png
rename to dom/canvas/test/webgl-conformance/extra/canvas-compositing-test.png
diff --git a/content/canvas/test/webgl-conformance/extra/fbo-lost-context.html b/dom/canvas/test/webgl-conformance/extra/fbo-lost-context.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/fbo-lost-context.html
rename to dom/canvas/test/webgl-conformance/extra/fbo-lost-context.html
diff --git a/content/canvas/test/webgl-conformance/extra/lots-of-polys-example.html b/dom/canvas/test/webgl-conformance/extra/lots-of-polys-example.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/lots-of-polys-example.html
rename to dom/canvas/test/webgl-conformance/extra/lots-of-polys-example.html
diff --git a/content/canvas/test/webgl-conformance/extra/offscreen-issue.html b/dom/canvas/test/webgl-conformance/extra/offscreen-issue.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/offscreen-issue.html
rename to dom/canvas/test/webgl-conformance/extra/offscreen-issue.html
diff --git a/content/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html b/dom/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html
rename to dom/canvas/test/webgl-conformance/extra/out-of-bounds-uniform-array-access.html
diff --git a/content/canvas/test/webgl-conformance/extra/out-of-memory.html b/dom/canvas/test/webgl-conformance/extra/out-of-memory.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/out-of-memory.html
rename to dom/canvas/test/webgl-conformance/extra/out-of-memory.html
diff --git a/content/canvas/test/webgl-conformance/extra/out-of-resources.html b/dom/canvas/test/webgl-conformance/extra/out-of-resources.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/out-of-resources.html
rename to dom/canvas/test/webgl-conformance/extra/out-of-resources.html
diff --git a/content/canvas/test/webgl-conformance/extra/out-of-vram.html b/dom/canvas/test/webgl-conformance/extra/out-of-vram.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/out-of-vram.html
rename to dom/canvas/test/webgl-conformance/extra/out-of-vram.html
diff --git a/content/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html b/dom/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html
rename to dom/canvas/test/webgl-conformance/extra/simulated-attrib-0-bug-test.html
diff --git a/content/canvas/test/webgl-conformance/extra/slow-shader-example.html b/dom/canvas/test/webgl-conformance/extra/slow-shader-example.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/slow-shader-example.html
rename to dom/canvas/test/webgl-conformance/extra/slow-shader-example.html
diff --git a/content/canvas/test/webgl-conformance/extra/webgl-info.html b/dom/canvas/test/webgl-conformance/extra/webgl-info.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/extra/webgl-info.html
rename to dom/canvas/test/webgl-conformance/extra/webgl-info.html
diff --git a/content/canvas/test/webgl-conformance/failing_tests_android.txt b/dom/canvas/test/webgl-conformance/failing_tests_android.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_android.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_android.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt b/dom/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt b/dom/canvas/test/webgl-conformance/failing_tests_android_x86.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_android_x86.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_android_x86.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_linux.txt b/dom/canvas/test/webgl-conformance/failing_tests_linux.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_linux.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_linux.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt b/dom/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt b/dom/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_mac.txt b/dom/canvas/test/webgl-conformance/failing_tests_mac.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_mac.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_mac.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt b/dom/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt
diff --git a/content/canvas/test/webgl-conformance/failing_tests_windows.txt b/dom/canvas/test/webgl-conformance/failing_tests_windows.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/failing_tests_windows.txt
rename to dom/canvas/test/webgl-conformance/failing_tests_windows.txt
diff --git a/content/canvas/test/webgl-conformance/fix-webgl-harness-async.patch b/dom/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
similarity index 73%
rename from content/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
rename to dom/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
index 17651e8d2ed..4fbc007f75f 100644
--- a/content/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
+++ b/dom/canvas/test/webgl-conformance/fix-webgl-harness-async.patch
@@ -1,6 +1,6 @@
-diff --git a/content/canvas/test/webgl/resources/webgl-test-harness.js b/content/canvas/test/webgl/resources/webgl-test-harness.js
---- a/content/canvas/test/webgl/resources/webgl-test-harness.js
-+++ b/content/canvas/test/webgl/resources/webgl-test-harness.js
+diff --git a/dom/canvas/test/webgl/resources/webgl-test-harness.js b/dom/canvas/test/webgl/resources/webgl-test-harness.js
+--- a/dom/canvas/test/webgl/resources/webgl-test-harness.js
++++ b/dom/canvas/test/webgl/resources/webgl-test-harness.js
 @@ -362,18 +362,16 @@ TestHarness.prototype.addFiles_ = functi
    }
    log("total files: " + files.length);
diff --git a/content/canvas/test/webgl-conformance/gc.patch b/dom/canvas/test/webgl-conformance/gc.patch
similarity index 82%
rename from content/canvas/test/webgl-conformance/gc.patch
rename to dom/canvas/test/webgl-conformance/gc.patch
index 1bc4cae2349..346bd23c54c 100644
--- a/content/canvas/test/webgl-conformance/gc.patch
+++ b/dom/canvas/test/webgl-conformance/gc.patch
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent f9585cefcf568dbc2a6ce81f16a2048365af7ed2
 
-diff --git a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
---- a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
-+++ b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
+diff --git a/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html b/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
+--- a/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
++++ b/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
 @@ -337,42 +337,21 @@ function runOutputTests() {
      setupBuffers(1.0, 0.5, 0.5, 0.0);
      wtu.drawQuad(gl);
@@ -48,9 +48,9 @@ diff --git a/content/canvas/test/webgl/conformance/extensions/oes-standard-deriv
      // create some reference cycles. The goal is to see if they cause leaks. The point is that
      // some browser test runners have instrumentation to detect leaked refcounted objects.
  
-diff --git a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
---- a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
-+++ b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
+diff --git a/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html b/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
+--- a/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
++++ b/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
 @@ -178,42 +178,21 @@ function runRenderTargetTest(testProgram
      gl.bindTexture(gl.TEXTURE_2D, texture);
      gl.useProgram(testProgram);
@@ -95,9 +95,9 @@ diff --git a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.
      // create some reference cycles. The goal is to see if they cause leaks. The point is that
      // some browser test runners have instrumentation to detect leaked refcounted objects.
  
-diff --git a/content/canvas/test/webgl/resources/js-test-pre.js b/content/canvas/test/webgl/resources/js-test-pre.js
---- a/content/canvas/test/webgl/resources/js-test-pre.js
-+++ b/content/canvas/test/webgl/resources/js-test-pre.js
+diff --git a/dom/canvas/test/webgl/resources/js-test-pre.js b/dom/canvas/test/webgl/resources/js-test-pre.js
+--- a/dom/canvas/test/webgl/resources/js-test-pre.js
++++ b/dom/canvas/test/webgl/resources/js-test-pre.js
 @@ -435,29 +435,42 @@ function assertMsg(assertion, msg) {
      if (assertion) {
          testPassed(msg);
diff --git a/content/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch b/dom/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
similarity index 83%
rename from content/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
rename to dom/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
index d5fc605ad2c..8ac12c0cab8 100644
--- a/content/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
+++ b/dom/canvas/test/webgl-conformance/log-more-info-about-test-failures.patch
@@ -1,8 +1,8 @@
 # HG changeset patch
 # Parent 9294c812b3ebf3a2684b081886a65fa0cd0420b3
-diff --git a/content/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html b/content/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
---- a/content/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
-+++ b/content/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
+diff --git a/dom/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html b/dom/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
+--- a/dom/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
++++ b/dom/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes.html
 @@ -118,17 +118,18 @@ function init()
      var bufFunction = new Uint8Array(width * height * 4);
      var bufMacro = new Uint8Array(width * height * 4);
@@ -23,9 +23,9 @@ diff --git a/content/canvas/test/webgl/conformance/glsl/misc/glsl-function-nodes
  init();
  successfullyParsed = true;
  </script>
-diff --git a/content/canvas/test/webgl/conformance/misc/uninitialized-test.html b/content/canvas/test/webgl/conformance/misc/uninitialized-test.html
---- a/content/canvas/test/webgl/conformance/misc/uninitialized-test.html
-+++ b/content/canvas/test/webgl/conformance/misc/uninitialized-test.html
+diff --git a/dom/canvas/test/webgl/conformance/misc/uninitialized-test.html b/dom/canvas/test/webgl/conformance/misc/uninitialized-test.html
+--- a/dom/canvas/test/webgl/conformance/misc/uninitialized-test.html
++++ b/dom/canvas/test/webgl/conformance/misc/uninitialized-test.html
 @@ -57,17 +57,19 @@ function checkNonZeroPixels(texture, tex
      gl.readPixels(0, 0, texWidth, texHeight, gl.RGBA, gl.UNSIGNED_BYTE, data);
  
@@ -47,9 +47,9 @@ diff --git a/content/canvas/test/webgl/conformance/misc/uninitialized-test.html
                          k++;
                  }
              }
-diff --git a/content/canvas/test/webgl/conformance/resources/webgl-test-utils.js b/content/canvas/test/webgl/conformance/resources/webgl-test-utils.js
---- a/content/canvas/test/webgl/conformance/resources/webgl-test-utils.js
-+++ b/content/canvas/test/webgl/conformance/resources/webgl-test-utils.js
+diff --git a/dom/canvas/test/webgl/conformance/resources/webgl-test-utils.js b/dom/canvas/test/webgl/conformance/resources/webgl-test-utils.js
+--- a/dom/canvas/test/webgl/conformance/resources/webgl-test-utils.js
++++ b/dom/canvas/test/webgl/conformance/resources/webgl-test-utils.js
 @@ -445,21 +445,29 @@ var drawQuad = function(gl, opt_color) {
  var checkCanvasRect = function(gl, x, y, width, height, color, msg, errorRange) {
    errorRange = errorRange || 0;
@@ -81,9 +81,9 @@ diff --git a/content/canvas/test/webgl/conformance/resources/webgl-test-utils.js
    }
    testPassed(msg);
  };
-diff --git a/content/canvas/test/webgl/resources/js-test-pre.js b/content/canvas/test/webgl/resources/js-test-pre.js
---- a/content/canvas/test/webgl/resources/js-test-pre.js
-+++ b/content/canvas/test/webgl/resources/js-test-pre.js
+diff --git a/dom/canvas/test/webgl/resources/js-test-pre.js b/dom/canvas/test/webgl/resources/js-test-pre.js
+--- a/dom/canvas/test/webgl/resources/js-test-pre.js
++++ b/dom/canvas/test/webgl/resources/js-test-pre.js
 @@ -81,16 +81,87 @@ function testPassed(msg)
      reportTestResultsToHarness(true, msg);
      debug('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>');
diff --git a/content/canvas/test/webgl-conformance/misc/program-test-1.html b/dom/canvas/test/webgl-conformance/misc/program-test-1.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/misc/program-test-1.html
rename to dom/canvas/test/webgl-conformance/misc/program-test-1.html
diff --git a/content/canvas/test/webgl-conformance/mochitest-conformance-files.ini b/dom/canvas/test/webgl-conformance/mochitest-conformance-files.ini
similarity index 100%
rename from content/canvas/test/webgl-conformance/mochitest-conformance-files.ini
rename to dom/canvas/test/webgl-conformance/mochitest-conformance-files.ini
diff --git a/content/canvas/test/webgl-conformance/mochitest.ini b/dom/canvas/test/webgl-conformance/mochitest.ini
similarity index 100%
rename from content/canvas/test/webgl-conformance/mochitest.ini
rename to dom/canvas/test/webgl-conformance/mochitest.ini
diff --git a/content/canvas/test/webgl-conformance/moz.build b/dom/canvas/test/webgl-conformance/moz.build
similarity index 100%
rename from content/canvas/test/webgl-conformance/moz.build
rename to dom/canvas/test/webgl-conformance/moz.build
diff --git a/content/canvas/test/webgl-conformance/reference-cycle-test.patch b/dom/canvas/test/webgl-conformance/reference-cycle-test.patch
similarity index 82%
rename from content/canvas/test/webgl-conformance/reference-cycle-test.patch
rename to dom/canvas/test/webgl-conformance/reference-cycle-test.patch
index 478b1f13079..83248b43011 100644
--- a/content/canvas/test/webgl-conformance/reference-cycle-test.patch
+++ b/dom/canvas/test/webgl-conformance/reference-cycle-test.patch
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent fae4a63127468bd6447453495c82b9f6713888fb
 
-diff --git a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
---- a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
-+++ b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
+diff --git a/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html b/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
+--- a/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
++++ b/dom/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
 @@ -116,16 +116,17 @@ if (!gl) {
          testPassed("Successfully enabled OES_standard_derivatives extension");
  
@@ -53,9 +53,9 @@ diff --git a/content/canvas/test/webgl/conformance/extensions/oes-standard-deriv
  
  </body>
  </html>
-diff --git a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
---- a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
-+++ b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
+diff --git a/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html b/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
+--- a/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
++++ b/dom/canvas/test/webgl/conformance/extensions/oes-texture-float.html
 @@ -81,16 +81,17 @@ if (!gl) {
  
    if (!gl.getExtension("OES_texture_float")) {
diff --git a/content/canvas/test/webgl-conformance/resources/cors-util.js b/dom/canvas/test/webgl-conformance/resources/cors-util.js
similarity index 91%
rename from content/canvas/test/webgl-conformance/resources/cors-util.js
rename to dom/canvas/test/webgl-conformance/resources/cors-util.js
index d8611117c0f..2f16162a71a 100644
--- a/content/canvas/test/webgl-conformance/resources/cors-util.js
+++ b/dom/canvas/test/webgl-conformance/resources/cors-util.js
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function getExampleDotComURL(conformanceDirRelativePath) {
-  var prefix = 'http://example.com/tests/content/canvas/test/webgl-conformance/';
+  var prefix = 'http://example.com/tests/dom/canvas/test/webgl-conformance/';
   return prefix + conformanceDirRelativePath;
 }
 
diff --git a/content/canvas/test/webgl-conformance/resources/desktop-gl-constants.js b/dom/canvas/test/webgl-conformance/resources/desktop-gl-constants.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/desktop-gl-constants.js
rename to dom/canvas/test/webgl-conformance/resources/desktop-gl-constants.js
diff --git a/content/canvas/test/webgl-conformance/resources/js-test-pre.js b/dom/canvas/test/webgl-conformance/resources/js-test-pre.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/js-test-pre.js
rename to dom/canvas/test/webgl-conformance/resources/js-test-pre.js
diff --git a/content/canvas/test/webgl-conformance/resources/js-test-style.css b/dom/canvas/test/webgl-conformance/resources/js-test-style.css
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/js-test-style.css
rename to dom/canvas/test/webgl-conformance/resources/js-test-style.css
diff --git a/content/canvas/test/webgl-conformance/resources/opengl_logo.jpg b/dom/canvas/test/webgl-conformance/resources/opengl_logo.jpg
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/opengl_logo.jpg
rename to dom/canvas/test/webgl-conformance/resources/opengl_logo.jpg
diff --git a/content/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png b/dom/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png
rename to dom/canvas/test/webgl-conformance/resources/thunderbird-logo-64x64.png
diff --git a/content/canvas/test/webgl-conformance/resources/webgl-logo.png b/dom/canvas/test/webgl-conformance/resources/webgl-logo.png
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/webgl-logo.png
rename to dom/canvas/test/webgl-conformance/resources/webgl-logo.png
diff --git a/content/canvas/test/webgl-conformance/resources/webgl-test-harness.js b/dom/canvas/test/webgl-conformance/resources/webgl-test-harness.js
similarity index 100%
rename from content/canvas/test/webgl-conformance/resources/webgl-test-harness.js
rename to dom/canvas/test/webgl-conformance/resources/webgl-test-harness.js
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_android.txt b/dom/canvas/test/webgl-conformance/skipped_tests_android.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_android.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_android.txt
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt b/dom/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_linux.txt b/dom/canvas/test/webgl-conformance/skipped_tests_linux.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_linux.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_linux.txt
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt b/dom/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_win_vista.txt b/dom/canvas/test/webgl-conformance/skipped_tests_win_vista.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_win_vista.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_win_vista.txt
diff --git a/content/canvas/test/webgl-conformance/skipped_tests_winxp.txt b/dom/canvas/test/webgl-conformance/skipped_tests_winxp.txt
similarity index 100%
rename from content/canvas/test/webgl-conformance/skipped_tests_winxp.txt
rename to dom/canvas/test/webgl-conformance/skipped_tests_winxp.txt
diff --git a/content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html b/dom/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
rename to dom/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
diff --git a/content/canvas/test/webgl-conformance/webgl-conformance-tests.html b/dom/canvas/test/webgl-conformance/webgl-conformance-tests.html
similarity index 100%
rename from content/canvas/test/webgl-conformance/webgl-conformance-tests.html
rename to dom/canvas/test/webgl-conformance/webgl-conformance-tests.html
diff --git a/content/canvas/test/webgl-conformance/writemanifest.py b/dom/canvas/test/webgl-conformance/writemanifest.py
similarity index 100%
rename from content/canvas/test/webgl-conformance/writemanifest.py
rename to dom/canvas/test/webgl-conformance/writemanifest.py
diff --git a/content/canvas/test/webgl-mochitest/driver-info.js b/dom/canvas/test/webgl-mochitest/driver-info.js
similarity index 98%
rename from content/canvas/test/webgl-mochitest/driver-info.js
rename to dom/canvas/test/webgl-mochitest/driver-info.js
index d0c6aeb0ebb..f0142717eba 100644
--- a/content/canvas/test/webgl-mochitest/driver-info.js
+++ b/dom/canvas/test/webgl-mochitest/driver-info.js
@@ -17,7 +17,7 @@ DriverInfo = (function() {
 
   // ---------------------------------------------------------------------------
   // OS and driver identification
-  //   Stolen from content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+  //   Stolen from dom/canvas/test/webgl/test_webgl_conformance_test_suite.html
   function detectDriverInfo() {
     try {
       var cc = SpecialPowers.Cc;
diff --git a/content/canvas/test/webgl-mochitest/mochi-to-testcase.py b/dom/canvas/test/webgl-mochitest/mochi-to-testcase.py
similarity index 100%
rename from content/canvas/test/webgl-mochitest/mochi-to-testcase.py
rename to dom/canvas/test/webgl-mochitest/mochi-to-testcase.py
diff --git a/content/canvas/test/webgl-mochitest/mochitest.ini b/dom/canvas/test/webgl-mochitest/mochitest.ini
similarity index 100%
rename from content/canvas/test/webgl-mochitest/mochitest.ini
rename to dom/canvas/test/webgl-mochitest/mochitest.ini
diff --git a/content/canvas/test/webgl-mochitest/moz.build b/dom/canvas/test/webgl-mochitest/moz.build
similarity index 100%
rename from content/canvas/test/webgl-mochitest/moz.build
rename to dom/canvas/test/webgl-mochitest/moz.build
diff --git a/content/canvas/test/webgl-mochitest/test_depth_readpixels.html b/dom/canvas/test/webgl-mochitest/test_depth_readpixels.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_depth_readpixels.html
rename to dom/canvas/test/webgl-mochitest/test_depth_readpixels.html
diff --git a/content/canvas/test/webgl-mochitest/test_draw.html b/dom/canvas/test/webgl-mochitest/test_draw.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_draw.html
rename to dom/canvas/test/webgl-mochitest/test_draw.html
diff --git a/content/canvas/test/webgl-mochitest/test_fb_param.html b/dom/canvas/test/webgl-mochitest/test_fb_param.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_fb_param.html
rename to dom/canvas/test/webgl-mochitest/test_fb_param.html
diff --git a/content/canvas/test/webgl-mochitest/test_fb_param_crash.html b/dom/canvas/test/webgl-mochitest/test_fb_param_crash.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_fb_param_crash.html
rename to dom/canvas/test/webgl-mochitest/test_fb_param_crash.html
diff --git a/content/canvas/test/webgl-mochitest/test_highp_fs.html b/dom/canvas/test/webgl-mochitest/test_highp_fs.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_highp_fs.html
rename to dom/canvas/test/webgl-mochitest/test_highp_fs.html
diff --git a/content/canvas/test/webgl-mochitest/test_no_arr_points.html b/dom/canvas/test/webgl-mochitest/test_no_arr_points.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_no_arr_points.html
rename to dom/canvas/test/webgl-mochitest/test_no_arr_points.html
diff --git a/content/canvas/test/webgl-mochitest/test_noprog_draw.html b/dom/canvas/test/webgl-mochitest/test_noprog_draw.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_noprog_draw.html
rename to dom/canvas/test/webgl-mochitest/test_noprog_draw.html
diff --git a/content/canvas/test/webgl-mochitest/test_privileged_exts.html b/dom/canvas/test/webgl-mochitest/test_privileged_exts.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_privileged_exts.html
rename to dom/canvas/test/webgl-mochitest/test_privileged_exts.html
diff --git a/content/canvas/test/webgl-mochitest/test_texsubimage_float.html b/dom/canvas/test/webgl-mochitest/test_texsubimage_float.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_texsubimage_float.html
rename to dom/canvas/test/webgl-mochitest/test_texsubimage_float.html
diff --git a/content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html b/dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
rename to dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_available.html b/dom/canvas/test/webgl-mochitest/test_webgl_available.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_webgl_available.html
rename to dom/canvas/test/webgl-mochitest/test_webgl_available.html
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_conformance.html b/dom/canvas/test/webgl-mochitest/test_webgl_conformance.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_webgl_conformance.html
rename to dom/canvas/test/webgl-mochitest/test_webgl_conformance.html
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_request_context.html b/dom/canvas/test/webgl-mochitest/test_webgl_request_context.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_webgl_request_context.html
rename to dom/canvas/test/webgl-mochitest/test_webgl_request_context.html
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html b/dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
similarity index 100%
rename from content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
rename to dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
diff --git a/content/canvas/test/webgl-mochitest/webgl-util.js b/dom/canvas/test/webgl-mochitest/webgl-util.js
similarity index 100%
rename from content/canvas/test/webgl-mochitest/webgl-util.js
rename to dom/canvas/test/webgl-mochitest/webgl-util.js
diff --git a/dom/moz.build b/dom/moz.build
index 5598f538894..a13bc87c221 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -43,6 +43,7 @@ PARALLEL_DIRS += [
     'bindings',
     'battery',
     'browser-element',
+    'canvas',
     'contacts',
     'crypto',
     'phonenumberutils',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index ee46b7c8046..e939370f714 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -38,7 +38,6 @@ LOCAL_INCLUDES += [
     '../xul',
     '/caps',
     '/content/base/src',
-    '/content/canvas/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
@@ -49,6 +48,7 @@ LOCAL_INCLUDES += [
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
+    '/dom/canvas',
     '/dom/file',
     '/dom/filesystem',
     '/dom/media',
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 51e555498d4..08599e383f3 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -47,8 +47,9 @@ include box-shadow/reftest.list
 # bugs/
 include bugs/reftest.list
 
-# canvas 2D
+# canvas
 include canvas/reftest.list
+skip-if(xulFennec) include ../../dom/canvas/test/reftest/reftest.list
 
 # css animations
 include css-animations/reftest.list
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 9cf25240368..74836ab235c 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -6,7 +6,6 @@ include ../../testing/crashtest/sanity/crashtests.list
 include ../../accessible/tests/crashtests/crashtests.list
 
 include ../../content/base/crashtests/crashtests.list
-include ../../content/canvas/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
@@ -24,6 +23,7 @@ include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
+include ../../dom/canvas/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index 3caeb52d4d5..6cd85e03631 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -1,7 +1,7 @@
 {
 "runtests": {},
 "excludetests": {
-  "content/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
   "robocop": "TIMED_OUT"
   }
 }
diff --git a/testing/mochitest/android23.json b/testing/mochitest/android23.json
index ab9d55ec38a..37d00a2de4b 100644
--- a/testing/mochitest/android23.json
+++ b/testing/mochitest/android23.json
@@ -2,9 +2,9 @@
 "runtests": {},
 "excludetests": {
   "robocop": "TIMED_OUT",
-  "content/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
-  "content/canvas/test/webgl-mochitest/test_no_arr_points.html": "Android 2.3 aws only; bug 1030942",
   "docshell/test/navigation/test_reserved.html": "too slow on Android 2.3 aws only; bug 1030403",
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
+  "dom/canvas/test/webgl-mochitest/test_no_arr_points.html": "Android 2.3 aws only; bug 1030942",
   "dom/media/tests/mochitest": "Android 2.3 only; bug 981881",
   "layout/style/test/test_media_queries.html": "Android 2.3 aws only; bug 1030419",
   "layout/style/test/test_transitions_cancel_near_end.html": "Android 2.3 aws only; bug 1030432"
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index e7d419cce3b..035045d580d 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -3,35 +3,6 @@
 "excludetests": {
   "content/base/test/test_ipc_messagemanager_blob.html": "x86 only bug 936226",
   "content/base/test/test_copypaste.xul": "bug 904183",
-  "content/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
-  "content/canvas/test/test_2d.composite.canvas.luminosity.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.source-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.image.source-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.multiply.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.lighten.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.color-dodge.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.destination-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.screen.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.exclusion.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.source-out.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.soft-light.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.destination-atop.html": "x86 only bug 913662",
-  "content/canvas/test/test_canvas.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.overlay.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.darken.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.uncovered.image.source-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.saturation.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.image.destination-atop.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.uncovered.image.source-out.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.color.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.image.destination-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.hue.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.difference.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.color-burn.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.uncovered.image.destination-in.html": "x86 only bug 913662",
-  "content/canvas/test/test_2d.composite.canvas.hard-light.html": "x86 only bug 913662",
   "content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html": "x86 only",
   "content/media/test/test_clone_media_element.html": "x86 only bug 914439",
   "content/media/test/test_fastSeek.html": "x86 only bug 914439",
@@ -80,6 +51,35 @@
   "dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html": "x86 only",
   "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
   "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
+  "dom/canvas/test/test_2d.composite.canvas.luminosity.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.source-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.image.source-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.multiply.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.lighten.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.color-dodge.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.destination-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.screen.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.exclusion.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.source-out.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.soft-light.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.destination-atop.html": "x86 only bug 913662",
+  "dom/canvas/test/test_canvas.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.overlay.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.darken.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.uncovered.image.source-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.saturation.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.image.destination-atop.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.uncovered.image.source-out.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.color.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.image.destination-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.hue.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.difference.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.color-burn.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.canvas.hard-light.html": "x86 only bug 913662",
   "dom/contacts/tests/test_contacts_getall.html": "x86 only",
   "dom/datastore/tests/test_oop.html": "x86 only bug 936226",
   "dom/datastore/tests/test_sync.html": "x86 only bug 936226",
diff --git a/testing/mochitest/gl.json b/testing/mochitest/gl.json
index 1a5c86ba0fc..7086e9cb1cb 100644
--- a/testing/mochitest/gl.json
+++ b/testing/mochitest/gl.json
@@ -1,5 +1,5 @@
 {
- "runtests": { "content/canvas/test/webgl-conformance": "bug 865443" },
+ "runtests": { "dom/canvas/test/webgl-conformance": "bug 865443" },
  "excludetests": {}
 }
 

From 99d3a818691704d3e347f74ef4b7980617ad59ed Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 25 Jul 2014 14:15:35 -0700
Subject: [PATCH 008/128] Bug 946065 - Part 6: Move content/xml/ to dom/ and
 flatten subdirectories. r=jst

--HG--
rename : content/xml/content/src/CDATASection.cpp => dom/xml/CDATASection.cpp
rename : content/xml/content/src/CDATASection.h => dom/xml/CDATASection.h
rename : content/xml/content/src/ProcessingInstruction.cpp => dom/xml/ProcessingInstruction.cpp
rename : content/xml/content/src/ProcessingInstruction.h => dom/xml/ProcessingInstruction.h
rename : content/xml/document/src/XMLDocument.cpp => dom/xml/XMLDocument.cpp
rename : content/xml/document/src/XMLDocument.h => dom/xml/XMLDocument.h
rename : content/xml/content/src/XMLStylesheetProcessingInstruction.cpp => dom/xml/XMLStylesheetProcessingInstruction.cpp
rename : content/xml/content/src/XMLStylesheetProcessingInstruction.h => dom/xml/XMLStylesheetProcessingInstruction.h
rename : content/xml/document/crashtests/136896-1.xml => dom/xml/crashtests/136896-1.xml
rename : content/xml/document/crashtests/185285-1.xml => dom/xml/crashtests/185285-1.xml
rename : content/xml/document/crashtests/382636-1.xml => dom/xml/crashtests/382636-1.xml
rename : content/xml/document/crashtests/382636-2.svg => dom/xml/crashtests/382636-2.svg
rename : content/xml/document/crashtests/382636-3.xhtml => dom/xml/crashtests/382636-3.xhtml
rename : content/xml/document/crashtests/382636-4.xul => dom/xml/crashtests/382636-4.xul
rename : content/xml/content/crashtest/420429.xul => dom/xml/crashtests/420429.xul
rename : content/xml/document/crashtests/431703-1.xhtml => dom/xml/crashtests/431703-1.xhtml
rename : content/xml/content/crashtest/453278-frame.xml => dom/xml/crashtests/453278-frame.xml
rename : content/xml/content/crashtest/453278.html => dom/xml/crashtests/453278.html
rename : content/xml/content/crashtest/803586.xhtml => dom/xml/crashtests/803586.xhtml
rename : content/xml/document/crashtests/994740-1.xhtml => dom/xml/crashtests/994740-1.xhtml
rename : content/xml/document/crashtests/crashtests.list => dom/xml/crashtests/crashtests.list
rename : content/xml/document/crashtests/tree.gif => dom/xml/crashtests/tree.gif
rename : content/xml/content/src/htmlmathml-f.ent => dom/xml/htmlmathml-f.ent
rename : content/xml/content/src/moz.build => dom/xml/moz.build
rename : content/xml/document/public/nsIXMLContentSink.h => dom/xml/nsIXMLContentSink.h
rename : content/xml/document/src/nsXMLContentSink.cpp => dom/xml/nsXMLContentSink.cpp
rename : content/xml/document/src/nsXMLContentSink.h => dom/xml/nsXMLContentSink.h
rename : content/xml/content/src/nsXMLElement.cpp => dom/xml/nsXMLElement.cpp
rename : content/xml/content/src/nsXMLElement.h => dom/xml/nsXMLElement.h
rename : content/xml/document/src/nsXMLFragmentContentSink.cpp => dom/xml/nsXMLFragmentContentSink.cpp
rename : content/xml/document/src/nsXMLPrettyPrinter.cpp => dom/xml/nsXMLPrettyPrinter.cpp
rename : content/xml/document/src/nsXMLPrettyPrinter.h => dom/xml/nsXMLPrettyPrinter.h
rename : content/xml/document/resources/XMLMonoPrint.css => dom/xml/resources/XMLMonoPrint.css
rename : content/xml/document/resources/XMLPrettyPrint.css => dom/xml/resources/XMLPrettyPrint.css
rename : content/xml/document/resources/XMLPrettyPrint.xml => dom/xml/resources/XMLPrettyPrint.xml
rename : content/xml/document/resources/XMLPrettyPrint.xsl => dom/xml/resources/XMLPrettyPrint.xsl
rename : content/xml/document/resources/jar.mn => dom/xml/resources/jar.mn
rename : content/xml/document/resources/moz.build => dom/xml/resources/moz.build
rename : content/xml/document/test/file_bug293347.xml => dom/xml/test/file_bug293347.xml
rename : content/xml/document/test/file_bug293347xslt.xml => dom/xml/test/file_bug293347xslt.xml
rename : content/xml/document/test/mochitest.ini => dom/xml/test/mochitest.ini
rename : content/xml/document/test/moz.build => dom/xml/test/moz.build
rename : content/xml/tests/books/bethlehem.gif => dom/xml/test/old/books/bethlehem.gif
rename : content/xml/tests/books/bill.gif => dom/xml/test/old/books/bill.gif
rename : content/xml/tests/books/books.js => dom/xml/test/old/books/books.js
rename : content/xml/tests/books/books.xml => dom/xml/test/old/books/books.xml
rename : content/xml/tests/books/charing.gif => dom/xml/test/old/books/charing.gif
rename : content/xml/tests/books/classic.css => dom/xml/test/old/books/classic.css
rename : content/xml/tests/books/common.css => dom/xml/test/old/books/common.css
rename : content/xml/tests/books/kerouac.gif => dom/xml/test/old/books/kerouac.gif
rename : content/xml/tests/books/list.css => dom/xml/test/old/books/list.css
rename : content/xml/tests/books/road.gif => dom/xml/test/old/books/road.gif
rename : content/xml/tests/books/welville.gif => dom/xml/test/old/books/welville.gif
rename : content/xml/tests/docbook.css => dom/xml/test/old/docbook.css
rename : content/xml/tests/docbooktest.xml => dom/xml/test/old/docbooktest.xml
rename : content/xml/tests/flamer.gif => dom/xml/test/old/flamer.gif
rename : content/xml/tests/load/display.css => dom/xml/test/old/load/display.css
rename : content/xml/tests/load/display.xml => dom/xml/test/old/load/display.xml
rename : content/xml/tests/load/load.html => dom/xml/test/old/load/load.html
rename : content/xml/tests/load/loadauth.html => dom/xml/test/old/load/loadauth.html
rename : content/xml/tests/load/loaddisplay.html => dom/xml/test/old/load/loaddisplay.html
rename : content/xml/tests/load/test.xml => dom/xml/test/old/load/test.xml
rename : content/xml/tests/script.xml => dom/xml/test/old/script.xml
rename : content/xml/tests/simple.xml => dom/xml/test/old/simple.xml
rename : content/xml/tests/toc/book.css => dom/xml/test/old/toc/book.css
rename : content/xml/tests/toc/irslogo.gif => dom/xml/test/old/toc/irslogo.gif
rename : content/xml/tests/toc/minus.gif => dom/xml/test/old/toc/minus.gif
rename : content/xml/tests/toc/plus.gif => dom/xml/test/old/toc/plus.gif
rename : content/xml/tests/toc/rights.xml => dom/xml/test/old/toc/rights.xml
rename : content/xml/tests/toc/toc.css => dom/xml/test/old/toc/toc.css
rename : content/xml/tests/toc/toc.js => dom/xml/test/old/toc/toc.js
rename : content/xml/tests/xlink/auto.xml => dom/xml/test/old/xlink/auto.xml
rename : content/xml/tests/xlink/link.css => dom/xml/test/old/xlink/link.css
rename : content/xml/tests/xlink/manual.xml => dom/xml/test/old/xlink/manual.xml
rename : content/xml/tests/xmlbase/xmlbase.css => dom/xml/test/old/xmlbase/xmlbase.css
rename : content/xml/tests/xmlbase/xmlbase.xml => dom/xml/test/old/xmlbase/xmlbase.xml
rename : content/xml/document/test/test_bug232004.xhtml => dom/xml/test/test_bug232004.xhtml
rename : content/xml/document/test/test_bug293347.html => dom/xml/test/test_bug293347.html
rename : content/xml/document/test/test_bug343870.xhtml => dom/xml/test/test_bug343870.xhtml
rename : content/xml/document/test/test_bug355213.xhtml => dom/xml/test/test_bug355213.xhtml
rename : content/xml/document/test/test_bug392338.html => dom/xml/test/test_bug392338.html
rename : content/xml/document/test/test_bug399502.xhtml => dom/xml/test/test_bug399502.xhtml
rename : content/xml/document/test/test_bug445330.html => dom/xml/test/test_bug445330.html
rename : content/xml/document/test/test_bug691215.html => dom/xml/test/test_bug691215.html
rename : content/xml/document/test/test_viewport.xhtml => dom/xml/test/test_viewport.xhtml
---
 content/base/src/moz.build                    |   3 +-
 content/moz.build                             |   1 -
 content/svg/content/src/moz.build             |   2 +-
 content/svg/document/src/moz.build            |   2 +-
 content/xml/content/crashtest/crashtests.list |   3 --
 content/xml/document/moz.build                |   8 -----
 content/xml/document/public/moz.build         |  10 ------
 content/xml/document/src/moz.build            |  31 ------------------
 content/xml/moz.build                         |   7 ----
 content/xul/content/src/moz.build             |   3 +-
 content/xul/document/src/moz.build            |   2 +-
 dom/bindings/moz.build                        |   2 +-
 dom/events/moz.build                          |   2 +-
 dom/moz.build                                 |   1 +
 dom/xbl/moz.build                             |   2 +-
 .../content/src => dom/xml}/CDATASection.cpp  |   0
 .../content/src => dom/xml}/CDATASection.h    |   0
 .../src => dom/xml}/ProcessingInstruction.cpp |   0
 .../src => dom/xml}/ProcessingInstruction.h   |   0
 .../document/src => dom/xml}/XMLDocument.cpp  |   0
 .../document/src => dom/xml}/XMLDocument.h    |   0
 .../XMLStylesheetProcessingInstruction.cpp    |   0
 .../xml}/XMLStylesheetProcessingInstruction.h |   0
 .../xml}/crashtests/136896-1.xml              |   0
 .../xml}/crashtests/185285-1.xml              |   0
 .../xml}/crashtests/382636-1.xml              |   0
 .../xml}/crashtests/382636-2.svg              |   0
 .../xml}/crashtests/382636-3.xhtml            |   0
 .../xml}/crashtests/382636-4.xul              |   0
 .../xml/crashtests}/420429.xul                |   0
 .../xml}/crashtests/431703-1.xhtml            |   0
 .../xml/crashtests}/453278-frame.xml          |   0
 .../xml/crashtests}/453278.html               |   0
 .../xml/crashtests}/803586.xhtml              |   0
 .../xml}/crashtests/994740-1.xhtml            |   0
 .../xml}/crashtests/crashtests.list           |   3 ++
 .../document => dom/xml}/crashtests/tree.gif  | Bin
 .../content/src => dom/xml}/htmlmathml-f.ent  |   0
 .../xml/content/src => dom/xml}/moz.build     |  19 +++++++++++
 .../public => dom/xml}/nsIXMLContentSink.h    |   0
 .../src => dom/xml}/nsXMLContentSink.cpp      |   0
 .../src => dom/xml}/nsXMLContentSink.h        |   0
 .../content/src => dom/xml}/nsXMLElement.cpp  |   0
 .../content/src => dom/xml}/nsXMLElement.h    |   0
 .../xml}/nsXMLFragmentContentSink.cpp         |   0
 .../src => dom/xml}/nsXMLPrettyPrinter.cpp    |   0
 .../src => dom/xml}/nsXMLPrettyPrinter.h      |   0
 .../xml}/resources/XMLMonoPrint.css           |   0
 .../xml}/resources/XMLPrettyPrint.css         |   0
 .../xml}/resources/XMLPrettyPrint.xml         |   0
 .../xml}/resources/XMLPrettyPrint.xsl         |   0
 .../xml/document => dom/xml}/resources/jar.mn |   0
 .../document => dom/xml}/resources/moz.build  |   0
 .../xml}/test/file_bug293347.xml              |   0
 .../xml}/test/file_bug293347xslt.xml          |   0
 .../document => dom/xml}/test/mochitest.ini   |   0
 .../xml/document => dom/xml}/test/moz.build   |   0
 .../xml/test/old}/books/bethlehem.gif         | Bin
 .../tests => dom/xml/test/old}/books/bill.gif | Bin
 .../tests => dom/xml/test/old}/books/books.js |   0
 .../xml/test/old}/books/books.xml             |   0
 .../xml/test/old}/books/charing.gif           | Bin
 .../xml/test/old}/books/classic.css           |   0
 .../xml/test/old}/books/common.css            |   0
 .../xml/test/old}/books/kerouac.gif           | Bin
 .../tests => dom/xml/test/old}/books/list.css |   0
 .../tests => dom/xml/test/old}/books/road.gif | Bin
 .../xml/test/old}/books/welville.gif          | Bin
 .../tests => dom/xml/test/old}/docbook.css    |   0
 .../xml/test/old}/docbooktest.xml             |   0
 .../xml/tests => dom/xml/test/old}/flamer.gif | Bin
 .../xml/test/old}/load/display.css            |   0
 .../xml/test/old}/load/display.xml            |   0
 .../tests => dom/xml/test/old}/load/load.html |   0
 .../xml/test/old}/load/loadauth.html          |   0
 .../xml/test/old}/load/loaddisplay.html       |   0
 .../tests => dom/xml/test/old}/load/test.xml  |   0
 .../xml/tests => dom/xml/test/old}/script.xml |   0
 .../xml/tests => dom/xml/test/old}/simple.xml |   0
 .../tests => dom/xml/test/old}/toc/book.css   |   0
 .../xml/test/old}/toc/irslogo.gif             | Bin
 .../tests => dom/xml/test/old}/toc/minus.gif  | Bin
 .../tests => dom/xml/test/old}/toc/plus.gif   | Bin
 .../tests => dom/xml/test/old}/toc/rights.xml |   0
 .../tests => dom/xml/test/old}/toc/toc.css    |   0
 .../xml/tests => dom/xml/test/old}/toc/toc.js |   0
 .../tests => dom/xml/test/old}/xlink/auto.xml |   0
 .../tests => dom/xml/test/old}/xlink/link.css |   0
 .../xml/test/old}/xlink/manual.xml            |   0
 .../xml/test/old}/xmlbase/xmlbase.css         |   0
 .../xml/test/old}/xmlbase/xmlbase.xml         |   0
 .../xml}/test/test_bug232004.xhtml            |   0
 .../xml}/test/test_bug293347.html             |   0
 .../xml}/test/test_bug343870.xhtml            |   0
 .../xml}/test/test_bug355213.xhtml            |   0
 .../xml}/test/test_bug392338.html             |   0
 .../xml}/test/test_bug399502.xhtml            |   0
 .../xml}/test/test_bug445330.html             |   0
 .../xml}/test/test_bug691215.html             |   0
 .../xml}/test/test_viewport.xhtml             |   0
 gfx/thebes/moz.build                          |   2 +-
 testing/crashtest/crashtests.list             |   3 +-
 102 files changed, 33 insertions(+), 73 deletions(-)
 delete mode 100644 content/xml/content/crashtest/crashtests.list
 delete mode 100644 content/xml/document/moz.build
 delete mode 100644 content/xml/document/public/moz.build
 delete mode 100644 content/xml/document/src/moz.build
 delete mode 100644 content/xml/moz.build
 rename {content/xml/content/src => dom/xml}/CDATASection.cpp (100%)
 rename {content/xml/content/src => dom/xml}/CDATASection.h (100%)
 rename {content/xml/content/src => dom/xml}/ProcessingInstruction.cpp (100%)
 rename {content/xml/content/src => dom/xml}/ProcessingInstruction.h (100%)
 rename {content/xml/document/src => dom/xml}/XMLDocument.cpp (100%)
 rename {content/xml/document/src => dom/xml}/XMLDocument.h (100%)
 rename {content/xml/content/src => dom/xml}/XMLStylesheetProcessingInstruction.cpp (100%)
 rename {content/xml/content/src => dom/xml}/XMLStylesheetProcessingInstruction.h (100%)
 rename {content/xml/document => dom/xml}/crashtests/136896-1.xml (100%)
 rename {content/xml/document => dom/xml}/crashtests/185285-1.xml (100%)
 rename {content/xml/document => dom/xml}/crashtests/382636-1.xml (100%)
 rename {content/xml/document => dom/xml}/crashtests/382636-2.svg (100%)
 rename {content/xml/document => dom/xml}/crashtests/382636-3.xhtml (100%)
 rename {content/xml/document => dom/xml}/crashtests/382636-4.xul (100%)
 rename {content/xml/content/crashtest => dom/xml/crashtests}/420429.xul (100%)
 rename {content/xml/document => dom/xml}/crashtests/431703-1.xhtml (100%)
 rename {content/xml/content/crashtest => dom/xml/crashtests}/453278-frame.xml (100%)
 rename {content/xml/content/crashtest => dom/xml/crashtests}/453278.html (100%)
 rename {content/xml/content/crashtest => dom/xml/crashtests}/803586.xhtml (100%)
 rename {content/xml/document => dom/xml}/crashtests/994740-1.xhtml (100%)
 rename {content/xml/document => dom/xml}/crashtests/crashtests.list (77%)
 rename {content/xml/document => dom/xml}/crashtests/tree.gif (100%)
 rename {content/xml/content/src => dom/xml}/htmlmathml-f.ent (100%)
 rename {content/xml/content/src => dom/xml}/moz.build (68%)
 rename {content/xml/document/public => dom/xml}/nsIXMLContentSink.h (100%)
 rename {content/xml/document/src => dom/xml}/nsXMLContentSink.cpp (100%)
 rename {content/xml/document/src => dom/xml}/nsXMLContentSink.h (100%)
 rename {content/xml/content/src => dom/xml}/nsXMLElement.cpp (100%)
 rename {content/xml/content/src => dom/xml}/nsXMLElement.h (100%)
 rename {content/xml/document/src => dom/xml}/nsXMLFragmentContentSink.cpp (100%)
 rename {content/xml/document/src => dom/xml}/nsXMLPrettyPrinter.cpp (100%)
 rename {content/xml/document/src => dom/xml}/nsXMLPrettyPrinter.h (100%)
 rename {content/xml/document => dom/xml}/resources/XMLMonoPrint.css (100%)
 rename {content/xml/document => dom/xml}/resources/XMLPrettyPrint.css (100%)
 rename {content/xml/document => dom/xml}/resources/XMLPrettyPrint.xml (100%)
 rename {content/xml/document => dom/xml}/resources/XMLPrettyPrint.xsl (100%)
 rename {content/xml/document => dom/xml}/resources/jar.mn (100%)
 rename {content/xml/document => dom/xml}/resources/moz.build (100%)
 rename {content/xml/document => dom/xml}/test/file_bug293347.xml (100%)
 rename {content/xml/document => dom/xml}/test/file_bug293347xslt.xml (100%)
 rename {content/xml/document => dom/xml}/test/mochitest.ini (100%)
 rename {content/xml/document => dom/xml}/test/moz.build (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/bethlehem.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/bill.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/books.js (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/books.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/charing.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/classic.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/common.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/kerouac.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/list.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/road.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/books/welville.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/docbook.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/docbooktest.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/flamer.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/display.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/display.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/load.html (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/loadauth.html (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/loaddisplay.html (100%)
 rename {content/xml/tests => dom/xml/test/old}/load/test.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/script.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/simple.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/book.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/irslogo.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/minus.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/plus.gif (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/rights.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/toc.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/toc/toc.js (100%)
 rename {content/xml/tests => dom/xml/test/old}/xlink/auto.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/xlink/link.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/xlink/manual.xml (100%)
 rename {content/xml/tests => dom/xml/test/old}/xmlbase/xmlbase.css (100%)
 rename {content/xml/tests => dom/xml/test/old}/xmlbase/xmlbase.xml (100%)
 rename {content/xml/document => dom/xml}/test/test_bug232004.xhtml (100%)
 rename {content/xml/document => dom/xml}/test/test_bug293347.html (100%)
 rename {content/xml/document => dom/xml}/test/test_bug343870.xhtml (100%)
 rename {content/xml/document => dom/xml}/test/test_bug355213.xhtml (100%)
 rename {content/xml/document => dom/xml}/test/test_bug392338.html (100%)
 rename {content/xml/document => dom/xml}/test/test_bug399502.xhtml (100%)
 rename {content/xml/document => dom/xml}/test/test_bug445330.html (100%)
 rename {content/xml/document => dom/xml}/test/test_bug691215.html (100%)
 rename {content/xml/document => dom/xml}/test/test_viewport.xhtml (100%)

diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index f8ddded31ee..e92bd4844cb 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -223,8 +223,6 @@ LOCAL_INCLUDES += [
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xml/content/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
@@ -232,6 +230,7 @@ LOCAL_INCLUDES += [
     '/dom/ipc',
     '/dom/workers',
     '/dom/xbl',
+    '/dom/xml',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
diff --git a/content/moz.build b/content/moz.build
index 1dcdcad54c2..950d8230666 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -10,7 +10,6 @@ PARALLEL_DIRS += [
     'mathml/content/src',
     'media',
     'svg',
-    'xml',
     'xul',
 ]
 
diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
index 4222ff34ded..7fdb2c4faeb 100644
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -255,10 +255,10 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
     '/dom',
     '/dom/smil',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build
index 7d5765b318a..6a8f823294e 100644
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -18,7 +18,7 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xml/document/src',
+    '/dom/xml',
     '/layout/style',
 ]
 
diff --git a/content/xml/content/crashtest/crashtests.list b/content/xml/content/crashtest/crashtests.list
deleted file mode 100644
index 867e23ab8c4..00000000000
--- a/content/xml/content/crashtest/crashtests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-load 420429.xul
-load 453278.html
-load 803586.xhtml
diff --git a/content/xml/document/moz.build b/content/xml/document/moz.build
deleted file mode 100644
index 7d69b315a85..00000000000
--- a/content/xml/document/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-PARALLEL_DIRS += ['public', 'resources', 'src']
-TEST_DIRS += ['test']
diff --git a/content/xml/document/public/moz.build b/content/xml/document/public/moz.build
deleted file mode 100644
index 8d825d210cb..00000000000
--- a/content/xml/document/public/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsIXMLContentSink.h',
-]
-
diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build
deleted file mode 100644
index 91baaa7e4e4..00000000000
--- a/content/xml/document/src/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.mozilla.dom += [
-    'XMLDocument.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsXMLContentSink.cpp',
-    'nsXMLFragmentContentSink.cpp',
-    'nsXMLPrettyPrinter.cpp',
-    'XMLDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/caps',
-    '/content/base/src',
-    '/content/html/document/src',
-    '/content/xul/content/src',
-    '/dom/base',
-    '/layout/style',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/content/xml/moz.build b/content/xml/moz.build
deleted file mode 100644
index a2c32a278d4..00000000000
--- a/content/xml/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-PARALLEL_DIRS += ['content/src', 'document']
diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build
index 672343e66af..111c8d8d48b 100644
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -20,9 +20,8 @@ LOCAL_INCLUDES += [
     '../../templates/src',
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
-    '/content/xml/document/src',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index cff54958f0d..c2a97b95368 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -23,12 +23,12 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index c72a987d7b8..3a286f079ee 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -46,7 +46,6 @@ LOCAL_INCLUDES += [
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
-    '/content/xml/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
@@ -59,6 +58,7 @@ LOCAL_INCLUDES += [
     '/dom/src/geolocation',
     '/dom/workers',
     '/dom/xbl',
+    '/dom/xml',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',
diff --git a/dom/events/moz.build b/dom/events/moz.build
index 15241793843..1af258a2268 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -130,12 +130,12 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
     '/content/xul/content/src',
     '/dom/base',
     '/dom/settings',
     '/dom/src/storage',
     '/dom/workers',
+    '/dom/xml',
     '/js/xpconnect/wrappers',
     '/layout/generic',
     '/layout/xul',
diff --git a/dom/moz.build b/dom/moz.build
index a13bc87c221..4646b12b0ce 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -83,6 +83,7 @@ PARALLEL_DIRS += [
     'inputmethod',
     'webidl',
     'xbl',
+    'xml',
     'xslt',
     'resourcestats',
 ]
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
index 73de9976eab..af0524e67b6 100644
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -44,10 +44,10 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
+    '/dom/xml',
     '/layout/style',
 ]
 
diff --git a/content/xml/content/src/CDATASection.cpp b/dom/xml/CDATASection.cpp
similarity index 100%
rename from content/xml/content/src/CDATASection.cpp
rename to dom/xml/CDATASection.cpp
diff --git a/content/xml/content/src/CDATASection.h b/dom/xml/CDATASection.h
similarity index 100%
rename from content/xml/content/src/CDATASection.h
rename to dom/xml/CDATASection.h
diff --git a/content/xml/content/src/ProcessingInstruction.cpp b/dom/xml/ProcessingInstruction.cpp
similarity index 100%
rename from content/xml/content/src/ProcessingInstruction.cpp
rename to dom/xml/ProcessingInstruction.cpp
diff --git a/content/xml/content/src/ProcessingInstruction.h b/dom/xml/ProcessingInstruction.h
similarity index 100%
rename from content/xml/content/src/ProcessingInstruction.h
rename to dom/xml/ProcessingInstruction.h
diff --git a/content/xml/document/src/XMLDocument.cpp b/dom/xml/XMLDocument.cpp
similarity index 100%
rename from content/xml/document/src/XMLDocument.cpp
rename to dom/xml/XMLDocument.cpp
diff --git a/content/xml/document/src/XMLDocument.h b/dom/xml/XMLDocument.h
similarity index 100%
rename from content/xml/document/src/XMLDocument.h
rename to dom/xml/XMLDocument.h
diff --git a/content/xml/content/src/XMLStylesheetProcessingInstruction.cpp b/dom/xml/XMLStylesheetProcessingInstruction.cpp
similarity index 100%
rename from content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
rename to dom/xml/XMLStylesheetProcessingInstruction.cpp
diff --git a/content/xml/content/src/XMLStylesheetProcessingInstruction.h b/dom/xml/XMLStylesheetProcessingInstruction.h
similarity index 100%
rename from content/xml/content/src/XMLStylesheetProcessingInstruction.h
rename to dom/xml/XMLStylesheetProcessingInstruction.h
diff --git a/content/xml/document/crashtests/136896-1.xml b/dom/xml/crashtests/136896-1.xml
similarity index 100%
rename from content/xml/document/crashtests/136896-1.xml
rename to dom/xml/crashtests/136896-1.xml
diff --git a/content/xml/document/crashtests/185285-1.xml b/dom/xml/crashtests/185285-1.xml
similarity index 100%
rename from content/xml/document/crashtests/185285-1.xml
rename to dom/xml/crashtests/185285-1.xml
diff --git a/content/xml/document/crashtests/382636-1.xml b/dom/xml/crashtests/382636-1.xml
similarity index 100%
rename from content/xml/document/crashtests/382636-1.xml
rename to dom/xml/crashtests/382636-1.xml
diff --git a/content/xml/document/crashtests/382636-2.svg b/dom/xml/crashtests/382636-2.svg
similarity index 100%
rename from content/xml/document/crashtests/382636-2.svg
rename to dom/xml/crashtests/382636-2.svg
diff --git a/content/xml/document/crashtests/382636-3.xhtml b/dom/xml/crashtests/382636-3.xhtml
similarity index 100%
rename from content/xml/document/crashtests/382636-3.xhtml
rename to dom/xml/crashtests/382636-3.xhtml
diff --git a/content/xml/document/crashtests/382636-4.xul b/dom/xml/crashtests/382636-4.xul
similarity index 100%
rename from content/xml/document/crashtests/382636-4.xul
rename to dom/xml/crashtests/382636-4.xul
diff --git a/content/xml/content/crashtest/420429.xul b/dom/xml/crashtests/420429.xul
similarity index 100%
rename from content/xml/content/crashtest/420429.xul
rename to dom/xml/crashtests/420429.xul
diff --git a/content/xml/document/crashtests/431703-1.xhtml b/dom/xml/crashtests/431703-1.xhtml
similarity index 100%
rename from content/xml/document/crashtests/431703-1.xhtml
rename to dom/xml/crashtests/431703-1.xhtml
diff --git a/content/xml/content/crashtest/453278-frame.xml b/dom/xml/crashtests/453278-frame.xml
similarity index 100%
rename from content/xml/content/crashtest/453278-frame.xml
rename to dom/xml/crashtests/453278-frame.xml
diff --git a/content/xml/content/crashtest/453278.html b/dom/xml/crashtests/453278.html
similarity index 100%
rename from content/xml/content/crashtest/453278.html
rename to dom/xml/crashtests/453278.html
diff --git a/content/xml/content/crashtest/803586.xhtml b/dom/xml/crashtests/803586.xhtml
similarity index 100%
rename from content/xml/content/crashtest/803586.xhtml
rename to dom/xml/crashtests/803586.xhtml
diff --git a/content/xml/document/crashtests/994740-1.xhtml b/dom/xml/crashtests/994740-1.xhtml
similarity index 100%
rename from content/xml/document/crashtests/994740-1.xhtml
rename to dom/xml/crashtests/994740-1.xhtml
diff --git a/content/xml/document/crashtests/crashtests.list b/dom/xml/crashtests/crashtests.list
similarity index 77%
rename from content/xml/document/crashtests/crashtests.list
rename to dom/xml/crashtests/crashtests.list
index fd185690bfa..662ae753e99 100644
--- a/content/xml/document/crashtests/crashtests.list
+++ b/dom/xml/crashtests/crashtests.list
@@ -4,5 +4,8 @@ load 382636-1.xml
 load 382636-2.svg
 load 382636-3.xhtml
 load 382636-4.xul # Throws (bug 455856)
+load 420429.xul
 load 431703-1.xhtml
+load 453278.html
+load 803586.xhtml
 load 994740-1.xhtml
diff --git a/content/xml/document/crashtests/tree.gif b/dom/xml/crashtests/tree.gif
similarity index 100%
rename from content/xml/document/crashtests/tree.gif
rename to dom/xml/crashtests/tree.gif
diff --git a/content/xml/content/src/htmlmathml-f.ent b/dom/xml/htmlmathml-f.ent
similarity index 100%
rename from content/xml/content/src/htmlmathml-f.ent
rename to dom/xml/htmlmathml-f.ent
diff --git a/content/xml/content/src/moz.build b/dom/xml/moz.build
similarity index 68%
rename from content/xml/content/src/moz.build
rename to dom/xml/moz.build
index 954283baac7..4630ddcf2cb 100644
--- a/content/xml/content/src/moz.build
+++ b/dom/xml/moz.build
@@ -4,17 +4,30 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+PARALLEL_DIRS += ['resources']
+
+TEST_DIRS += ['test']
+
+EXPORTS += [
+    'nsIXMLContentSink.h',
+]
+
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
     'nsXMLElement.h',
     'ProcessingInstruction.h',
+    'XMLDocument.h',
     'XMLStylesheetProcessingInstruction.h',
 ]
 
 UNIFIED_SOURCES += [
     'CDATASection.cpp',
+    'nsXMLContentSink.cpp',
     'nsXMLElement.cpp',
+    'nsXMLFragmentContentSink.cpp',
+    'nsXMLPrettyPrinter.cpp',
     'ProcessingInstruction.cpp',
+    'XMLDocument.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
 ]
 
@@ -23,8 +36,14 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
+
 LOCAL_INCLUDES += [
+    '/caps',
     '/content/base/src',
+    '/content/html/document/src',
+    '/content/xul/content/src',
+    '/dom/base',
+    '/layout/style',
 ]
 
 RESOURCE_FILES.dtd += [
diff --git a/content/xml/document/public/nsIXMLContentSink.h b/dom/xml/nsIXMLContentSink.h
similarity index 100%
rename from content/xml/document/public/nsIXMLContentSink.h
rename to dom/xml/nsIXMLContentSink.h
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/dom/xml/nsXMLContentSink.cpp
similarity index 100%
rename from content/xml/document/src/nsXMLContentSink.cpp
rename to dom/xml/nsXMLContentSink.cpp
diff --git a/content/xml/document/src/nsXMLContentSink.h b/dom/xml/nsXMLContentSink.h
similarity index 100%
rename from content/xml/document/src/nsXMLContentSink.h
rename to dom/xml/nsXMLContentSink.h
diff --git a/content/xml/content/src/nsXMLElement.cpp b/dom/xml/nsXMLElement.cpp
similarity index 100%
rename from content/xml/content/src/nsXMLElement.cpp
rename to dom/xml/nsXMLElement.cpp
diff --git a/content/xml/content/src/nsXMLElement.h b/dom/xml/nsXMLElement.h
similarity index 100%
rename from content/xml/content/src/nsXMLElement.h
rename to dom/xml/nsXMLElement.h
diff --git a/content/xml/document/src/nsXMLFragmentContentSink.cpp b/dom/xml/nsXMLFragmentContentSink.cpp
similarity index 100%
rename from content/xml/document/src/nsXMLFragmentContentSink.cpp
rename to dom/xml/nsXMLFragmentContentSink.cpp
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/dom/xml/nsXMLPrettyPrinter.cpp
similarity index 100%
rename from content/xml/document/src/nsXMLPrettyPrinter.cpp
rename to dom/xml/nsXMLPrettyPrinter.cpp
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.h b/dom/xml/nsXMLPrettyPrinter.h
similarity index 100%
rename from content/xml/document/src/nsXMLPrettyPrinter.h
rename to dom/xml/nsXMLPrettyPrinter.h
diff --git a/content/xml/document/resources/XMLMonoPrint.css b/dom/xml/resources/XMLMonoPrint.css
similarity index 100%
rename from content/xml/document/resources/XMLMonoPrint.css
rename to dom/xml/resources/XMLMonoPrint.css
diff --git a/content/xml/document/resources/XMLPrettyPrint.css b/dom/xml/resources/XMLPrettyPrint.css
similarity index 100%
rename from content/xml/document/resources/XMLPrettyPrint.css
rename to dom/xml/resources/XMLPrettyPrint.css
diff --git a/content/xml/document/resources/XMLPrettyPrint.xml b/dom/xml/resources/XMLPrettyPrint.xml
similarity index 100%
rename from content/xml/document/resources/XMLPrettyPrint.xml
rename to dom/xml/resources/XMLPrettyPrint.xml
diff --git a/content/xml/document/resources/XMLPrettyPrint.xsl b/dom/xml/resources/XMLPrettyPrint.xsl
similarity index 100%
rename from content/xml/document/resources/XMLPrettyPrint.xsl
rename to dom/xml/resources/XMLPrettyPrint.xsl
diff --git a/content/xml/document/resources/jar.mn b/dom/xml/resources/jar.mn
similarity index 100%
rename from content/xml/document/resources/jar.mn
rename to dom/xml/resources/jar.mn
diff --git a/content/xml/document/resources/moz.build b/dom/xml/resources/moz.build
similarity index 100%
rename from content/xml/document/resources/moz.build
rename to dom/xml/resources/moz.build
diff --git a/content/xml/document/test/file_bug293347.xml b/dom/xml/test/file_bug293347.xml
similarity index 100%
rename from content/xml/document/test/file_bug293347.xml
rename to dom/xml/test/file_bug293347.xml
diff --git a/content/xml/document/test/file_bug293347xslt.xml b/dom/xml/test/file_bug293347xslt.xml
similarity index 100%
rename from content/xml/document/test/file_bug293347xslt.xml
rename to dom/xml/test/file_bug293347xslt.xml
diff --git a/content/xml/document/test/mochitest.ini b/dom/xml/test/mochitest.ini
similarity index 100%
rename from content/xml/document/test/mochitest.ini
rename to dom/xml/test/mochitest.ini
diff --git a/content/xml/document/test/moz.build b/dom/xml/test/moz.build
similarity index 100%
rename from content/xml/document/test/moz.build
rename to dom/xml/test/moz.build
diff --git a/content/xml/tests/books/bethlehem.gif b/dom/xml/test/old/books/bethlehem.gif
similarity index 100%
rename from content/xml/tests/books/bethlehem.gif
rename to dom/xml/test/old/books/bethlehem.gif
diff --git a/content/xml/tests/books/bill.gif b/dom/xml/test/old/books/bill.gif
similarity index 100%
rename from content/xml/tests/books/bill.gif
rename to dom/xml/test/old/books/bill.gif
diff --git a/content/xml/tests/books/books.js b/dom/xml/test/old/books/books.js
similarity index 100%
rename from content/xml/tests/books/books.js
rename to dom/xml/test/old/books/books.js
diff --git a/content/xml/tests/books/books.xml b/dom/xml/test/old/books/books.xml
similarity index 100%
rename from content/xml/tests/books/books.xml
rename to dom/xml/test/old/books/books.xml
diff --git a/content/xml/tests/books/charing.gif b/dom/xml/test/old/books/charing.gif
similarity index 100%
rename from content/xml/tests/books/charing.gif
rename to dom/xml/test/old/books/charing.gif
diff --git a/content/xml/tests/books/classic.css b/dom/xml/test/old/books/classic.css
similarity index 100%
rename from content/xml/tests/books/classic.css
rename to dom/xml/test/old/books/classic.css
diff --git a/content/xml/tests/books/common.css b/dom/xml/test/old/books/common.css
similarity index 100%
rename from content/xml/tests/books/common.css
rename to dom/xml/test/old/books/common.css
diff --git a/content/xml/tests/books/kerouac.gif b/dom/xml/test/old/books/kerouac.gif
similarity index 100%
rename from content/xml/tests/books/kerouac.gif
rename to dom/xml/test/old/books/kerouac.gif
diff --git a/content/xml/tests/books/list.css b/dom/xml/test/old/books/list.css
similarity index 100%
rename from content/xml/tests/books/list.css
rename to dom/xml/test/old/books/list.css
diff --git a/content/xml/tests/books/road.gif b/dom/xml/test/old/books/road.gif
similarity index 100%
rename from content/xml/tests/books/road.gif
rename to dom/xml/test/old/books/road.gif
diff --git a/content/xml/tests/books/welville.gif b/dom/xml/test/old/books/welville.gif
similarity index 100%
rename from content/xml/tests/books/welville.gif
rename to dom/xml/test/old/books/welville.gif
diff --git a/content/xml/tests/docbook.css b/dom/xml/test/old/docbook.css
similarity index 100%
rename from content/xml/tests/docbook.css
rename to dom/xml/test/old/docbook.css
diff --git a/content/xml/tests/docbooktest.xml b/dom/xml/test/old/docbooktest.xml
similarity index 100%
rename from content/xml/tests/docbooktest.xml
rename to dom/xml/test/old/docbooktest.xml
diff --git a/content/xml/tests/flamer.gif b/dom/xml/test/old/flamer.gif
similarity index 100%
rename from content/xml/tests/flamer.gif
rename to dom/xml/test/old/flamer.gif
diff --git a/content/xml/tests/load/display.css b/dom/xml/test/old/load/display.css
similarity index 100%
rename from content/xml/tests/load/display.css
rename to dom/xml/test/old/load/display.css
diff --git a/content/xml/tests/load/display.xml b/dom/xml/test/old/load/display.xml
similarity index 100%
rename from content/xml/tests/load/display.xml
rename to dom/xml/test/old/load/display.xml
diff --git a/content/xml/tests/load/load.html b/dom/xml/test/old/load/load.html
similarity index 100%
rename from content/xml/tests/load/load.html
rename to dom/xml/test/old/load/load.html
diff --git a/content/xml/tests/load/loadauth.html b/dom/xml/test/old/load/loadauth.html
similarity index 100%
rename from content/xml/tests/load/loadauth.html
rename to dom/xml/test/old/load/loadauth.html
diff --git a/content/xml/tests/load/loaddisplay.html b/dom/xml/test/old/load/loaddisplay.html
similarity index 100%
rename from content/xml/tests/load/loaddisplay.html
rename to dom/xml/test/old/load/loaddisplay.html
diff --git a/content/xml/tests/load/test.xml b/dom/xml/test/old/load/test.xml
similarity index 100%
rename from content/xml/tests/load/test.xml
rename to dom/xml/test/old/load/test.xml
diff --git a/content/xml/tests/script.xml b/dom/xml/test/old/script.xml
similarity index 100%
rename from content/xml/tests/script.xml
rename to dom/xml/test/old/script.xml
diff --git a/content/xml/tests/simple.xml b/dom/xml/test/old/simple.xml
similarity index 100%
rename from content/xml/tests/simple.xml
rename to dom/xml/test/old/simple.xml
diff --git a/content/xml/tests/toc/book.css b/dom/xml/test/old/toc/book.css
similarity index 100%
rename from content/xml/tests/toc/book.css
rename to dom/xml/test/old/toc/book.css
diff --git a/content/xml/tests/toc/irslogo.gif b/dom/xml/test/old/toc/irslogo.gif
similarity index 100%
rename from content/xml/tests/toc/irslogo.gif
rename to dom/xml/test/old/toc/irslogo.gif
diff --git a/content/xml/tests/toc/minus.gif b/dom/xml/test/old/toc/minus.gif
similarity index 100%
rename from content/xml/tests/toc/minus.gif
rename to dom/xml/test/old/toc/minus.gif
diff --git a/content/xml/tests/toc/plus.gif b/dom/xml/test/old/toc/plus.gif
similarity index 100%
rename from content/xml/tests/toc/plus.gif
rename to dom/xml/test/old/toc/plus.gif
diff --git a/content/xml/tests/toc/rights.xml b/dom/xml/test/old/toc/rights.xml
similarity index 100%
rename from content/xml/tests/toc/rights.xml
rename to dom/xml/test/old/toc/rights.xml
diff --git a/content/xml/tests/toc/toc.css b/dom/xml/test/old/toc/toc.css
similarity index 100%
rename from content/xml/tests/toc/toc.css
rename to dom/xml/test/old/toc/toc.css
diff --git a/content/xml/tests/toc/toc.js b/dom/xml/test/old/toc/toc.js
similarity index 100%
rename from content/xml/tests/toc/toc.js
rename to dom/xml/test/old/toc/toc.js
diff --git a/content/xml/tests/xlink/auto.xml b/dom/xml/test/old/xlink/auto.xml
similarity index 100%
rename from content/xml/tests/xlink/auto.xml
rename to dom/xml/test/old/xlink/auto.xml
diff --git a/content/xml/tests/xlink/link.css b/dom/xml/test/old/xlink/link.css
similarity index 100%
rename from content/xml/tests/xlink/link.css
rename to dom/xml/test/old/xlink/link.css
diff --git a/content/xml/tests/xlink/manual.xml b/dom/xml/test/old/xlink/manual.xml
similarity index 100%
rename from content/xml/tests/xlink/manual.xml
rename to dom/xml/test/old/xlink/manual.xml
diff --git a/content/xml/tests/xmlbase/xmlbase.css b/dom/xml/test/old/xmlbase/xmlbase.css
similarity index 100%
rename from content/xml/tests/xmlbase/xmlbase.css
rename to dom/xml/test/old/xmlbase/xmlbase.css
diff --git a/content/xml/tests/xmlbase/xmlbase.xml b/dom/xml/test/old/xmlbase/xmlbase.xml
similarity index 100%
rename from content/xml/tests/xmlbase/xmlbase.xml
rename to dom/xml/test/old/xmlbase/xmlbase.xml
diff --git a/content/xml/document/test/test_bug232004.xhtml b/dom/xml/test/test_bug232004.xhtml
similarity index 100%
rename from content/xml/document/test/test_bug232004.xhtml
rename to dom/xml/test/test_bug232004.xhtml
diff --git a/content/xml/document/test/test_bug293347.html b/dom/xml/test/test_bug293347.html
similarity index 100%
rename from content/xml/document/test/test_bug293347.html
rename to dom/xml/test/test_bug293347.html
diff --git a/content/xml/document/test/test_bug343870.xhtml b/dom/xml/test/test_bug343870.xhtml
similarity index 100%
rename from content/xml/document/test/test_bug343870.xhtml
rename to dom/xml/test/test_bug343870.xhtml
diff --git a/content/xml/document/test/test_bug355213.xhtml b/dom/xml/test/test_bug355213.xhtml
similarity index 100%
rename from content/xml/document/test/test_bug355213.xhtml
rename to dom/xml/test/test_bug355213.xhtml
diff --git a/content/xml/document/test/test_bug392338.html b/dom/xml/test/test_bug392338.html
similarity index 100%
rename from content/xml/document/test/test_bug392338.html
rename to dom/xml/test/test_bug392338.html
diff --git a/content/xml/document/test/test_bug399502.xhtml b/dom/xml/test/test_bug399502.xhtml
similarity index 100%
rename from content/xml/document/test/test_bug399502.xhtml
rename to dom/xml/test/test_bug399502.xhtml
diff --git a/content/xml/document/test/test_bug445330.html b/dom/xml/test/test_bug445330.html
similarity index 100%
rename from content/xml/document/test/test_bug445330.html
rename to dom/xml/test/test_bug445330.html
diff --git a/content/xml/document/test/test_bug691215.html b/dom/xml/test/test_bug691215.html
similarity index 100%
rename from content/xml/document/test/test_bug691215.html
rename to dom/xml/test/test_bug691215.html
diff --git a/content/xml/document/test/test_viewport.xhtml b/dom/xml/test/test_viewport.xhtml
similarity index 100%
rename from content/xml/document/test/test_viewport.xhtml
rename to dom/xml/test/test_viewport.xhtml
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 1c84762d3f9..6c29a312f78 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -264,7 +264,7 @@ GENERATED_FILES = [
 ]
 
 LOCAL_INCLUDES += [
-    '/content/xml/document/src',
+    '/dom/xml',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 74836ab235c..399866d46b3 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -9,8 +9,6 @@ include ../../content/base/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
-include ../../content/xml/content/crashtest/crashtests.list
-include ../../content/xml/document/crashtests/crashtests.list
 include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
@@ -28,6 +26,7 @@ include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
+include ../../dom/xml/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet

From 03d70410a8075f2790db6ca65d03b8151ba3dd23 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 25 Jul 2014 14:15:35 -0700
Subject: [PATCH 009/128] Bug 946065 - Part 7: Move content/mathml/ to dom/ and
 flatten subdirectories. r=karlt

--HG--
rename : content/mathml/content/crashtests/462929-1.html => dom/mathml/crashtests/462929-1.html
rename : content/mathml/content/crashtests/770710-1.html => dom/mathml/crashtests/770710-1.html
rename : content/mathml/content/crashtests/crashtests.list => dom/mathml/crashtests/crashtests.list
rename : content/mathml/content/src/moz.build => dom/mathml/moz.build
rename : content/mathml/content/src/nsMathMLElement.cpp => dom/mathml/nsMathMLElement.cpp
rename : content/mathml/content/src/nsMathMLElement.h => dom/mathml/nsMathMLElement.h
rename : content/mathml/content/src/nsMathMLElementFactory.cpp => dom/mathml/nsMathMLElementFactory.cpp
---
 content/moz.build                                               | 1 -
 {content/mathml/content => dom/mathml}/crashtests/462929-1.html | 0
 {content/mathml/content => dom/mathml}/crashtests/770710-1.html | 0
 .../mathml/content => dom/mathml}/crashtests/crashtests.list    | 0
 {content/mathml/content/src => dom/mathml}/moz.build            | 0
 {content/mathml/content/src => dom/mathml}/nsMathMLElement.cpp  | 0
 {content/mathml/content/src => dom/mathml}/nsMathMLElement.h    | 0
 .../content/src => dom/mathml}/nsMathMLElementFactory.cpp       | 0
 dom/moz.build                                                   | 1 +
 layout/mathml/moz.build                                         | 2 +-
 testing/crashtest/crashtests.list                               | 2 +-
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename {content/mathml/content => dom/mathml}/crashtests/462929-1.html (100%)
 rename {content/mathml/content => dom/mathml}/crashtests/770710-1.html (100%)
 rename {content/mathml/content => dom/mathml}/crashtests/crashtests.list (100%)
 rename {content/mathml/content/src => dom/mathml}/moz.build (100%)
 rename {content/mathml/content/src => dom/mathml}/nsMathMLElement.cpp (100%)
 rename {content/mathml/content/src => dom/mathml}/nsMathMLElement.h (100%)
 rename {content/mathml/content/src => dom/mathml}/nsMathMLElementFactory.cpp (100%)

diff --git a/content/moz.build b/content/moz.build
index 950d8230666..8abfd58453f 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -7,7 +7,6 @@
 PARALLEL_DIRS += [
     'base',
     'html',
-    'mathml/content/src',
     'media',
     'svg',
     'xul',
diff --git a/content/mathml/content/crashtests/462929-1.html b/dom/mathml/crashtests/462929-1.html
similarity index 100%
rename from content/mathml/content/crashtests/462929-1.html
rename to dom/mathml/crashtests/462929-1.html
diff --git a/content/mathml/content/crashtests/770710-1.html b/dom/mathml/crashtests/770710-1.html
similarity index 100%
rename from content/mathml/content/crashtests/770710-1.html
rename to dom/mathml/crashtests/770710-1.html
diff --git a/content/mathml/content/crashtests/crashtests.list b/dom/mathml/crashtests/crashtests.list
similarity index 100%
rename from content/mathml/content/crashtests/crashtests.list
rename to dom/mathml/crashtests/crashtests.list
diff --git a/content/mathml/content/src/moz.build b/dom/mathml/moz.build
similarity index 100%
rename from content/mathml/content/src/moz.build
rename to dom/mathml/moz.build
diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/dom/mathml/nsMathMLElement.cpp
similarity index 100%
rename from content/mathml/content/src/nsMathMLElement.cpp
rename to dom/mathml/nsMathMLElement.cpp
diff --git a/content/mathml/content/src/nsMathMLElement.h b/dom/mathml/nsMathMLElement.h
similarity index 100%
rename from content/mathml/content/src/nsMathMLElement.h
rename to dom/mathml/nsMathMLElement.h
diff --git a/content/mathml/content/src/nsMathMLElementFactory.cpp b/dom/mathml/nsMathMLElementFactory.cpp
similarity index 100%
rename from content/mathml/content/src/nsMathMLElementFactory.cpp
rename to dom/mathml/nsMathMLElementFactory.cpp
diff --git a/dom/moz.build b/dom/moz.build
index 4646b12b0ce..99e7472bd4e 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -56,6 +56,7 @@ PARALLEL_DIRS += [
     'filesystem',
     'fmradio',
     'asmjscache',
+    'mathml',
     'media',
     'messages',
     'power',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index 754f53061ba..19ddb5adf71 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -43,7 +43,7 @@ LOCAL_INCLUDES += [
     '../tables',
     '../xul',
     '/content/base/src',
-    '/content/mathml/content/src',
+    '/dom/mathml',
 ]
 
 if CONFIG['ENABLE_TESTS']:
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 399866d46b3..f834ef2fbbb 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -12,7 +12,6 @@ include ../../content/svg/content/src/crashtests/crashtests.list
 include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
-include ../../content/mathml/content/crashtests/crashtests.list
 
 # Bug 868152 - webaudio crash on tegra platform
 skip-if(Android) include ../../content/media/test/crashtests/crashtests.list
@@ -24,6 +23,7 @@ include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/canvas/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
+include ../../dom/mathml/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xml/crashtests/crashtests.list

From 1ddc4ae0638ff8719b4ff053d30184ed10ef8152 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 25 Jul 2014 15:26:05 -0700
Subject: [PATCH 010/128] Touch CLOBBER for bug 946065 to open this CLOSED TREE

---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 42e5a0800d7..96205e06f35 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1016529 - Updating Android SDK to include Google Play Services
+Bug 946065 - Move content/ to dom/

From a92ace71d595af98ae47ec2b0c10500bfb2f174a Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 25 Jul 2014 15:31:27 -0700
Subject: [PATCH 011/128] Bug 1041246 - Disable crashtests in e10s that use
 <keygen> (r=mrbkap)

---
 content/base/crashtests/crashtests.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
index b801d6ee1e9..88ffdabbed2 100644
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -133,8 +133,8 @@ load 830098.html
 load 831287.html
 load 832644.html
 load 836890.html
-load 838489-1.html
-load 838489-2.html
+skip-if(browserIsRemote) load 838489-1.html # <keygen> broken in e10s (bug 582297)
+skip-if(browserIsRemote) load 838489-2.html # <keygen> broken in e10s (bug 582297)
 load 841205.html
 load 844404.html
 load 847127.html

From 76a407d0f82774b784e09e33ccd14a2abd70ddf1 Mon Sep 17 00:00:00 2001
From: David Burns <dburns@mozilla.com>
Date: Thu, 17 Jul 2014 16:01:36 +0100
Subject: [PATCH 012/128] Bug 1036498: Add deprecation warnings to
 HTMLElement#size and HTMLElement#location in Marionette; r=jgriffin

---
 testing/marionette/client/marionette/marionette.py | 9 +++++++--
 testing/marionette/marionette-listener.js          | 4 ++--
 testing/marionette/marionette-server.js            | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py
index 804a50bd0cf..f1d75289127 100644
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import base64
 import ConfigParser
 import datetime
 import json
@@ -10,7 +11,8 @@ import socket
 import StringIO
 import time
 import traceback
-import base64
+import warnings
+
 
 from application_cache import ApplicationCache
 from decorators import do_crash_check
@@ -140,6 +142,8 @@ class HTMLElement(object):
         '''
         A dictionary with the size of the element.
         '''
+        warnings.warn("The size property has been deprecated and will be removed in a future version. \
+            Please use HTMLElement#rect", DeprecationWarning)
         return self.marionette._send_message('getElementSize', 'value', id=self.id)
 
     @property
@@ -160,7 +164,8 @@ class HTMLElement(object):
         :returns: a dictionary containing x and y as entries
 
         """
-
+        warnings.warn("The location property has been deprecated and will be removed in a future version. \
+            Please use HTMLElement#rect", DeprecationWarning)
         return self.marionette._send_message("getElementLocation", "value", id=self.id)
 
     @property
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index 0d303fcc5b7..24155ec6657 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -172,7 +172,7 @@ function startListeners() {
   addMessageListenerId("Marionette:isElementEnabled", isElementEnabled);
   addMessageListenerId("Marionette:isElementSelected", isElementSelected);
   addMessageListenerId("Marionette:sendKeysToElement", sendKeysToElement);
-  addMessageListenerId("Marionette:getElementLocation", getElementLocation);
+  addMessageListenerId("Marionette:getElementLocation", getElementLocation); //deprecated
   addMessageListenerId("Marionette:clearElement", clearElement);
   addMessageListenerId("Marionette:switchToFrame", switchToFrame);
   addMessageListenerId("Marionette:deleteSession", deleteSession);
@@ -268,7 +268,7 @@ function deleteSession(msg) {
   removeMessageListenerId("Marionette:isElementDisplayed", isElementDisplayed);
   removeMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssProperty);
   removeMessageListenerId("Marionette:submitElement", submitElement);
-  removeMessageListenerId("Marionette:getElementSize", getElementSize);
+  removeMessageListenerId("Marionette:getElementSize", getElementSize);  //deprecated
   removeMessageListenerId("Marionette:getElementRect", getElementRect);
   removeMessageListenerId("Marionette:isElementEnabled", isElementEnabled);
   removeMessageListenerId("Marionette:isElementSelected", isElementSelected);
diff --git a/testing/marionette/marionette-server.js b/testing/marionette/marionette-server.js
index 0b0ff278da1..8b830ca979e 100644
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -2493,12 +2493,12 @@ MarionetteServerConnection.prototype.requestTypes = {
   "isElementDisplayed": MarionetteServerConnection.prototype.isElementDisplayed,
   "getElementValueOfCssProperty": MarionetteServerConnection.prototype.getElementValueOfCssProperty,
   "submitElement": MarionetteServerConnection.prototype.submitElement,
-  "getElementSize": MarionetteServerConnection.prototype.getElementSize,
+  "getElementSize": MarionetteServerConnection.prototype.getElementSize,  //deprecated
   "getElementRect": MarionetteServerConnection.prototype.getElementRect,
   "isElementEnabled": MarionetteServerConnection.prototype.isElementEnabled,
   "isElementSelected": MarionetteServerConnection.prototype.isElementSelected,
   "sendKeysToElement": MarionetteServerConnection.prototype.sendKeysToElement,
-  "getElementLocation": MarionetteServerConnection.prototype.getElementLocation,
+  "getElementLocation": MarionetteServerConnection.prototype.getElementLocation,  // deprecated
   "getElementPosition": MarionetteServerConnection.prototype.getElementLocation,  // deprecated
   "clearElement": MarionetteServerConnection.prototype.clearElement,
   "getTitle": MarionetteServerConnection.prototype.getTitle,

From 410733eba064bdedb016e96b5b4ca24fc099d964 Mon Sep 17 00:00:00 2001
From: Andrei Oprea <andrei.br92@gmail.com>
Date: Fri, 25 Jul 2014 15:42:32 -0700
Subject: [PATCH 013/128] Bug 1000134 - Implement revoke generated URL for
 incoming call view, r=dmose

---
 browser/components/loop/content/js/client.js  |  50 +++++++-
 .../loop/content/js/conversation.js           | 100 +++++++++++++--
 .../loop/content/js/conversation.jsx          |  96 ++++++++++++--
 browser/components/loop/content/js/panel.js   |  96 +++++++-------
 browser/components/loop/content/js/panel.jsx  |  30 +++--
 .../loop/content/shared/css/common.css        |  86 ++++++++++---
 .../loop/content/shared/css/conversation.css  |  38 ++++++
 .../content/shared/img/dropdown-inverse.png   | Bin 0 -> 92 bytes
 .../shared/img/dropdown-inverse@2x.png        | Bin 0 -> 119 bytes
 .../loop/content/shared/js/views.js           |  56 ++++----
 browser/components/loop/jar.mn                |   2 +
 .../loop/test/desktop-local/client_test.js    | 120 ++++++++++++++----
 .../test/desktop-local/conversation_test.js   |  52 +++++++-
 .../loop/test/desktop-local/panel_test.js     |   8 +-
 .../en-US/chrome/browser/loop/loop.properties |   2 +-
 15 files changed, 593 insertions(+), 143 deletions(-)
 create mode 100644 browser/components/loop/content/shared/img/dropdown-inverse.png
 create mode 100644 browser/components/loop/content/shared/img/dropdown-inverse@2x.png

diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
index cac153651d9..bd4aff58789 100644
--- a/browser/components/loop/content/js/client.js
+++ b/browser/components/loop/content/js/client.js
@@ -82,7 +82,15 @@ loop.Client = (function($) {
      * @param {Function} cb Callback(err)
      */
     _ensureRegistered: function(cb) {
-      this.mozLoop.ensureRegistered(cb);
+      this.mozLoop.ensureRegistered(function(error) {
+        if (error) {
+          console.log("Error registering with Loop server, code: " + error);
+          cb(error);
+          return;
+        } else {
+          cb(null);
+        }
+      });
     },
 
     /**
@@ -125,6 +133,45 @@ loop.Client = (function($) {
       });
     },
 
+    /**
+     * Block call URL based on the token identifier
+     *
+     * @param {string} token Conversation identifier used to block the URL
+     * @param {function} cb Callback function used for handling an error
+     *                      response. XXX The incoming call panel does not
+     *                      exist after the block button is clicked therefore
+     *                      it does not make sense to display an error.
+     **/
+    deleteCallUrl: function(token, cb) {
+      this._ensureRegistered(function(err) {
+        if (err) {
+          cb(err);
+          return;
+        }
+
+        this._deleteCallUrlInternal(token, cb);
+      }.bind(this));
+    },
+
+    _deleteCallUrlInternal: function(token, cb) {
+      this.mozLoop.hawkRequest("/call-url/" + token, "DELETE", null,
+                               (error, responseText) => {
+        if (error) {
+          this._failureHandler(cb, error);
+          return;
+        }
+
+        try {
+          cb(null);
+
+          this.mozLoop.noteCallUrlExpiry((new Date()).getTime() / 1000);
+        } catch (err) {
+          console.log("Error deleting call info", err);
+          cb(err);
+        }
+      });
+    },
+
     /**
      * Requests a call URL from the Loop server. It will note the
      * expiry time for the url with the mozLoop api.
@@ -142,7 +189,6 @@ loop.Client = (function($) {
     requestCallUrl: function(nickname, cb) {
       this._ensureRegistered(function(err) {
         if (err) {
-          console.log("Error registering with Loop server, code: " + err);
           cb(err);
           return;
         }
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index 0ab97096f15..56bc64c5cc8 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -27,6 +27,27 @@ loop.conversation = (function(OT, mozL10n) {
       model: React.PropTypes.func.isRequired
     },
 
+    getInitialState: function() {
+      return {showDeclineMenu: false};
+    },
+
+    componentDidMount: function() {
+      window.addEventListener('click', this.clickHandler);
+      window.addEventListener('blur', this._hideDeclineMenu);
+    },
+
+    componentWillUnmount: function() {
+      window.removeEventListener('click', this.clickHandler);
+      window.removeEventListener('blur', this._hideDeclineMenu);
+    },
+
+    clickHandler: function(e) {
+      var target = e.target;
+      if (!target.classList.contains('btn-chevron')) {
+        this._hideDeclineMenu();
+      }
+    },
+
     /**
      * Used for adding different styles to the panel
      * @returns {String} Corresponds to the client platform
@@ -55,19 +76,56 @@ loop.conversation = (function(OT, mozL10n) {
       this.props.model.trigger("decline");
     },
 
+    _handleDeclineBlock: function(e) {
+      this.props.model.trigger("declineAndBlock");
+      /* Prevent event propagation
+       * stop the click from reaching parent element */
+      return false;
+    },
+
+    _toggleDeclineMenu: function() {
+      var currentState = this.state.showDeclineMenu;
+      this.setState({showDeclineMenu: !currentState});
+    },
+
+    _hideDeclineMenu: function() {
+      this.setState({showDeclineMenu: false});
+    },
+
     render: function() {
       /* jshint ignore:start */
-      var btnClassAccept = "btn btn-error btn-decline";
-      var btnClassDecline = "btn btn-success btn-accept";
+      var btnClassAccept = "btn btn-success btn-accept";
+      var btnClassBlock = "btn btn-error btn-block";
+      var btnClassDecline = "btn btn-error btn-decline";
       var conversationPanelClass = "incoming-call " + this._getTargetPlatform();
+      var cx = React.addons.classSet;
+      var declineDropdownMenuClasses = cx({
+        "native-dropdown-menu": true,
+        "decline-block-menu": true,
+        "visually-hidden": !this.state.showDeclineMenu
+      });
       return (
-        React.DOM.div( {className:conversationPanelClass}, 
-          React.DOM.h2(null, __("incoming_call")),
-          React.DOM.div( {className:"button-group"}, 
-            React.DOM.button( {className:btnClassAccept, onClick:this._handleDecline}, 
-              __("incoming_call_decline_button")
-            ),
-            React.DOM.button( {className:btnClassDecline, onClick:this._handleAccept}, 
+        React.DOM.div({className: conversationPanelClass}, 
+          React.DOM.h2(null, __("incoming_call")), 
+          React.DOM.div({className: "button-group incoming-call-action-group"}, 
+            React.DOM.div({className: "button-chevron-menu-group"}, 
+              React.DOM.div({className: "button-group-chevron"}, 
+                React.DOM.div({className: "button-group"}, 
+                  React.DOM.button({className: btnClassDecline, onClick: this._handleDecline}, 
+                    __("incoming_call_decline_button")
+                  ), 
+                  React.DOM.div({className: "btn-chevron", 
+                    onClick: this._toggleDeclineMenu}
+                  )
+                ), 
+                React.DOM.ul({className: declineDropdownMenuClasses}, 
+                  React.DOM.li({className: "btn-block", onClick: this._handleDeclineBlock}, 
+                    __("incoming_call_decline_and_block_button")
+                  )
+                )
+              )
+            ), 
+            React.DOM.button({className: btnClassAccept, onClick: this._handleAccept}, 
               __("incoming_call_answer_button")
             )
           )
@@ -116,7 +174,8 @@ loop.conversation = (function(OT, mozL10n) {
       "call/accept": "accept",
       "call/decline": "decline",
       "call/ongoing": "conversation",
-      "call/ended": "ended"
+      "call/ended": "ended",
+      "call/declineAndBlock": "declineAndBlock"
     },
 
     /**
@@ -148,6 +207,9 @@ loop.conversation = (function(OT, mozL10n) {
       this._conversation.once("decline", function() {
         this.navigate("call/decline", {trigger: true});
       }.bind(this));
+      this._conversation.once("declineAndBlock", function() {
+        this.navigate("call/declineAndBlock", {trigger: true});
+      }.bind(this));
       this.loadReactComponent(loop.conversation.IncomingCallView({
         model: this._conversation
       }));
@@ -173,6 +235,24 @@ loop.conversation = (function(OT, mozL10n) {
       window.close();
     },
 
+    /**
+     * Decline and block an incoming call
+     * @note:
+     * - loopToken is the callUrl identifier. It gets set in the panel
+     *   after a callUrl is received
+     */
+    declineAndBlock: function() {
+      window.navigator.mozLoop.stopAlerting();
+      var token = navigator.mozLoop.getLoopCharPref('loopToken');
+      var client = new loop.Client();
+      client.deleteCallUrl(token, function(error) {
+        // XXX The conversation window will be closed when this cb is triggered
+        // figure out if there is a better way to report the error to the user
+        console.log(error);
+      });
+      window.close();
+    },
+
     /**
      * conversation is the route when the conversation is active. The start
      * route should be navigated to first.
diff --git a/browser/components/loop/content/js/conversation.jsx b/browser/components/loop/content/js/conversation.jsx
index 33d61883b39..821c23f34c0 100644
--- a/browser/components/loop/content/js/conversation.jsx
+++ b/browser/components/loop/content/js/conversation.jsx
@@ -27,6 +27,27 @@ loop.conversation = (function(OT, mozL10n) {
       model: React.PropTypes.func.isRequired
     },
 
+    getInitialState: function() {
+      return {showDeclineMenu: false};
+    },
+
+    componentDidMount: function() {
+      window.addEventListener('click', this.clickHandler);
+      window.addEventListener('blur', this._hideDeclineMenu);
+    },
+
+    componentWillUnmount: function() {
+      window.removeEventListener('click', this.clickHandler);
+      window.removeEventListener('blur', this._hideDeclineMenu);
+    },
+
+    clickHandler: function(e) {
+      var target = e.target;
+      if (!target.classList.contains('btn-chevron')) {
+        this._hideDeclineMenu();
+      }
+    },
+
     /**
      * Used for adding different styles to the panel
      * @returns {String} Corresponds to the client platform
@@ -55,19 +76,56 @@ loop.conversation = (function(OT, mozL10n) {
       this.props.model.trigger("decline");
     },
 
+    _handleDeclineBlock: function(e) {
+      this.props.model.trigger("declineAndBlock");
+      /* Prevent event propagation
+       * stop the click from reaching parent element */
+      return false;
+    },
+
+    _toggleDeclineMenu: function() {
+      var currentState = this.state.showDeclineMenu;
+      this.setState({showDeclineMenu: !currentState});
+    },
+
+    _hideDeclineMenu: function() {
+      this.setState({showDeclineMenu: false});
+    },
+
     render: function() {
       /* jshint ignore:start */
-      var btnClassAccept = "btn btn-error btn-decline";
-      var btnClassDecline = "btn btn-success btn-accept";
+      var btnClassAccept = "btn btn-success btn-accept";
+      var btnClassBlock = "btn btn-error btn-block";
+      var btnClassDecline = "btn btn-error btn-decline";
       var conversationPanelClass = "incoming-call " + this._getTargetPlatform();
+      var cx = React.addons.classSet;
+      var declineDropdownMenuClasses = cx({
+        "native-dropdown-menu": true,
+        "decline-block-menu": true,
+        "visually-hidden": !this.state.showDeclineMenu
+      });
       return (
         <div className={conversationPanelClass}>
           <h2>{__("incoming_call")}</h2>
-          <div className="button-group">
-            <button className={btnClassAccept} onClick={this._handleDecline}>
-              {__("incoming_call_decline_button")}
-            </button>
-            <button className={btnClassDecline} onClick={this._handleAccept}>
+          <div className="button-group incoming-call-action-group">
+            <div className="button-chevron-menu-group">
+              <div className="button-group-chevron">
+                <div className="button-group">
+                  <button className={btnClassDecline} onClick={this._handleDecline}>
+                    {__("incoming_call_decline_button")}
+                  </button>
+                  <div className="btn-chevron"
+                    onClick={this._toggleDeclineMenu}>
+                  </div>
+                </div>
+                <ul className={declineDropdownMenuClasses}>
+                  <li className="btn-block" onClick={this._handleDeclineBlock}>
+                    {__("incoming_call_decline_and_block_button")}
+                  </li>
+                </ul>
+              </div>
+            </div>
+            <button className={btnClassAccept} onClick={this._handleAccept}>
               {__("incoming_call_answer_button")}
             </button>
           </div>
@@ -116,7 +174,8 @@ loop.conversation = (function(OT, mozL10n) {
       "call/accept": "accept",
       "call/decline": "decline",
       "call/ongoing": "conversation",
-      "call/ended": "ended"
+      "call/ended": "ended",
+      "call/declineAndBlock": "declineAndBlock"
     },
 
     /**
@@ -148,6 +207,9 @@ loop.conversation = (function(OT, mozL10n) {
       this._conversation.once("decline", function() {
         this.navigate("call/decline", {trigger: true});
       }.bind(this));
+      this._conversation.once("declineAndBlock", function() {
+        this.navigate("call/declineAndBlock", {trigger: true});
+      }.bind(this));
       this.loadReactComponent(loop.conversation.IncomingCallView({
         model: this._conversation
       }));
@@ -173,6 +235,24 @@ loop.conversation = (function(OT, mozL10n) {
       window.close();
     },
 
+    /**
+     * Decline and block an incoming call
+     * @note:
+     * - loopToken is the callUrl identifier. It gets set in the panel
+     *   after a callUrl is received
+     */
+    declineAndBlock: function() {
+      window.navigator.mozLoop.stopAlerting();
+      var token = navigator.mozLoop.getLoopCharPref('loopToken');
+      var client = new loop.Client();
+      client.deleteCallUrl(token, function(error) {
+        // XXX The conversation window will be closed when this cb is triggered
+        // figure out if there is a better way to report the error to the user
+        console.log(error);
+      });
+      window.close();
+    },
+
     /**
      * conversation is the route when the conversation is active. The start
      * route should be navigated to first.
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 4b42b9c428e..03b938cb9f1 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -77,22 +77,22 @@ loop.panel = (function(_, mozL10n) {
                               __("display_name_available_status");
 
       return (
-        React.DOM.div( {className:"footer component-spacer"}, 
-          React.DOM.div( {className:"do-not-disturb"}, 
-            React.DOM.p( {className:"dnd-status", onClick:this.showDropdownMenu}, 
-              React.DOM.span(null, availabilityText),
-              React.DOM.i( {className:availabilityStatus})
-            ),
-            React.DOM.ul( {className:availabilityDropdown,
-                onMouseLeave:this.hideDropdownMenu}, 
-              React.DOM.li( {onClick:this.changeAvailability("available"),
-                  className:"dnd-menu-item dnd-make-available"}, 
-                React.DOM.i( {className:"status status-available"}),
+        React.DOM.div({className: "footer component-spacer"}, 
+          React.DOM.div({className: "do-not-disturb"}, 
+            React.DOM.p({className: "dnd-status", onClick: this.showDropdownMenu}, 
+              React.DOM.span(null, availabilityText), 
+              React.DOM.i({className: availabilityStatus})
+            ), 
+            React.DOM.ul({className: availabilityDropdown, 
+                onMouseLeave: this.hideDropdownMenu}, 
+              React.DOM.li({onClick: this.changeAvailability("available"), 
+                  className: "dnd-menu-item dnd-make-available"}, 
+                React.DOM.i({className: "status status-available"}), 
                 React.DOM.span(null, __("display_name_available_status"))
-              ),
-              React.DOM.li( {onClick:this.changeAvailability("do-not-disturb"),
-                  className:"dnd-menu-item dnd-make-unavailable"}, 
-                React.DOM.i( {className:"status status-dnd"}),
+              ), 
+              React.DOM.li({onClick: this.changeAvailability("do-not-disturb"), 
+                  className: "dnd-menu-item dnd-make-unavailable"}, 
+                React.DOM.i({className: "status status-dnd"}), 
                 React.DOM.span(null, __("display_name_dnd_status"))
               )
             )
@@ -115,10 +115,10 @@ loop.panel = (function(_, mozL10n) {
 
       if (this.state.seenToS == "unseen") {
         navigator.mozLoop.setLoopCharPref('seenToS', 'seen');
-        return React.DOM.p( {className:"terms-service",
-                  dangerouslySetInnerHTML:{__html: tosHTML}});
+        return React.DOM.p({className: "terms-service", 
+                  dangerouslySetInnerHTML: {__html: tosHTML}});
       } else {
-        return React.DOM.div(null );
+        return React.DOM.div(null);
       }
     }
   });
@@ -130,11 +130,11 @@ loop.panel = (function(_, mozL10n) {
 
     render: function() {
       return (
-        React.DOM.div( {className:"component-spacer share generate-url"}, 
-          React.DOM.div( {className:"description"}, 
-            React.DOM.p( {className:"description-content"}, this.props.summary)
-          ),
-          React.DOM.div( {className:"action"}, 
+        React.DOM.div({className: "component-spacer share generate-url"}, 
+          React.DOM.div({className: "description"}, 
+            React.DOM.p({className: "description-content"}, this.props.summary)
+          ), 
+          React.DOM.div({className: "action"}, 
             this.props.children
           )
         )
@@ -155,6 +155,10 @@ loop.panel = (function(_, mozL10n) {
     * Returns a random 5 character string used to identify
     * the conversation.
     * XXX this will go away once the backend changes
+    * @note:
+    * - When we get back a callUrl we use setLoopCharPref to store the token
+    *   (the last fragment of the URL) so that it can be used to ignore&block
+    *   the call. The preference is used by the conversation router.
     */
     conversationIdentifier: function() {
       return Math.random().toString(36).substring(5);
@@ -167,22 +171,28 @@ loop.panel = (function(_, mozL10n) {
     },
 
     _onCallUrlReceived: function(err, callUrlData) {
-      // XXX this initializer is a bug, as it will cause
-      // setState to set the callUrl to false if one is not returned.
-      // Should decide on an implement correct behavior and state
-      // (eg set widget as disabled, state.callUrl == '')
-      //
-      var callUrl = false;
-
       this.props.notifier.clear();
 
       if (err) {
         this.props.notifier.errorL10n("unable_retrieve_url");
+        this.setState({pending: false});
       } else {
-        callUrl = callUrlData.callUrl || callUrlData.call_url;
-      }
+        try {
+          var callUrl = new window.URL(callUrlData.callUrl ||
+                                       callUrlData.call_url);
+          // XXX the current server vers does not implement the callToken field
+          // but it exists in the API. This workaround should be removed in the future
+          var token = callUrlData.callToken ||
+                      callUrl.pathname.split('/').pop();
 
-      this.setState({pending: false, callUrl: callUrl});
+          navigator.mozLoop.setLoopCharPref('loopToken', token);
+          this.setState({pending: false, callUrl: callUrl.href});
+        } catch(e) {
+          console.log(e);
+          this.props.notifier.errorL10n("unable_retrieve_url");
+          this.setState({pending: false});
+        }
+      }
     },
 
     render: function() {
@@ -192,10 +202,10 @@ loop.panel = (function(_, mozL10n) {
       // from the react lib.
       var cx = React.addons.classSet;
       return (
-        PanelLayout( {summary:__("share_link_header_text")}, 
-          React.DOM.div( {className:"invite"}, 
-            React.DOM.input( {type:"url", value:this.state.callUrl, readOnly:"true",
-                   className:cx({'pending': this.state.pending})} )
+        PanelLayout({summary: __("share_link_header_text")}, 
+          React.DOM.div({className: "invite"}, 
+            React.DOM.input({type: "url", value: this.state.callUrl, readOnly: "true", 
+                   className: cx({'pending': this.state.pending})})
           )
         )
       );
@@ -214,10 +224,10 @@ loop.panel = (function(_, mozL10n) {
     render: function() {
       return (
         React.DOM.div(null, 
-          CallUrlResult( {client:this.props.client,
-                       notifier:this.props.notifier} ),
-          ToSView(null ),
-          AvailabilityDropdown(null )
+          CallUrlResult({client: this.props.client, 
+                       notifier: this.props.notifier}), 
+          ToSView(null), 
+          AvailabilityDropdown(null)
         )
       );
     }
@@ -284,8 +294,8 @@ loop.panel = (function(_, mozL10n) {
       var client = new loop.Client({
         baseServerUrl: navigator.mozLoop.serverUrl
       });
-      this.loadReactComponent(PanelView( {client:client,
-                                         notifier:this._notifier} ));
+      this.loadReactComponent(PanelView({client: client, 
+                                         notifier: this._notifier}));
     }
   });
 
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index fef6afcd801..77fbb536f32 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -155,6 +155,10 @@ loop.panel = (function(_, mozL10n) {
     * Returns a random 5 character string used to identify
     * the conversation.
     * XXX this will go away once the backend changes
+    * @note:
+    * - When we get back a callUrl we use setLoopCharPref to store the token
+    *   (the last fragment of the URL) so that it can be used to ignore&block
+    *   the call. The preference is used by the conversation router.
     */
     conversationIdentifier: function() {
       return Math.random().toString(36).substring(5);
@@ -167,22 +171,28 @@ loop.panel = (function(_, mozL10n) {
     },
 
     _onCallUrlReceived: function(err, callUrlData) {
-      // XXX this initializer is a bug, as it will cause
-      // setState to set the callUrl to false if one is not returned.
-      // Should decide on an implement correct behavior and state
-      // (eg set widget as disabled, state.callUrl == '')
-      //
-      var callUrl = false;
-
       this.props.notifier.clear();
 
       if (err) {
         this.props.notifier.errorL10n("unable_retrieve_url");
+        this.setState({pending: false});
       } else {
-        callUrl = callUrlData.callUrl || callUrlData.call_url;
-      }
+        try {
+          var callUrl = new window.URL(callUrlData.callUrl ||
+                                       callUrlData.call_url);
+          // XXX the current server vers does not implement the callToken field
+          // but it exists in the API. This workaround should be removed in the future
+          var token = callUrlData.callToken ||
+                      callUrl.pathname.split('/').pop();
 
-      this.setState({pending: false, callUrl: callUrl});
+          navigator.mozLoop.setLoopCharPref('loopToken', token);
+          this.setState({pending: false, callUrl: callUrl.href});
+        } catch(e) {
+          console.log(e);
+          this.props.notifier.errorL10n("unable_retrieve_url");
+          this.setState({pending: false});
+        }
+      }
     },
 
     render: function() {
diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 197dc761e38..207268b5d71 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -53,6 +53,10 @@ img {
   display: none;
 }
 
+.visually-hidden {
+  visibility: hidden;
+}
+
 .tc {
   text-align: center;
 }
@@ -73,57 +77,111 @@ img {
   padding: 0 0.5em;
   border-radius: 2px;
   cursor: pointer;
+  font-size: .9em;
+  text-align: center;
 }
 
 .btn-info {
-  background: #0096dd;
+  background-color: #0096dd;
   border: 1px solid #0095dd;
 }
 
   .btn-info:hover {
-    background: #008acb;
+    background-color: #008acb;
     border: 1px solid #008acb;
   }
 
   .btn-info:active {
-    background: #006b9d;
+    background-color: #006b9d;
     border: 1px solid #006b9d;
   }
 
 .btn-success {
-  background: #74bf43;
+  background-color: #74bf43;
   border: 1px solid #74bf43;
 }
 
   .btn-success:hover {
-    background: #6cb23e;
+    background-color: #6cb23e;
     border: 1px solid #6cb23e;
   }
 
   .btn-success:active {
-    background: #64a43a;
+    background-color: #64a43a;
     border: 1px solid #64a43a;
   }
 
 .btn-warning {
-  background: #f0ad4e;
+  background-color: #f0ad4e;
 }
 
-.btn-error {
-  background: #d74345;
+.btn-error,
+.btn-error + .btn-chevron {
+  background-color: #d74345;
   border: 1px solid #d74345;
 }
 
-  .btn-error:hover {
-    background: #c53436;
+  .btn-error:hover,
+  .btn-error + .btn-chevron:hover {
+    background-color: #c53436;
     border: 1px solid #c53436;
   }
 
-  .btn-error:active {
-    background: #ae2325;
+  .btn-error:active,
+  .btn-error + .btn-chevron:active {
+    background-color: #ae2325;
     border: 1px solid #ae2325;
   }
 
+.btn-chevron {
+  width: 26px;
+  height: 26px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+/* Groups together a button and a chevron */
+.button-group-chevron {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+/* Groups together a button-group-chevron
+ * and the dropdown menu */
+.button-chevron-menu-group {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  flex: 1;
+}
+
+.button-group-chevron .btn {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  flex: 2;
+}
+
+  .btn + .btn-chevron,
+  .btn + .btn-chevron:hover,
+  .btn + .btn-chevron:active {
+    border-left: 1px solid rgba(255,255,255,.4);
+    background-image: url("../img/dropdown-inverse.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 10px;
+  }
+
+@media (min-resolution: 2dppx) {
+  .btn-chevron {
+    background-image: url(../img/dropdown-inverse@2x.png);
+    background-position: center;
+    background-size: 10px;
+    background-repeat: no-repeat;
+  }
+}
+
 .disabled, button[disabled] {
   cursor: not-allowed;
   pointer-events: none;
@@ -133,12 +191,10 @@ img {
 .button-group {
   display: flex;
   width: 100%;
-  padding: 1em;
 }
 
 .button-group .btn {
   flex: 1;
-  margin: 0 .3em;
 }
 
 /* Alerts */
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index 4e0b0c61fc0..e3f36763fa6 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -177,8 +177,46 @@
   min-height: 264px;
 }
 
+.incoming-call-action-group {
+  padding: 2.5em 1em;
+}
+
+.incoming-call-action-group .button-chevron-menu-group {
+  margin-right: .5em;
+}
+
+.incoming-call-action-group > .btn {
+  margin-left: .5em;
+}
+
 .incoming-call h2 {
   font-size: 1.5em;
   font-weight: normal;
 }
 
+/* Block incoming call */
+
+.native-dropdown-menu {
+  /* Should match a native select menu */
+  padding: 0;
+  position: absolute; /* element can be wider than the parent */
+  background: #fff;
+  margin: 0;
+  box-shadow: 0 4px 5px rgba(30, 30, 30, .3);
+  border-style: solid;
+  border-width: 1px 1px 1px 2px;
+  border-color: #aaa #111 #111 #aaa;
+}
+
+.decline-block-menu li {
+  padding: 0 10px 0 5px;
+  list-style: none;
+  font-size: .9em;
+  color: #000;
+  cursor: pointer;
+}
+
+  .decline-block-menu li:hover {
+    color: #FFF;
+    background: #111;
+  }
diff --git a/browser/components/loop/content/shared/img/dropdown-inverse.png b/browser/components/loop/content/shared/img/dropdown-inverse.png
new file mode 100644
index 0000000000000000000000000000000000000000..b30364466d9cb7dfd0a65c4b47656d08224f742b
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^96-#%!3HEZpRM}<q?A2f978y+C;#~Wzy5Ijodxq4
rSsHrW=1ekZSjG`5<QpivNrGYhZSU;@Dtb47${9Re{an^LB{Ts5UhEsi

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/img/dropdown-inverse@2x.png b/browser/components/loop/content/shared/img/dropdown-inverse@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..63126f18ccadefd19278f625188738ee3ccbf2d2
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!3HEhl+{lMQg)s$jv*T7r}h|fF(~jHdG}cB
z#s1!Aj#n3o8hbh$*v=g2Q1fK6va`0EG1=TqJyh_dO5bG9iHFTUKFT)QRKXbiM(lgV
Sy()8{NerH@elF{r5}E+u)F+An

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 281e6c1926d..29d515f9fcb 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -138,9 +138,11 @@ loop.shared.views = (function(_, OT, l10n) {
 
     render: function() {
       return (
-        React.DOM.button( {className:this._getClasses(),
-                title:this._getTitle(),
-                onClick:this.handleClick})
+        /* jshint ignore:start */
+        React.DOM.button({className: this._getClasses(), 
+                title: this._getTitle(), 
+                onClick: this.handleClick})
+        /* jshint ignore:end */
       );
     }
   });
@@ -176,19 +178,21 @@ loop.shared.views = (function(_, OT, l10n) {
     },
 
     render: function() {
+      /* jshint ignore:start */
       return (
-        React.DOM.ul( {className:"controls"}, 
-          React.DOM.li(null, React.DOM.button( {className:"btn btn-hangup",
-                      onClick:this.handleClickHangup,
-                      title:__("hangup_button_title")})),
-          React.DOM.li(null, MediaControlButton( {action:this.handleToggleVideo,
-                                  enabled:this.props.video.enabled,
-                                  scope:"local", type:"video"} )),
-          React.DOM.li(null, MediaControlButton( {action:this.handleToggleAudio,
-                                  enabled:this.props.audio.enabled,
-                                  scope:"local", type:"audio"} ))
+        React.DOM.ul({className: "controls"}, 
+          React.DOM.li(null, React.DOM.button({className: "btn btn-hangup", 
+                      onClick: this.handleClickHangup, 
+                      title: __("hangup_button_title")})), 
+          React.DOM.li(null, MediaControlButton({action: this.handleToggleVideo, 
+                                  enabled: this.props.video.enabled, 
+                                  scope: "local", type: "video"})), 
+          React.DOM.li(null, MediaControlButton({action: this.handleToggleAudio, 
+                                  enabled: this.props.audio.enabled, 
+                                  scope: "local", type: "audio"}))
         )
       );
+      /* jshint ignore:end */
     }
   });
 
@@ -200,8 +204,8 @@ loop.shared.views = (function(_, OT, l10n) {
       model: React.PropTypes.object.isRequired
     },
 
-    // height set to "auto" to fix video layout on Google Chrome
-    // @see https://bugzilla.mozilla.org/show_bug.cgi?id=991122
+    // height set to 100%" to fix video layout on Google Chrome
+    // @see https://bugzilla.mozilla.org/show_bug.cgi?id=1020445
     publisherConfig: {
       insertMode: "append",
       width: "100%",
@@ -329,20 +333,22 @@ loop.shared.views = (function(_, OT, l10n) {
     },
 
     render: function() {
+      /* jshint ignore:start */
       return (
-        React.DOM.div( {className:"conversation"}, 
-          ConversationToolbar( {video:this.state.video,
-                               audio:this.state.audio,
-                               publishStream:this.publishStream,
-                               hangup:this.hangup} ),
-          React.DOM.div( {className:"media nested"}, 
-            React.DOM.div( {className:"video_wrapper remote_wrapper"}, 
-              React.DOM.div( {className:"video_inner remote"})
-            ),
-            React.DOM.div( {className:"local"})
+        React.DOM.div({className: "conversation"}, 
+          ConversationToolbar({video: this.state.video, 
+                               audio: this.state.audio, 
+                               publishStream: this.publishStream, 
+                               hangup: this.hangup}), 
+          React.DOM.div({className: "media nested"}, 
+            React.DOM.div({className: "video_wrapper remote_wrapper"}, 
+              React.DOM.div({className: "video_inner remote"})
+            ), 
+            React.DOM.div({className: "local"})
           )
         )
       );
+      /* jshint ignore:end */
     }
   });
 
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 33c3015545d..ef362755ea3 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -35,6 +35,8 @@ browser.jar:
   content/browser/loop/shared/img/mute-inverse-14x14@2x.png     (content/shared/img/mute-inverse-14x14@2x.png)
   content/browser/loop/shared/img/video-inverse-14x14.png       (content/shared/img/video-inverse-14x14.png)
   content/browser/loop/shared/img/video-inverse-14x14@2x.png    (content/shared/img/video-inverse-14x14@2x.png)
+  content/browser/loop/shared/img/dropdown-inverse.png       (content/shared/img/dropdown-inverse.png)
+  content/browser/loop/shared/img/dropdown-inverse@2x.png    (content/shared/img/dropdown-inverse@2x.png)
 
   # Shared scripts
   content/browser/loop/shared/js/models.js  (content/shared/js/models.js)
diff --git a/browser/components/loop/test/desktop-local/client_test.js b/browser/components/loop/test/desktop-local/client_test.js
index 4c29645f6dd..bc63b8971a4 100644
--- a/browser/components/loop/test/desktop-local/client_test.js
+++ b/browser/components/loop/test/desktop-local/client_test.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*global loop, sinon, it, beforeEach, afterEach, describe, hawk */
+/*global loop, sinon, it, beforeEach, afterEach, describe */
 
 var expect = chai.expect;
 
@@ -48,6 +48,70 @@ describe("loop.Client", function() {
   });
 
   describe("loop.Client", function() {
+    describe("#deleteCallUrl", function() {
+      it("should ensure loop is registered", function() {
+        client.deleteCallUrl("fakeToken", callback);
+
+        sinon.assert.calledOnce(mozLoop.ensureRegistered);
+      });
+
+      it("should send an error when registration fails", function() {
+        mozLoop.ensureRegistered.callsArgWith(0, "offline");
+
+        client.deleteCallUrl("fakeToken", callback);
+
+        sinon.assert.calledOnce(callback);
+        sinon.assert.calledWithExactly(callback, "offline");
+      });
+
+      it("should make a delete call to /call-url/{fakeToken}", function() {
+        client.deleteCallUrl(fakeToken, callback);
+
+        sinon.assert.calledOnce(hawkRequestStub);
+        sinon.assert.calledWith(hawkRequestStub,
+                                "/call-url/" + fakeToken, "DELETE");
+      });
+
+      it("should call the callback with null when the request succeeds",
+         function() {
+
+           // Sets up the hawkRequest stub to trigger the callback with no error
+           // and the url.
+           hawkRequestStub.callsArgWith(3, null);
+
+           client.deleteCallUrl(fakeToken, callback);
+
+           sinon.assert.calledWithExactly(callback, null);
+         });
+
+      it("should reset all url expiry when the request succeeds", function() {
+        // Sets up the hawkRequest stub to trigger the callback with no error
+        // and the url.
+        var dateInMilliseconds = new Date(2014,7,20).getTime();
+        hawkRequestStub.callsArgWith(3, null);
+        sandbox.useFakeTimers(dateInMilliseconds);
+
+        client.deleteCallUrl(fakeToken, callback);
+
+        sinon.assert.calledOnce(mozLoop.noteCallUrlExpiry);
+        sinon.assert.calledWithExactly(mozLoop.noteCallUrlExpiry,
+                                       dateInMilliseconds / 1000);
+      });
+
+      it("should send an error when the request fails", function() {
+        // Sets up the hawkRequest stub to trigger the callback with
+        // an error
+        hawkRequestStub.callsArgWith(3, fakeErrorRes);
+
+        client.deleteCallUrl(fakeToken, callback);
+
+        sinon.assert.calledOnce(callback);
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /400.*invalid token/.test(err.message);
+        }));
+      });
+    });
+
     describe("#requestCallUrl", function() {
       it("should ensure loop is registered", function() {
         client.requestCallUrl("foo", callback);
@@ -72,39 +136,41 @@ describe("loop.Client", function() {
                                 "/call-url/", "POST", {callerId: "foo"});
       });
 
-      it("should call the callback with the url when the request succeeds", function() {
-        var callUrlData = {
-          "callUrl": "fakeCallUrl",
-          "expiresAt": 60
-        };
+      it("should call the callback with the url when the request succeeds",
+        function() {
+          var callUrlData = {
+            "callUrl": "fakeCallUrl",
+            "expiresAt": 60
+          };
 
-        // Sets up the hawkRequest stub to trigger the callback with no error
-        // and the url.
-        hawkRequestStub.callsArgWith(3, null,
-                                     JSON.stringify(callUrlData));
+          // Sets up the hawkRequest stub to trigger the callback with no error
+          // and the url.
+          hawkRequestStub.callsArgWith(3, null,
+            JSON.stringify(callUrlData));
 
-        client.requestCallUrl("foo", callback);
+          client.requestCallUrl("foo", callback);
 
-        sinon.assert.calledWithExactly(callback, null, callUrlData);
-      });
+          sinon.assert.calledWithExactly(callback, null, callUrlData);
+        });
 
-      it("should note the call url expiry when the request succeeds", function() {
-        var callUrlData = {
-          "callUrl": "fakeCallUrl",
-          "expiresAt": 6000
-        };
+      it("should note the call url expiry when the request succeeds",
+        function() {
+          var callUrlData = {
+            "callUrl": "fakeCallUrl",
+            "expiresAt": 6000
+          };
 
-        // Sets up the hawkRequest stub to trigger the callback with no error
-        // and the url.
-        hawkRequestStub.callsArgWith(3, null,
-                                     JSON.stringify(callUrlData));
+          // Sets up the hawkRequest stub to trigger the callback with no error
+          // and the url.
+          hawkRequestStub.callsArgWith(3, null,
+            JSON.stringify(callUrlData));
 
-        client.requestCallUrl("foo", callback);
+          client.requestCallUrl("foo", callback);
 
-        sinon.assert.calledOnce(mozLoop.noteCallUrlExpiry);
-        sinon.assert.calledWithExactly(mozLoop.noteCallUrlExpiry,
-          6000);
-      });
+          sinon.assert.calledOnce(mozLoop.noteCallUrlExpiry);
+          sinon.assert.calledWithExactly(mozLoop.noteCallUrlExpiry,
+            6000);
+        });
 
       it("should send an error when the request fails", function() {
         // Sets up the hawkRequest stub to trigger the callback with
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 1e0acbe6a4f..623ff18b16c 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -37,7 +37,8 @@ describe("loop.conversation", function() {
       setLoopCharPref: sandbox.stub(),
       getLoopCharPref: sandbox.stub(),
       startAlerting: function() {},
-      stopAlerting: function() {}
+      stopAlerting: function() {},
+      ensureRegistered: function() {}
     };
 
     // XXX These stubs should be hoisted in a common file
@@ -252,6 +253,44 @@ describe("loop.conversation", function() {
         // close connections nicely
         it("should close the window");
       });
+
+      describe("#blocked", function() {
+        it("should call mozLoop.stopAlerting", function() {
+          sandbox.stub(window.navigator.mozLoop, "stopAlerting");
+          router.declineAndBlock();
+
+          sinon.assert.calledOnce(window.navigator.mozLoop.stopAlerting);
+        });
+
+        it("should call delete call", function() {
+          var deleteCallUrl = sandbox.stub(loop.Client.prototype, "deleteCallUrl");
+          router.declineAndBlock();
+
+          sinon.assert.calledOnce(deleteCallUrl);
+        });
+
+        it("should trigger error handling in case of error", function() {
+          // XXX just logging to console for now
+          var log = sandbox.stub(console, "log");
+          var fakeError = {
+            error: true
+          };
+          sandbox.stub(loop.Client.prototype, "deleteCallUrl", function(_, cb) {
+            cb(fakeError);
+          });
+          router.declineAndBlock();
+
+          sinon.assert.calledOnce(log);
+          sinon.assert.calledWithExactly(log, fakeError);
+        });
+
+        it("should close the window", function() {
+          sandbox.stub(window, "close");
+          router.declineAndBlock();
+
+          sinon.assert.calledOnce(window.close);
+        });
+      });
     });
 
     describe("Events", function() {
@@ -351,5 +390,16 @@ describe("loop.conversation", function() {
         sinon.assert.calledWith(model.trigger, "decline");
         });
     });
+
+    describe("click event on .btn-block", function() {
+      it("should trigger a 'block' conversation model event", function() {
+        var buttonBlock = view.getDOMNode().querySelector(".btn-block");
+
+        TestUtils.Simulate.click(buttonBlock);
+
+        sinon.assert.calledOnce(model.trigger);
+        sinon.assert.calledWith(model.trigger, "declineAndBlock");
+      });
+    });
   });
 });
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 969a243b2c9..8b23b154265 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -229,7 +229,7 @@ describe("loop.panel", function() {
 
     beforeEach(function() {
       callUrlData = {
-        call_url: "http://call.invalid/",
+        call_url: "http://call.invalid/fakeToken",
         expiresAt: 1000
       };
 
@@ -303,6 +303,12 @@ describe("loop.panel", function() {
         sinon.assert.calledWithExactly(notifier.errorL10n,
                                        "unable_retrieve_url");
       });
+
+      it("should set 'loopToken' with the callUrl token", function() {
+        sinon.assert.calledOnce(navigator.mozLoop.setLoopCharPref);
+        sinon.assert.calledWithExactly(navigator.mozLoop.setLoopCharPref,
+                                       "loopToken", "fakeToken");
+      });
     });
   });
 
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index fbc69df8bb2..6ae185e588f 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -18,7 +18,7 @@ incoming_call_title=Incoming Call…
 incoming_call=Incoming call
 incoming_call_answer_button=Answer
 incoming_call_decline_button=Decline
-incoming_call_ignore_button=Ignore
+incoming_call_decline_and_block_button=Decline and Block
 incoming_call_block_button=Block
 hangup_button_title=Hangup
 mute_local_audio_button_title=Mute your audio

From 9a82a5dc7c5251918b5f2a7130089b602b499018 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 25 Jul 2014 14:33:39 -0700
Subject: [PATCH 014/128] Invert exception types in the exception specification
 corresponding to |import dbus; ...stuff that might throw a dbus exception| so
 that failure to import dbus will be caught, rather than triggering a
 "NameError: name 'dbus' is not defined" error.  Followup to bug 981146,
 r=trivial

--HG--
extra : rebase_source : f3439471f361ea16f74161a3ee68b9227e2c0eb9
---
 python/mozbuild/mozbuild/mach_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index cbf745791b2..376a237074a 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -412,7 +412,7 @@ class Build(MachCommandBase):
                         method = notify.get_dbus_method('Notify',
                                                         'org.freedesktop.Notifications')
                         method('Mozilla Build System', 0, '', 'Build complete', '', [], [], -1)
-                    except (dbus.exceptions.DBusException, ImportError):
+                    except (ImportError, dbus.exceptions.DBusException):
                         pass
 
             except (which.WhichError, ImportError):

From 6922f767cfc7bd4b7775937d3343428135507ede Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 11 Jul 2014 14:24:34 -0700
Subject: [PATCH 015/128] Bug 1037609 - Remove the js_strdup(cx, jschars)
 method entirely, seeing as there are so few other uses of it.  r=jimb

--HG--
extra : rebase_source : 1a611dccabaddccebc522943559a2ea1f1703811
---
 js/src/builtin/TestingFunctions.cpp | 2 +-
 js/src/jsapi.cpp                    | 8 +++++---
 js/src/jsstr.h                      | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index ae6b4ad4c2c..726a15a3a28 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1724,7 +1724,7 @@ struct FindPathHandler {
 
         // Record how we reached this node. This is the last edge on a
         // shortest path to this node.
-        EdgeName edgeName(js_strdup(traversal.cx, edge.name));
+        EdgeName edgeName = DuplicateString(traversal.cx, edge.name);
         if (!edgeName)
             return false;
         *backEdge = mozilla::Move(BackEdge(origin, Move(edgeName)));
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index d4c57401a18..e156856b60b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -12,6 +12,7 @@
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/PodOperations.h"
+#include "mozilla/UniquePtr.h"
 
 #include <ctype.h>
 #include <stdarg.h>
@@ -101,6 +102,7 @@ using namespace js::types;
 using mozilla::Maybe;
 using mozilla::PodCopy;
 using mozilla::PodZero;
+using mozilla::UniquePtr;
 
 using JS::AutoGCRooter;
 
@@ -4383,9 +4385,9 @@ JS::OwningCompileOptions::setFileAndLine(JSContext *cx, const char *f, unsigned
 bool
 JS::OwningCompileOptions::setSourceMapURL(JSContext *cx, const jschar *s)
 {
-    jschar *copy = nullptr;
+    UniquePtr<jschar[], JS::FreePolicy> copy;
     if (s) {
-        copy = js_strdup(cx, s);
+        copy = DuplicateString(cx, s);
         if (!copy)
             return false;
     }
@@ -4393,7 +4395,7 @@ JS::OwningCompileOptions::setSourceMapURL(JSContext *cx, const jschar *s)
     // OwningCompileOptions always owns sourceMapURL_, so this cast is okay.
     js_free(const_cast<jschar *>(sourceMapURL_));
 
-    sourceMapURL_ = copy;
+    sourceMapURL_ = copy.release();
     return true;
 }
 
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 5ff7250824e..beec911faa6 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -300,12 +300,6 @@ str_fromCharCode_one_arg(JSContext *cx, HandleValue code, MutableHandleValue rva
 
 } /* namespace js */
 
-inline jschar *
-js_strdup(js::ThreadSafeContext *cx, const jschar *s)
-{
-    return js::DuplicateString(cx, s).release();
-}
-
 extern bool
 js_str_toString(JSContext *cx, unsigned argc, js::Value *vp);
 

From c825198daf146e791724844bddd1c2fdd8bff39e Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 25 Jul 2014 14:34:10 -0700
Subject: [PATCH 016/128] Bug 1043683 - Make RegExpStatics::makeMatch sane
 about not taking two arguments, one of which is always double the other (yet
 has its parity tested).  r=ae.anderson0@gmail.com

--HG--
extra : rebase_source : 13b576c6e15b8f4f0ad7e639ccdcaaf609bc10b5
---
 js/src/vm/RegExpStatics.h | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 3deed74c478..95a1d877196 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -70,11 +70,10 @@ class RegExpStatics
     inline void checkInvariants();
 
     /*
-     * Check whether the index at |checkValidIndex| is valid (>= 0).
-     * If so, construct a string for it and place it in |*out|.
-     * If not, place undefined in |*out|.
+     * Check whether a match for pair |pairNum| occurred.  If so, allocate and
+     * store the match string in |*out|; otherwise place |undefined| in |*out|.
      */
-    bool makeMatch(JSContext *cx, size_t checkValidIndex, size_t pairNum, MutableHandleValue out);
+    bool makeMatch(JSContext *cx, size_t pairNum, MutableHandleValue out);
     bool createDependent(JSContext *cx, size_t start, size_t end, MutableHandleValue out);
 
     void markFlagsSet(JSContext *cx);
@@ -240,21 +239,16 @@ RegExpStatics::createPendingInput(JSContext *cx, MutableHandleValue out)
 }
 
 inline bool
-RegExpStatics::makeMatch(JSContext *cx, size_t checkValidIndex, size_t pairNum,
-                         MutableHandleValue out)
+RegExpStatics::makeMatch(JSContext *cx, size_t pairNum, MutableHandleValue out)
 {
     /* Private function: caller must perform lazy evaluation. */
     JS_ASSERT(!pendingLazyEvaluation);
 
-    bool checkWhich  = checkValidIndex % 2;
-    size_t checkPair = checkValidIndex / 2;
-
-    if (matches.empty() || checkPair >= matches.pairCount() ||
-        (checkWhich ? matches[checkPair].limit : matches[checkPair].start) < 0)
-    {
+    if (matches.empty() || pairNum >= matches.pairCount() || matches[pairNum].isUndefined()) {
         out.setString(cx->runtime()->emptyString);
         return true;
     }
+
     const MatchPair &pair = matches[pairNum];
     return createDependent(cx, pair.start, pair.limit, out);
 }
@@ -264,7 +258,7 @@ RegExpStatics::createLastMatch(JSContext *cx, MutableHandleValue out)
 {
     if (!executeLazy(cx))
         return false;
-    return makeMatch(cx, 0, 0, out);
+    return makeMatch(cx, 0, out);
 }
 
 inline bool
@@ -298,7 +292,7 @@ RegExpStatics::createParen(JSContext *cx, size_t pairNum, MutableHandleValue out
         out.setString(cx->runtime()->emptyString);
         return true;
     }
-    return makeMatch(cx, pairNum * 2, pairNum, out);
+    return makeMatch(cx, pairNum, out);
 }
 
 inline bool

From fa1d3e6cbdf76a75661e11498e635ebfdec10e6c Mon Sep 17 00:00:00 2001
From: Andy Anderson <ae.anderson0@gmail.com>
Date: Fri, 25 Jul 2014 14:34:10 -0700
Subject: [PATCH 017/128] Bug 369778 - RegExp capturing groups that aren't
 matched during a match (because of, say, a *?+{n}{n,m} quantifier that means
 they're never used) should be matched as |undefined|, not as the empty
 string.  r=jwalden

--HG--
extra : rebase_source : cf5710ee19dbdc0ee9b50d9a75d94e4e04584ec4
---
 js/src/tests/ecma_3/String/15.5.4.11.js       |  1 -
 js/src/tests/ecma_3/String/regress-369778.js  | 29 +++++++++++++++++++
 js/src/tests/ecma_3/String/regress-392378.js  |  1 -
 .../ecma_3/extensions/regress-220367-002.js   |  4 +--
 js/src/vm/RegExpStatics.h                     |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 js/src/tests/ecma_3/String/regress-369778.js

diff --git a/js/src/tests/ecma_3/String/15.5.4.11.js b/js/src/tests/ecma_3/String/15.5.4.11.js
index 50b930517cf..a5515286a0a 100644
--- a/js/src/tests/ecma_3/String/15.5.4.11.js
+++ b/js/src/tests/ecma_3/String/15.5.4.11.js
@@ -1,4 +1,3 @@
-// |reftest| fails
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/js/src/tests/ecma_3/String/regress-369778.js b/js/src/tests/ecma_3/String/regress-369778.js
new file mode 100644
index 00000000000..ad282eb4612
--- /dev/null
+++ b/js/src/tests/ecma_3/String/regress-369778.js
@@ -0,0 +1,29 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+var BUGNUMBER = 369778;
+var summary =
+  "RegExpStatics::makeMatch should make an undefined value when the last " +
+  "match had an undefined capture.";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+var expected = undefined;
+var actual;
+
+'x'.replace(/x(.)?/g, function(m, group) { actual = group; })
+
+print("expected: " + expected)
+print("actual: " + actual)
+
+assertEq(expected, actual)
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
diff --git a/js/src/tests/ecma_3/String/regress-392378.js b/js/src/tests/ecma_3/String/regress-392378.js
index 9e8c6c5c615..6bfdf8142c5 100644
--- a/js/src/tests/ecma_3/String/regress-392378.js
+++ b/js/src/tests/ecma_3/String/regress-392378.js
@@ -1,4 +1,3 @@
-// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/js/src/tests/ecma_3/extensions/regress-220367-002.js b/js/src/tests/ecma_3/extensions/regress-220367-002.js
index be83c1d92c5..ddf2acff67b 100644
--- a/js/src/tests/ecma_3/extensions/regress-220367-002.js
+++ b/js/src/tests/ecma_3/extensions/regress-220367-002.js
@@ -32,13 +32,13 @@ addThis();
 
 status = inSection(2);
 actual = RegExp.$2;
-expect = '';
+expect = undefined;
 addThis();
 
 re.test('b');
 status = inSection(3);
 actual = RegExp.$1;
-expect = '';
+expect = undefined;
 addThis();
 
 status = inSection(4);
diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 95a1d877196..fbb58f196d9 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -245,7 +245,7 @@ RegExpStatics::makeMatch(JSContext *cx, size_t pairNum, MutableHandleValue out)
     JS_ASSERT(!pendingLazyEvaluation);
 
     if (matches.empty() || pairNum >= matches.pairCount() || matches[pairNum].isUndefined()) {
-        out.setString(cx->runtime()->emptyString);
+        out.setUndefined();
         return true;
     }
 

From 1140f67fe026caf990de0ea955b47974b68d4e25 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 25 Jul 2014 14:34:10 -0700
Subject: [PATCH 018/128] Bug 369778 - Fix two RegExps that expect an unmatched
 capture group expands to the empty string, not to |undefined|.  r=dolske

--HG--
extra : rebase_source : fdb86de8aba51af285f6293ee4bff8fd4b477d6f
---
 toolkit/components/prompts/src/CommonDialog.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
index 20953756b11..0b36ba6ff9a 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -198,10 +198,10 @@ CommonDialog.prototype = {
         // Note that if you change the following code, see the comment of
         // nsTextBoxFrame::UpdateAccessTitle.
         var accessKey = null;
-        if (/ *\(\&([^&])\)(:)?$/.test(aLabel)) {
+        if (/ *\(\&([^&])\)(:?)$/.test(aLabel)) {
             aLabel = RegExp.leftContext + RegExp.$2;
             accessKey = RegExp.$1;
-        } else if (/^(.*[^&])?\&(([^&]).*$)/.test(aLabel)) {
+        } else if (/^([^&]*)\&(([^&]).*$)/.test(aLabel)) {
             aLabel = RegExp.$1 + RegExp.$2;
             accessKey = RegExp.$3;
         }

From 19fbd646e756208b2f5de825b96d45521acc8331 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 25 Jul 2014 16:00:03 -0700
Subject: [PATCH 019/128] Bug 1041247 - Allow font inflation test to pass in
 e10s (r=dbaron)

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

diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 3f2d6719169..e11c12701a4 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -469,7 +469,7 @@ load 737313-2.html
 load 737313-3.html
 load 747688.html
 load 750066.html
-test-pref(font.size.inflation.emPerLine,15) asserts(1-100) load font-inflation-762332.html # bug 762332
+test-pref(font.size.inflation.emPerLine,15) asserts-if(!browserIsRemote,1-100) load font-inflation-762332.html # bug 762332
 load 762902.html
 load 762764-1.html
 load 765409.html

From 89e91bb93ea1ee4f8a23b5ed43fc3bd177635d70 Mon Sep 17 00:00:00 2001
From: Maire Reavy <mreavy@mozilla.com>
Date: Fri, 25 Jul 2014 16:12:57 -0700
Subject: [PATCH 020/128] Bug 1044188: Update message for link clickers using
 browsers without WebRTC support, r=dmose

---
 browser/components/loop/standalone/content/l10n/data.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index a6d57cb337c..f6887e33217 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -14,7 +14,7 @@ start_call=Start the call
 welcome=Welcome to the Loop web client.
 incompatible_browser=Incompatible Browser
 powered_by_webrtc=The audio and video components of Loop are powered by WebRTC.
-use_latest_firefox.innerHTML=To use Loop, please use the latest version of <a href="{{ff_url}}">Firefox</a>.
+use_latest_firefox.innerHTML=Please try this link in a WebRTC-enabled browser, such as <a href="{{ff_url}}">Firefox</a>.
 incompatible_device=Incompatible device
 sorry_device_unsupported=Sorry, Loop does not currently support your device.
 use_firefox_windows_mac_linux=Please open this page using the latest Firefox on Windows, Android, Mac or Linux.
@@ -37,7 +37,7 @@ start_call=Démarrer l'appel
 welcome=Bienvenue sur Loop.
 incompatible_browser=Navigateur non supporté
 powered_by_webrtc=Les fonctionnalités audio et vidéo de Loop utilisent WebRTC.
-use_latest_firefox.innerHTML=Pour utiliser Loop, merci d'utiliser la dernière version de <a href="{{ff_url}}">Firefox</a>.
+use_latest_firefox.innerHTML=Veuillez essayer ce lien dans un navigateur acceptant WebRTC, par exemple <a href="{{ff_url}}">Firefox</a>.
 incompatible_device=Plateforme non supportée
 sorry_device_unsupported=Désolé, Loop ne fonctionne actuellement pas sur votre appareil.
 use_firefox_windows_mac_linux=Merci d'ouvrir cette page avec une version récente de Firefox pour Windows, Android, Mac ou Linux.

From 8018969e32591d0426fc054583d283c05dc5ef4f Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 25 Jul 2014 16:41:24 -0700
Subject: [PATCH 021/128] Bug 1038887 - Add back null check to
 nsErrorService::GetErrorStringBundle. r=froydnj

---
 dom/xml/crashtests/1038887.xhtml   | 1 +
 dom/xml/crashtests/crashtests.list | 1 +
 xpcom/base/nsErrorService.cpp      | 3 +++
 3 files changed, 5 insertions(+)
 create mode 100644 dom/xml/crashtests/1038887.xhtml

diff --git a/dom/xml/crashtests/1038887.xhtml b/dom/xml/crashtests/1038887.xhtml
new file mode 100644
index 00000000000..18b12083a9d
--- /dev/null
+++ b/dom/xml/crashtests/1038887.xhtml
@@ -0,0 +1 @@
+<?xml-stylesheet type="text/xsl" href="http://notexistingurl"?><html xmlns="http://www.w3.org/1999/xhtml"></html>
diff --git a/dom/xml/crashtests/crashtests.list b/dom/xml/crashtests/crashtests.list
index 662ae753e99..f18767d582c 100644
--- a/dom/xml/crashtests/crashtests.list
+++ b/dom/xml/crashtests/crashtests.list
@@ -9,3 +9,4 @@ load 431703-1.xhtml
 load 453278.html
 load 803586.xhtml
 load 994740-1.xhtml
+load 1038887.xhtml
diff --git a/xpcom/base/nsErrorService.cpp b/xpcom/base/nsErrorService.cpp
index fbdad157752..dd4a131f33f 100644
--- a/xpcom/base/nsErrorService.cpp
+++ b/xpcom/base/nsErrorService.cpp
@@ -38,6 +38,9 @@ NS_IMETHODIMP
 nsErrorService::GetErrorStringBundle(int16_t aErrorModule, char** aResult)
 {
   nsCString* bundleURL = mErrorStringBundleURLMap.Get(aErrorModule);
+  if (!bundleURL) {
+    return NS_ERROR_FAILURE;
+  }
   *aResult = ToNewCString(*bundleURL);
   return NS_OK;
 }

From 9d809355a157c87f084f611143b8a245fa1539dd Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 25 Jul 2014 16:41:25 -0700
Subject: [PATCH 022/128] Bug 1038966, part 1 - AllocShmem and AllocUnsafeShmem
 do not need to use nsAutoPtr. r=bent

Also clean up the generated code a bit.
---
 ipc/ipdl/ipdl/lower.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index bf29b3c3b1d..83938da9b61 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -3983,7 +3983,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
 
     def makeShmemIface(self):
         p = self.protocol
-        idvar = ExprVar('aId')
+        idvar = ExprVar('id')
         sizevar = ExprVar('aSize')
         typevar = ExprVar('aType')
         memvar = ExprVar('aMem')
@@ -3991,18 +3991,18 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         rawvar = ExprVar('rawmem')
 
         def allocShmemMethod(name, unsafe):
-            # bool Alloc*Shmem(size_t size, Type type, Shmem* outmem):
+            # bool Alloc*Shmem(size_t aSize, Type aType, Shmem* aOutMem):
             #   id_t id;
-            #   nsAutoPtr<SharedMemory> mem(CreateSharedMemory(&id));
-            #   if (!mem)
+            #   SharedMemory* rawmem(CreateSharedMemory(aSize, aType, false, &id));
+            #   if (!rawmem)
             #     return false;
-            #   *outmem = Shmem(mem, id)
+            #   *aOutMem = Shmem(rawmem, id)
             #   return true;
             method = MethodDefn(MethodDecl(
                 name,
                 params=[ Decl(Type.SIZE, sizevar.name),
                          Decl(_shmemTypeType(), typevar.name),
-                         Decl(_shmemType(ptr=1), memvar.name) ],
+                         Decl(_shmemType(ptr=1), outmemvar.name) ],
                 ret=Type.BOOL))
 
             ifallocfails = StmtIf(ExprNot(rawvar))
@@ -4014,7 +4014,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 unsafe = ExprLiteral.FALSE
             method.addstmts([
                 StmtDecl(Decl(_shmemIdType(), idvar.name)),
-                StmtDecl(Decl(_autoptr(_rawShmemType()), rawvar.name),
+                StmtDecl(Decl(_rawShmemType(ptr=1), rawvar.name),
                          initargs=[ ExprCall(p.createSharedMemory(),
                                          args=[ sizevar,
                                                 typevar,
@@ -4023,7 +4023,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 ifallocfails,
                 Whitespace.NL,
                 StmtExpr(ExprAssn(
-                    ExprDeref(memvar), _shmemCtor(_autoptrForget(rawvar), idvar))),
+                    ExprDeref(outmemvar), _shmemCtor(rawvar, idvar))),
                 StmtReturn.TRUE
             ])
             return method
@@ -4034,16 +4034,16 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         # bool AllocUnsafeShmem(size_t size, Type type, Shmem* outmem):
         allocUnsafeShmem = allocShmemMethod('AllocUnsafeShmem', True)
 
-        # bool AdoptShmem(const Shmem& mem, Shmem* outmem):
-        #   SharedMemory* raw = mem.mSegment;
-        #   if (!raw || IsTrackingSharedMemory(raw)) {
+        # bool AdoptShmem(Shmem& aMem, Shmem* aOutmem):
+        #   SharedMemory* rawmem = aMem.Segment();
+        #   if (!rawmem || IsTrackingSharedMemory(rawmem)) {
         #     NS_WARNING("bad Shmem"); // or NS_RUNTIMEABORT on child side
         #     return false;
         #   }
         #   id_t id
-        #   if (!AdoptSharedMemory(raw, &id))
+        #   if (!AdoptSharedMemory(rawmem, &id))
         #     return false
-        #   *outmem = Shmem(raw, id);
+        #   *aOutmem = Shmem(rawmem, id);
         #   return true;
         adoptShmem = MethodDefn(MethodDecl(
             'AdoptShmem',

From 80b2b77705577c39bc1aea69213f64f7fd97d3ad Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 25 Jul 2014 16:41:25 -0700
Subject: [PATCH 023/128] Bug 1038966, part 2 - Rename autoptr methods to
 refptr in lower.py. r=bent

Rename these before changing the definition to reduce the noise in the next patch.
---
 ipc/ipdl/ipdl/lower.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 83938da9b61..7f76a3d3ecc 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -319,13 +319,13 @@ def _runtimeAbort(msg):
     return StmtExpr(
         ExprCall(ExprVar('NS_RUNTIMEABORT'), args=[ msg ]))
 
-def _autoptr(T):
+def _refptr(T):
     return Type('nsAutoPtr', T=T)
 
-def _autoptrGet(expr):
+def _refptrGet(expr):
     return ExprCall(ExprSelect(expr, '.', 'get'))
 
-def _autoptrForget(expr):
+def _refptrForget(expr):
     return ExprCall(ExprSelect(expr, '.', 'forget'))
 
 def _cxxArrayType(basetype, const=0, ref=0):
@@ -3640,7 +3640,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             #   mShmemMap.Add(seg, id);
             #   return shmem.forget();
             createshmem.addstmt(StmtDecl(
-                Decl(_autoptr(_rawShmemType()), rawvar.name),
+                Decl(_refptr(_rawShmemType()), rawvar.name),
                 initargs=[ _shmemAlloc(sizevar, typevar, unsafevar) ]))
             failif = StmtIf(ExprNot(rawvar))
             failif.addifstmt(StmtReturn(ExprLiteral.NULL))
@@ -3651,7 +3651,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 StmtDecl(
                     Decl(_shmemType(), shmemvar.name),
                     initargs=[ _shmemBackstagePass(),
-                               _autoptrGet(rawvar),
+                               _refptrGet(rawvar),
                                p.nextShmemIdExpr(self.side) ]),
                 StmtDecl(Decl(Type('Message', ptr=1), descriptorvar.name),
                          init=_shmemShareTo(shmemvar,
@@ -3672,7 +3672,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 StmtExpr(ExprCall(
                     ExprSelect(p.shmemMapVar(), '.', 'AddWithID'),
                     args=[ rawvar, ExprDeref(idvar) ])),
-                StmtReturn(_autoptrForget(rawvar))
+                StmtReturn(_refptrForget(rawvar))
             ])
 
             # SharedMemory* AdoptSharedMemory(SharedMemory*, id_t*):
@@ -4130,7 +4130,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         idvar = ExprVar('id')
         case.addstmts([
             StmtDecl(Decl(_shmemIdType(), idvar.name)),
-            StmtDecl(Decl(_autoptr(_rawShmemType()), rawvar.name),
+            StmtDecl(Decl(_refptr(_rawShmemType()), rawvar.name),
                      initargs=[ _shmemOpenExisting(self.msgvar,
                                                    ExprAddrOf(idvar)) ])
         ])
@@ -4141,7 +4141,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             failif,
             StmtExpr(ExprCall(
                 ExprSelect(p.shmemMapVar(), '.', 'AddWithID'),
-                args=[ _autoptrForget(rawvar), idvar ])),
+                args=[ _refptrForget(rawvar), idvar ])),
             Whitespace.NL,
             StmtReturn(_Result.Processed)
         ])

From 03b34d364eb48bafde657c8a22c4376713a72074 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 25 Jul 2014 16:41:25 -0700
Subject: [PATCH 024/128] Bug 1038966, part 3 - Shmem should use refcounted
 pointer classes when creating SharedMemory. r=bent

---
 ipc/glue/Shmem.cpp     | 37 ++++++++++++++------------------
 ipc/glue/Shmem.h       |  5 +++--
 ipc/ipdl/ipdl/lower.py | 48 ++++++++++++++++++++++++------------------
 3 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/ipc/glue/Shmem.cpp b/ipc/glue/Shmem.cpp
index c171d34ccb8..09731e366c4 100644
--- a/ipc/glue/Shmem.cpp
+++ b/ipc/glue/Shmem.cpp
@@ -11,7 +11,6 @@
 #include "SharedMemoryBasic.h"
 #include "SharedMemorySysV.h"
 
-#include "nsAutoPtr.h"
 #include "mozilla/unused.h"
 
 
@@ -111,10 +110,10 @@ public:
 
 
 #ifdef MOZ_HAVE_SHAREDMEMORYSYSV
-static Shmem::SharedMemory*
+static already_AddRefed<Shmem::SharedMemory>
 CreateSegment(size_t aNBytes, SharedMemorySysV::Handle aHandle)
 {
-  nsAutoPtr<SharedMemory> segment;
+  nsRefPtr<SharedMemory> segment;
 
   if (SharedMemorySysV::IsHandleValid(aHandle)) {
     segment = new SharedMemorySysV(aHandle);
@@ -128,15 +127,14 @@ CreateSegment(size_t aNBytes, SharedMemorySysV::Handle aHandle)
   if (!segment->Map(aNBytes))
     return nullptr;
 
-  segment->AddRef();
   return segment.forget();
 }
 #endif
 
-static Shmem::SharedMemory*
+static already_AddRefed<Shmem::SharedMemory>
 CreateSegment(size_t aNBytes, SharedMemoryBasic::Handle aHandle)
 {
-  nsAutoPtr<SharedMemory> segment;
+  nsRefPtr<SharedMemory> segment;
 
   if (SharedMemoryBasic::IsHandleValid(aHandle)) {
     segment = new SharedMemoryBasic(aHandle);
@@ -150,7 +148,6 @@ CreateSegment(size_t aNBytes, SharedMemoryBasic::Handle aHandle)
   if (!segment->Map(aNBytes))
     return nullptr;
 
-  segment->AddRef();
   return segment.forget();
 }
 
@@ -349,7 +346,7 @@ Shmem::RevokeRights(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead)
 }
 
 // static
-Shmem::SharedMemory*
+already_AddRefed<Shmem::SharedMemory>
 Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
              size_t aNBytes,
              SharedMemoryType aType,
@@ -360,7 +357,7 @@ Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
   NS_ABORT_IF_FALSE(!aProtect || !aUnsafe, "protect => !unsafe");
 
   size_t pageSize = SharedMemory::SystemPageSize();
-  SharedMemory* segment = nullptr;
+  nsRefPtr<SharedMemory> segment;
   // |2*pageSize| is for the front and back sentinel
   size_t segmentSize = SharedMemory::PageAlignedSize(aNBytes + 2*pageSize);
 
@@ -398,11 +395,11 @@ Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
   if (aProtect)
     Protect(segment);
 
-  return segment;
+  return segment.forget();
 }
 
 // static
-Shmem::SharedMemory*
+already_AddRefed<Shmem::SharedMemory>
 Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
                     const IPC::Message& aDescriptor,
                     id_t* aId,
@@ -419,7 +416,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
   if (!ShmemCreated::ReadInfo(&aDescriptor, &iter, aId, &size, &type))
     return nullptr;
 
-  SharedMemory* segment = nullptr;
+  nsRefPtr<SharedMemory> segment;
   size_t pageSize = SharedMemory::SystemPageSize();
   // |2*pageSize| is for the front and back sentinels
   size_t segmentSize = SharedMemory::PageAlignedSize(size + 2*pageSize);
@@ -460,7 +457,6 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
 
   if (size != header->mSize) {
     NS_ERROR("Wrong size for this Shmem!");
-    delete segment;
     return nullptr;
   }
 
@@ -469,7 +465,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
   if (!header->mUnsafe && aProtect)
     Protect(segment);
 
-  return segment;
+  return segment.forget();
 }
 
 // static
@@ -499,14 +495,14 @@ Shmem::Dealloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
 #else  // !defined(DEBUG)
 
 // static
-Shmem::SharedMemory*
+already_AddRefed<Shmem::SharedMemory>
 Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
              size_t aNBytes,
              SharedMemoryType aType,
              bool /*unused*/,
              bool /*unused*/)
 {
-  SharedMemory *segment = nullptr;
+  nsRefPtr<SharedMemory> segment;
 
   if (aType == SharedMemory::TYPE_BASIC)
     segment = CreateSegment(SharedMemory::PageAlignedSize(aNBytes + sizeof(uint32_t)),
@@ -525,11 +521,11 @@ Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
 
   *PtrToSize(segment) = static_cast<uint32_t>(aNBytes);
 
-  return segment;
+  return segment.forget();
 }
 
 // static
-Shmem::SharedMemory*
+already_AddRefed<Shmem::SharedMemory>
 Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
                     const IPC::Message& aDescriptor,
                     id_t* aId,
@@ -545,7 +541,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
   if (!ShmemCreated::ReadInfo(&aDescriptor, &iter, aId, &size, &type))
     return nullptr;
 
-  SharedMemory* segment = nullptr;
+  nsRefPtr<SharedMemory> segment;
   size_t segmentSize = SharedMemory::PageAlignedSize(size + sizeof(uint32_t));
 
   if (SharedMemory::TYPE_BASIC == type) {
@@ -580,11 +576,10 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
 
   // this is the only validity check done in non-DEBUG builds
   if (size != static_cast<size_t>(*PtrToSize(segment))) {
-    delete segment;
     return nullptr;
   }
 
-  return segment;
+  return segment.forget();
 }
 
 // static
diff --git a/ipc/glue/Shmem.h b/ipc/glue/Shmem.h
index d354907cc05..415c4ef33c9 100644
--- a/ipc/glue/Shmem.h
+++ b/ipc/glue/Shmem.h
@@ -15,6 +15,7 @@
 
 #include "nscore.h"
 #include "nsDebug.h"
+#include "nsAutoPtr.h"
 
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/ipc/SharedMemory.h"
@@ -201,7 +202,7 @@ public:
     mId = 0;
   }
 
-  static SharedMemory*
+  static already_AddRefed<Shmem::SharedMemory>
   Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
         size_t aNBytes,
         SharedMemoryType aType,
@@ -230,7 +231,7 @@ public:
   // descriptor shared to us by the process that created the
   // underlying OS shmem resource.  The contents of the descriptor
   // depend on the type of SharedMemory that was passed to us.
-  static SharedMemory*
+  static already_AddRefed<SharedMemory>
   OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
                const IPC::Message& aDescriptor,
                id_t* aId,
diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 7f76a3d3ecc..3ac5ade5ea4 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -320,7 +320,7 @@ def _runtimeAbort(msg):
         ExprCall(ExprVar('NS_RUNTIMEABORT'), args=[ msg ]))
 
 def _refptr(T):
-    return Type('nsAutoPtr', T=T)
+    return Type('nsRefPtr', T=T)
 
 def _refptrGet(expr):
     return ExprCall(ExprSelect(expr, '.', 'get'))
@@ -328,6 +328,9 @@ def _refptrGet(expr):
 def _refptrForget(expr):
     return ExprCall(ExprSelect(expr, '.', 'forget'))
 
+def _refptrTake(expr):
+    return ExprCall(ExprSelect(expr, '.', 'take'))
+
 def _cxxArrayType(basetype, const=0, ref=0):
     return Type('InfallibleTArray', T=basetype, const=const, ref=ref)
 
@@ -3606,7 +3609,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
 
         if p.decl.type.isToplevel():
             tmpvar = ExprVar('tmp')
-            
+
             register.addstmts([
                 StmtDecl(Decl(_actorIdType(), tmpvar.name),
                          p.nextActorIdExpr(self.side)),
@@ -3628,17 +3631,19 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 ExprCall(ExprSelect(p.actorMapVar(), '.', 'Remove'),
                          [ idvar ])))
 
-            # SharedMemory* CreateSharedMemory(size, type, bool, id_t*):
-            #   nsAutoPtr<SharedMemory> seg(Shmem::Alloc(size, type, unsafe));
-            #   if (!shmem)
-            #     return null;
-            #   Shmem s(seg, [nextshmemid]);
-            #   Message descriptor;
-            #   if (!s->ShareTo(subprocess, mId, descriptor) ||
-            #       !Send(descriptor))
-            #     return null;
-            #   mShmemMap.Add(seg, id);
-            #   return shmem.forget();
+            # SharedMemory* CreateSharedMemory(size_t aSize, Type aType, bool aUnsafe, id_t* aId):
+            #   nsRefPtr<SharedMemory> segment(Shmem::Alloc(aSize, aType, aUnsafe));
+            #   if (!segment)
+            #     return nullptr;
+            #   Shmem shmem(segment.get(), [nextshmemid]);
+            #   Message descriptor = shmem.ShareTo(subprocess, mId, descriptor);
+            #   if (!descriptor)
+            #     return nullptr;
+            #   mChannel.Send(descriptor);
+            #   *aId = shmem.Id();
+            #   SharedMemory* rawSegment = segment.get();
+            #   mShmemMap.Add(segment.forget().take(), *aId);
+            #   return rawSegment;
             createshmem.addstmt(StmtDecl(
                 Decl(_refptr(_rawShmemType()), rawvar.name),
                 initargs=[ _shmemAlloc(sizevar, typevar, unsafevar) ]))
@@ -3667,12 +3672,15 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
                 args=[ descriptorvar ])))
             createshmem.addstmt(failif)
 
+            rawsegmentvar = ExprVar('rawSegment')
             createshmem.addstmts([
                 StmtExpr(ExprAssn(ExprDeref(idvar), _shmemId(shmemvar))),
+                StmtDecl(Decl(_rawShmemType(ptr=1), rawsegmentvar.name),
+                         init=_refptrGet(rawvar)),
                 StmtExpr(ExprCall(
                     ExprSelect(p.shmemMapVar(), '.', 'AddWithID'),
-                    args=[ rawvar, ExprDeref(idvar) ])),
-                StmtReturn(_refptrForget(rawvar))
+                    args=[ _refptrTake(_refptrForget(rawvar)), ExprDeref(idvar) ])),
+                StmtReturn(rawsegmentvar)
             ])
 
             # SharedMemory* AdoptSharedMemory(SharedMemory*, id_t*):
@@ -4123,8 +4131,8 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
     def genShmemCreatedHandler(self):
         p = self.protocol
         assert p.decl.type.isToplevel()
-        
-        case = StmtBlock()                                          
+
+        case = StmtBlock()
 
         rawvar = ExprVar('rawmem')
         idvar = ExprVar('id')
@@ -4141,7 +4149,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             failif,
             StmtExpr(ExprCall(
                 ExprSelect(p.shmemMapVar(), '.', 'AddWithID'),
-                args=[ _refptrForget(rawvar), idvar ])),
+                args=[ _refptrTake(_refptrForget(rawvar)), idvar ])),
             Whitespace.NL,
             StmtReturn(_Result.Processed)
         ])
@@ -4151,8 +4159,8 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
     def genShmemDestroyedHandler(self):
         p = self.protocol
         assert p.decl.type.isToplevel()
-        
-        case = StmtBlock()                                          
+
+        case = StmtBlock()
 
         rawvar = ExprVar('rawmem')
         idvar = ExprVar('id')

From 60d6e8031f61f7922860c927ddd6d2900adecf3d Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Thu, 24 Jul 2014 15:04:26 -0400
Subject: [PATCH 025/128] Bug 1043554 - remove redundant social/
 {Makefile,moz.build}; r=mshal

XPCSHELL_RESOURCES seems to be leftover from pre-manifest days, and the
manifest already has everything we need.
---
 browser/modules/test/unit/moz.build          |  2 --
 browser/modules/test/unit/social/Makefile.in | 11 -----------
 browser/modules/test/unit/social/moz.build   |  6 ------
 3 files changed, 19 deletions(-)
 delete mode 100644 browser/modules/test/unit/social/Makefile.in
 delete mode 100644 browser/modules/test/unit/social/moz.build

diff --git a/browser/modules/test/unit/moz.build b/browser/modules/test/unit/moz.build
index fb6e74855b3..c23ff1c5314 100644
--- a/browser/modules/test/unit/moz.build
+++ b/browser/modules/test/unit/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['social']
-
 XPCSHELL_TESTS_MANIFESTS += ['social/xpcshell.ini']
diff --git a/browser/modules/test/unit/social/Makefile.in b/browser/modules/test/unit/social/Makefile.in
deleted file mode 100644
index a060fd25e47..00000000000
--- a/browser/modules/test/unit/social/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_RESOURCES = \
-  xpcshell.ini \
-  head.js \
-  blocklist.xml \
-  test_social.js \
-  test_socialDisabledStartup.js \
-  $(NULL)
diff --git a/browser/modules/test/unit/social/moz.build b/browser/modules/test/unit/social/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/browser/modules/test/unit/social/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-

From 9eddfa23e3d0a6b7a3f02a3bed68bad8890a1137 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 09:38:15 -0400
Subject: [PATCH 026/128] Bug 1043957 - remove some libs:: rules from
 devtools's Makefile.ins; r=mshal

---
 browser/devtools/Makefile.in                |  8 --------
 browser/devtools/app-manager/Makefile.in    |  9 ---------
 browser/devtools/app-manager/moz.build      | 12 ++++++++++++
 browser/devtools/markupview/Makefile.in     |  7 -------
 browser/devtools/markupview/moz.build       |  7 +++++++
 browser/devtools/moz.build                  |  6 ++++++
 browser/devtools/profiler/Makefile.in       |  8 --------
 browser/devtools/profiler/moz.build         | 11 +++++++++++
 browser/devtools/styleinspector/Makefile.in |  9 ---------
 browser/devtools/styleinspector/moz.build   | 10 ++++++++++
 browser/devtools/webconsole/Makefile.in     |  8 --------
 browser/devtools/webconsole/moz.build       | 11 +++++++++++
 browser/devtools/webide/Makefile.in         |  5 -----
 browser/devtools/webide/moz.build           |  9 +++++++++
 toolkit/devtools/webconsole/Makefile.in     |  8 --------
 toolkit/devtools/webconsole/moz.build       |  9 +++++++++
 16 files changed, 75 insertions(+), 62 deletions(-)
 delete mode 100644 browser/devtools/Makefile.in
 delete mode 100644 browser/devtools/app-manager/Makefile.in
 delete mode 100644 browser/devtools/markupview/Makefile.in
 delete mode 100644 browser/devtools/profiler/Makefile.in
 delete mode 100644 browser/devtools/styleinspector/Makefile.in
 delete mode 100644 browser/devtools/webconsole/Makefile.in
 delete mode 100644 toolkit/devtools/webconsole/Makefile.in

diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in
deleted file mode 100644
index 2364f7a8733..00000000000
--- a/browser/devtools/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/main.js $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/app-manager/Makefile.in b/browser/devtools/app-manager/Makefile.in
deleted file mode 100644
index ba273b843c6..00000000000
--- a/browser/devtools/app-manager/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/app-manager
diff --git a/browser/devtools/app-manager/moz.build b/browser/devtools/app-manager/moz.build
index c65e2eeca48..4dee9226e7b 100644
--- a/browser/devtools/app-manager/moz.build
+++ b/browser/devtools/app-manager/moz.build
@@ -6,3 +6,15 @@
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+JS_MODULES_PATH = 'modules/devtools/app-manager'
+
+EXTRA_JS_MODULES += [
+    'app-projects.js',
+    'app-validator.js',
+    'builtin-adb-store.js',
+    'connection-store.js',
+    'device-store.js',
+    'simulators-store.js',
+    'webapps-store.js',
+]
diff --git a/browser/devtools/markupview/Makefile.in b/browser/devtools/markupview/Makefile.in
deleted file mode 100644
index 09327f5fb54..00000000000
--- a/browser/devtools/markupview/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/markupview
diff --git a/browser/devtools/markupview/moz.build b/browser/devtools/markupview/moz.build
index 1f094a9573d..d9370477055 100644
--- a/browser/devtools/markupview/moz.build
+++ b/browser/devtools/markupview/moz.build
@@ -5,3 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JS_MODULES_PATH = 'modules/devtools/markupview'
+
+EXTRA_JS_MODULES += [
+    'html-editor.js',
+    'markup-view.js',
+]
diff --git a/browser/devtools/moz.build b/browser/devtools/moz.build
index b07ea014a21..4fa5f2548f1 100644
--- a/browser/devtools/moz.build
+++ b/browser/devtools/moz.build
@@ -37,3 +37,9 @@ EXTRA_COMPONENTS += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_MODULES_PATH = 'modules/devtools'
+
+EXTRA_JS_MODULES += [
+    'main.js',
+]
diff --git a/browser/devtools/profiler/Makefile.in b/browser/devtools/profiler/Makefile.in
deleted file mode 100644
index 50512908d28..00000000000
--- a/browser/devtools/profiler/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/profiler
diff --git a/browser/devtools/profiler/moz.build b/browser/devtools/profiler/moz.build
index 1f094a9573d..057cc9692b0 100644
--- a/browser/devtools/profiler/moz.build
+++ b/browser/devtools/profiler/moz.build
@@ -5,3 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JS_MODULES_PATH = 'modules/devtools/profiler'
+
+EXTRA_JS_MODULES += [
+    'cleopatra.js',
+    'commands.js',
+    'consts.js',
+    'controller.js',
+    'panel.js',
+    'sidebar.js',
+]
diff --git a/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in
deleted file mode 100644
index 8a262855b73..00000000000
--- a/browser/devtools/styleinspector/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/styleinspector
diff --git a/browser/devtools/styleinspector/moz.build b/browser/devtools/styleinspector/moz.build
index a4d125b80f9..fb06feba37d 100644
--- a/browser/devtools/styleinspector/moz.build
+++ b/browser/devtools/styleinspector/moz.build
@@ -6,3 +6,13 @@
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+JS_MODULES_PATH = 'modules/devtools/styleinspector'
+
+EXTRA_JS_MODULES += [
+    'computed-view.js',
+    'css-parsing-utils.js',
+    'rule-view.js',
+    'style-inspector-overlays.js',
+    'style-inspector.js',
+]
diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in
deleted file mode 100644
index 35db6f7792e..00000000000
--- a/browser/devtools/webconsole/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/webconsole
diff --git a/browser/devtools/webconsole/moz.build b/browser/devtools/webconsole/moz.build
index 1f094a9573d..802ff7e11b7 100644
--- a/browser/devtools/webconsole/moz.build
+++ b/browser/devtools/webconsole/moz.build
@@ -5,3 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JS_MODULES_PATH = 'modules/devtools/webconsole'
+
+EXTRA_JS_MODULES += [
+    'console-commands.js',
+    'console-output.js',
+    'hudservice.js',
+    'network-panel.js',
+    'panel.js',
+    'webconsole.js',
+]
diff --git a/browser/devtools/webide/Makefile.in b/browser/devtools/webide/Makefile.in
index fe2dd009627..099c204a932 100644
--- a/browser/devtools/webide/Makefile.in
+++ b/browser/devtools/webide/Makefile.in
@@ -3,8 +3,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PREF_JS_EXPORTS = $(srcdir)/webide-prefs.js
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/modules/*.js $(FINAL_TARGET)/modules/devtools/webide
diff --git a/browser/devtools/webide/moz.build b/browser/devtools/webide/moz.build
index 1e987d17edd..5a089c0614e 100644
--- a/browser/devtools/webide/moz.build
+++ b/browser/devtools/webide/moz.build
@@ -11,3 +11,12 @@ PARALLEL_DIRS += [
 ]
 
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+JS_MODULES_PATH = 'modules/devtools/webide'
+
+EXTRA_JS_MODULES += [
+    'modules/addons.js',
+    'modules/app-manager.js',
+    'modules/remote-resources.js',
+    'modules/runtimes.js'
+]
diff --git a/toolkit/devtools/webconsole/Makefile.in b/toolkit/devtools/webconsole/Makefile.in
deleted file mode 100644
index 45ffcf18666..00000000000
--- a/toolkit/devtools/webconsole/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(INSTALL) $(IFLAGS1) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/toolkit/webconsole
diff --git a/toolkit/devtools/webconsole/moz.build b/toolkit/devtools/webconsole/moz.build
index 7f0c6b2fbc2..6675d2471b5 100644
--- a/toolkit/devtools/webconsole/moz.build
+++ b/toolkit/devtools/webconsole/moz.build
@@ -7,3 +7,12 @@
 if CONFIG['OS_TARGET'] != 'Android':
     MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
     XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+JS_MODULES_PATH = 'modules/devtools/toolkit/webconsole'
+
+EXTRA_JS_MODULES += [
+    'client.js',
+    'network-helper.js',
+    'network-monitor.js',
+    'utils.js',
+]

From a3ae74b4d0b33b4200d65f79c63b1dea2bc18b3d Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 09:59:11 -0400
Subject: [PATCH 027/128] Bug 1044046 - remove
 toolkit/components/workerloader/Makefile.in; r=mshal

---
 toolkit/components/workerloader/Makefile.in | 10 ----------
 toolkit/components/workerloader/moz.build   |  6 ++++++
 2 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 toolkit/components/workerloader/Makefile.in

diff --git a/toolkit/components/workerloader/Makefile.in b/toolkit/components/workerloader/Makefile.in
deleted file mode 100644
index 1bbcea7946a..00000000000
--- a/toolkit/components/workerloader/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-WORKER_FILES := require.js \
-	$(NULL)
-
-INSTALL_TARGETS += WORKER
-
-WORKER_DEST = $(FINAL_TARGET)/modules/workers
diff --git a/toolkit/components/workerloader/moz.build b/toolkit/components/workerloader/moz.build
index 666f2bf30af..e3a586181b4 100644
--- a/toolkit/components/workerloader/moz.build
+++ b/toolkit/components/workerloader/moz.build
@@ -5,3 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+
+JS_MODULES_PATH = 'modules/workers'
+
+EXTRA_JS_MODULES += [
+    'require.js'
+]

From 762a23e6615697f7675ce228e5545420de820c50 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 11:10:50 -0400
Subject: [PATCH 028/128] Bug 1044047 - add EXTRA_JS_MODULES to
 _MOZBUILD_EXTERNAL_VARIABLES; r=mshal

---
 config/config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config.mk b/config/config.mk
index 2b3f0128b61..3e8edf43ba6 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -41,6 +41,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   CPP_UNIT_TESTS \
   DIRS \
   EXTRA_DSO_LDOPTS \
+  EXTRA_JS_MODULES \
   EXTRA_PP_COMPONENTS \
   EXTRA_PP_JS_MODULES \
   FORCE_SHARED_LIB \

From d34942e333f1dc8e1b3fd54037dd3ca70b915f33 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 11:11:28 -0400
Subject: [PATCH 029/128] Bug 1044041 - remove now-unnecessary rule from
 services/healthreport/Makefile.in; r=gps

---
 services/healthreport/Makefile.in | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/services/healthreport/Makefile.in b/services/healthreport/Makefile.in
index 4726e7b20b6..61b37d764f3 100644
--- a/services/healthreport/Makefile.in
+++ b/services/healthreport/Makefile.in
@@ -8,20 +8,6 @@ modules := \
   providers.jsm \
   $(NULL)
 
-healthreport_depends = \
-  HealthReport.jsm \
-  ../common/async.js \
-  ../common/bagheeraclient.js \
-  ../metrics/Metrics.jsm \
-  ../metrics/providermanager.jsm \
-  ../metrics/dataprovider.jsm \
-  ../metrics/storage.jsm \
-  healthreporter.jsm \
-  profile.jsm \
-  providers.jsm \
-  $(NULL)
-
-
 MAIN_JS_MODULE := HealthReport.jsm
 MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
 MAIN_JS_MODULE_FLAGS := $(extra_pp_flags)
@@ -31,8 +17,3 @@ MODULES := $(modules)
 MODULES_PATH = $(FINAL_TARGET)/modules/services/healthreport
 MODULES_FLAGS := $(extra_pp_flags)
 PP_TARGETS += MODULES
-
-include $(topsrcdir)/config/rules.mk
-
-# Add extra prerequisites until bug 837792 is addressed.
-$(FINAL_TARGET)/modules/HealthReport.jsm: $(healthreport_depends)

From 7e7bf24d383292207b0f773339400443c5a1fca4 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 14:27:44 -0400
Subject: [PATCH 030/128] Bug 1044165 - fix BuildReaderError exception printing
 to cope properly with SyntaxError; r=gps

Some moz.build syntax errors cause the thrown SyntaxError object to not include
an offset field, leading to all sorts of hilarity when we try printing messages
depending on SyntaxError.offset.  Check for this case and simply don't print
the caret if so.
---
 python/mozbuild/mozbuild/frontend/reader.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py
index 0ad7aeaa31b..27be290534e 100644
--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
@@ -566,7 +566,8 @@ class BuildReaderError(Exception):
             s.write('on line %d:\n' % inner.lineno)
             s.write('\n')
             s.write('    %s\n' % inner.text)
-            s.write((' ' * (inner.offset + 4)) + '^\n')
+            if inner.offset:
+                s.write((' ' * (inner.offset + 4)) + '^\n')
             s.write('\n')
             s.write('Fix the syntax error and try again.\n')
             return

From 700438350f0ef848eced5d8aadab0721d3d2132f Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 25 Jul 2014 20:37:02 -0400
Subject: [PATCH 031/128] bug 1041272 - websockets partial last frame stall
 r=jduell

---
 netwerk/protocol/websocket/WebSocketChannel.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index de71e2ce4f4..e5473c6b353 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -3267,6 +3267,7 @@ WebSocketChannel::OnOutputStreamReady(nsIAsyncOutputStream *aStream)
       } else {
         mHdrOut += amtSent;
         mHdrOutToSend -= amtSent;
+        mSocketOut->AsyncWait(this, 0, 0, mSocketThread);
       }
     } else {
       if (amtSent == toSend) {
@@ -3279,6 +3280,7 @@ WebSocketChannel::OnOutputStreamReady(nsIAsyncOutputStream *aStream)
         PrimeNewOutgoingMessage();
       } else {
         mCurrentOutSent += amtSent;
+        mSocketOut->AsyncWait(this, 0, 0, mSocketThread);
       }
     }
   }

From 5f1a51f87a979d58f70bcd10b9b7599198866c43 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Fri, 18 Jul 2014 16:33:34 -0400
Subject: [PATCH 032/128] bug 462159 - Use install manifests to track header
 files from dist/include back to srcdir in symbolstore.py. r=gps

---
 Makefile.in                                   |   1 +
 python/mozbuild/mozpack/manifests.py          |   2 +-
 .../mozbuild/mozpack/test/test_manifests.py   |   7 +
 toolkit/crashreporter/tools/symbolstore.py    |  72 ++++++++--
 .../crashreporter/tools/unit-symbolstore.py   | 126 +++++++++++++++++-
 5 files changed, 195 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 19429320a5b..a2c5d141b1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -200,6 +200,7 @@ MAKE_SYM_STORE_ARGS := -c --vcs-info
 DUMP_SYMS_BIN ?= $(DIST)/host/bin/dump_syms
 MAKE_SYM_STORE_PATH := $(DIST)/bin
 endif
+MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist_include,$(DIST)/include
 
 SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
diff --git a/python/mozbuild/mozpack/manifests.py b/python/mozbuild/mozpack/manifests.py
index 521bd47e10e..8501fa73f4f 100644
--- a/python/mozbuild/mozpack/manifests.py
+++ b/python/mozbuild/mozpack/manifests.py
@@ -115,7 +115,7 @@ class InstallManifest(object):
     def _load_from_fileobj(self, fileobj):
         version = fileobj.readline().rstrip()
         if version not in ('1', '2', '3', '4'):
-            raise UnreadableInstallManifest('Unknown manifest version: ' %
+            raise UnreadableInstallManifest('Unknown manifest version: %s' %
                 version)
 
         for line in fileobj:
diff --git a/python/mozbuild/mozpack/test/test_manifests.py b/python/mozbuild/mozpack/test/test_manifests.py
index 9394bb670d0..66154a498c7 100644
--- a/python/mozbuild/mozpack/test/test_manifests.py
+++ b/python/mozbuild/mozpack/test/test_manifests.py
@@ -14,6 +14,7 @@ from mozpack.copier import (
 )
 from mozpack.manifests import (
     InstallManifest,
+    UnreadableInstallManifest,
 )
 from mozpack.test.test_files import TestWithTmpDir
 
@@ -23,6 +24,12 @@ class TestInstallManifest(TestWithTmpDir):
         m = InstallManifest()
         self.assertEqual(len(m), 0)
 
+    def test_malformed(self):
+        f = self.tmppath('manifest')
+        open(f, 'wb').write('junk\n')
+        with self.assertRaises(UnreadableInstallManifest):
+            m = InstallManifest(f)
+
     def test_adds(self):
         m = InstallManifest()
         m.add_symlink('s_source', 's_dest')
diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py
index 5e059e6c585..4b782792579 100755
--- a/toolkit/crashreporter/tools/symbolstore.py
+++ b/toolkit/crashreporter/tools/symbolstore.py
@@ -20,6 +20,7 @@
 #     -s <srcdir>  : Use <srcdir> as the top source directory to
 #                    generate relative filenames.
 
+import errno
 import sys
 import platform
 import os
@@ -34,6 +35,12 @@ import collections
 from optparse import OptionParser
 from xml.dom.minidom import parse
 
+from mozpack.copier import FileRegistry
+from mozpack.manifests import (
+    InstallManifest,
+    UnreadableInstallManifest,
+)
+
 # Utility classes
 
 class VCSFileInfo:
@@ -278,6 +285,39 @@ def GetVCSFilename(file, srcdirs):
     # we want forward slashes on win32 paths
     return (file.replace("\\", "/"), root)
 
+def validate_install_manifests(install_manifest_args):
+    args = []
+    for arg in install_manifest_args:
+        bits = arg.split(',')
+        if len(bits) != 2:
+            raise ValueError('Invalid format for --install-manifest: '
+                             'specify manifest,target_dir')
+        manifest_file, destination = map(os.path.abspath, bits)
+        if not os.path.isfile(manifest_file):
+            raise IOError(errno.ENOENT, 'Manifest file not found',
+                          manifest_file)
+        if not os.path.isdir(destination):
+            raise IOError(errno.ENOENT, 'Install directory not found',
+                          destination)
+        try:
+            manifest = InstallManifest(manifest_file)
+        except UnreadableInstallManifest:
+            raise IOError(errno.EINVAL, 'Error parsing manifest file',
+                          manifest_file)
+        args.append((manifest, destination))
+    return args
+
+def make_file_mapping(install_manifests):
+    file_mapping = {}
+    for manifest, destination in install_manifests:
+        destination = os.path.abspath(destination)
+        reg = FileRegistry()
+        manifest.populate_registry(reg)
+        for dst, src in reg:
+            if hasattr(src, 'path'):
+                file_mapping[os.path.join(destination, dst)] = src.path
+    return file_mapping
+
 def GetPlatformSpecificDumper(**kwargs):
     """This function simply returns a instance of a subclass of Dumper
     that is appropriate for the current platform."""
@@ -343,7 +383,8 @@ class Dumper:
                  vcsinfo=False,
                  srcsrv=False,
                  exclude=[],
-                 repo_manifest=None):
+                 repo_manifest=None,
+                 file_mapping=None):
         # popen likes absolute paths, at least on windows
         self.dump_syms = os.path.abspath(dump_syms)
         self.symbol_path = symbol_path
@@ -359,6 +400,7 @@ class Dumper:
         self.exclude = exclude[:]
         if repo_manifest:
             self.parse_repo_manifest(repo_manifest)
+        self.file_mapping = file_mapping or {}
 
         # book-keeping to keep track of our jobs and the cleanup work per file tuple
         self.files_record = {}
@@ -593,13 +635,9 @@ class Dumper:
                         if line.startswith("FILE"):
                             # FILE index filename
                             (x, index, filename) = line.rstrip().split(None, 2)
-                            if sys.platform == "sunos5":
-                                for srcdir in self.srcdirs:
-                                    start = filename.find(self.srcdir)
-                                    if start != -1:
-                                        filename = filename[start:]
-                                        break
-                            filename = self.FixFilenameCase(filename)
+                            filename = os.path.normpath(self.FixFilenameCase(filename))
+                            if filename in self.file_mapping:
+                                filename = self.file_mapping[filename]
                             sourcepath = filename
                             if self.vcsinfo:
                                 (filename, rootname) = GetVCSFilename(filename, self.srcdirs)
@@ -607,7 +645,7 @@ class Dumper:
                                 if vcs_root is None:
                                   if rootname:
                                      vcs_root = rootname
-                            # gather up files with hg for indexing   
+                            # gather up files with hg for indexing
                             if filename.startswith("hg"):
                                 (ver, checkout, source_file, revision) = filename.split(":", 3)
                                 sourceFileStream += sourcepath + "*" + source_file + '*' + revision + "\r\n"
@@ -881,6 +919,13 @@ def main():
                       action="store", dest="repo_manifest",
                       help="""Get source information from this XML manifest
 produced by the `repo manifest -r` command.
+""")
+    parser.add_option("--install-manifest",
+                      action="append", dest="install_manifests",
+                      default=[],
+                      help="""Use this install manifest to map filenames back
+to canonical locations in the source repository. Specify
+<install manifest filename>,<install destination> as a comma-separated pair.
 """)
     (options, args) = parser.parse_args()
 
@@ -895,6 +940,12 @@ produced by the `repo manifest -r` command.
         parser.error("not enough arguments")
         exit(1)
 
+    try:
+        manifests = validate_install_manifests(options.install_manifests)
+    except (IOError, ValueError) as e:
+        parser.error(str(e))
+        exit(1)
+    file_mapping = make_file_mapping(manifests)
     dumper = GetPlatformSpecificDumper(dump_syms=args[0],
                                        symbol_path=args[1],
                                        copy_debug=options.copy_debug,
@@ -903,7 +954,8 @@ produced by the `repo manifest -r` command.
                                        vcsinfo=options.vcsinfo,
                                        srcsrv=options.srcsrv,
                                        exclude=options.exclude,
-                                       repo_manifest=options.repo_manifest)
+                                       repo_manifest=options.repo_manifest,
+                                       file_mapping=file_mapping)
     for arg in args[2:]:
         dumper.Process(arg)
     dumper.Finish()
diff --git a/toolkit/crashreporter/tools/unit-symbolstore.py b/toolkit/crashreporter/tools/unit-symbolstore.py
index 4c8c252353d..1d9f276d92a 100644
--- a/toolkit/crashreporter/tools/unit-symbolstore.py
+++ b/toolkit/crashreporter/tools/unit-symbolstore.py
@@ -8,6 +8,8 @@ import mock
 from mock import patch
 import symbolstore
 
+from mozpack.manifests import InstallManifest
+
 # Some simple functions to mock out files that the platform-specific dumpers will accept.
 # dump_syms itself will not be run (we mock that call out), but we can't override
 # the ShouldProcessFile method since we actually want to test that.
@@ -42,8 +44,8 @@ class HelperMixin(object):
     """
     def setUp(self):
         self.test_dir = tempfile.mkdtemp()
-        if not self.test_dir.endswith("/"):
-            self.test_dir += "/"
+        if not self.test_dir.endswith(os.sep):
+            self.test_dir += os.sep
         symbolstore.srcdirRepoInfo = {}
         symbolstore.vcsFileInfoCache = {}
 
@@ -294,6 +296,126 @@ if platform.system() in ("Windows", "Microsoft"):
             self.assertEqual(len(hgserver), 1)
             self.assertEqual(hgserver[0].split("=")[1], "http://example.com/repo")
 
+class TestInstallManifest(HelperMixin, unittest.TestCase):
+    def setUp(self):
+        HelperMixin.setUp(self)
+        self.srcdir = os.path.join(self.test_dir, 'src')
+        os.mkdir(self.srcdir)
+        self.objdir = os.path.join(self.test_dir, 'obj')
+        os.mkdir(self.objdir)
+        self.manifest = InstallManifest()
+        self.canonical_mapping = {}
+        for s in ['src1', 'src2']:
+            srcfile = os.path.join(self.srcdir, s)
+            objfile = os.path.join(self.objdir, s)
+            self.canonical_mapping[objfile] = srcfile
+            self.manifest.add_copy(srcfile, s)
+        self.manifest_file = os.path.join(self.test_dir, 'install-manifest')
+        self.manifest.write(self.manifest_file)
+
+    def testMakeFileMapping(self):
+        '''
+        Test that valid arguments are validated.
+        '''
+        arg = '%s,%s' % (self.manifest_file, self.objdir)
+        ret = symbolstore.validate_install_manifests([arg])
+        self.assertEqual(len(ret), 1)
+        manifest, dest = ret[0]
+        self.assertTrue(isinstance(manifest, InstallManifest))
+        self.assertEqual(dest, self.objdir)
+
+        file_mapping = symbolstore.make_file_mapping(ret)
+        for obj, src in self.canonical_mapping.iteritems():
+            self.assertTrue(obj in file_mapping)
+            self.assertEqual(file_mapping[obj], src)
+
+    def testMissingFiles(self):
+        '''
+        Test that missing manifest files or install directories give errors.
+        '''
+        missing_manifest = os.path.join(self.test_dir, 'missing-manifest')
+        arg = '%s,%s' % (missing_manifest, self.objdir)
+        with self.assertRaises(IOError) as e:
+            symbolstore.validate_install_manifests([arg])
+            self.assertEqual(e.filename, missing_manifest)
+
+        missing_install_dir = os.path.join(self.test_dir, 'missing-dir')
+        arg = '%s,%s' % (self.manifest_file, missing_install_dir)
+        with self.assertRaises(IOError) as e:
+            symbolstore.validate_install_manifests([arg])
+            self.assertEqual(e.filename, missing_install_dir)
+
+    def testBadManifest(self):
+        '''
+        Test that a bad manifest file give errors.
+        '''
+        bad_manifest = os.path.join(self.test_dir, 'bad-manifest')
+        with open(bad_manifest, 'wb') as f:
+            f.write('junk\n')
+        arg = '%s,%s' % (bad_manifest, self.objdir)
+        with self.assertRaises(IOError) as e:
+            symbolstore.validate_install_manifests([arg])
+            self.assertEqual(e.filename, bad_manifest)
+
+    def testBadArgument(self):
+        '''
+        Test that a bad manifest argument gives an error.
+        '''
+        with self.assertRaises(ValueError) as e:
+            symbolstore.validate_install_manifests(['foo'])
+
+class TestFileMapping(HelperMixin, unittest.TestCase):
+    def setUp(self):
+        HelperMixin.setUp(self)
+        self.srcdir = os.path.join(self.test_dir, 'src')
+        os.mkdir(self.srcdir)
+        self.objdir = os.path.join(self.test_dir, 'obj')
+        os.mkdir(self.objdir)
+        self.symboldir = os.path.join(self.test_dir, 'symbols')
+        os.mkdir(self.symboldir)
+
+    @patch("subprocess.Popen")
+    def testFileMapping(self, mock_Popen):
+        files = [('a/b', 'mozilla/b'),
+                 ('c/d', 'foo/d')]
+        if os.sep != '/':
+            files = [[f.replace('/', os.sep) for f in x] for x in files]
+        file_mapping = {}
+        dumped_files = []
+        expected_files = []
+        for s, o in files:
+            srcfile = os.path.join(self.srcdir, s)
+            expected_files.append(srcfile)
+            file_mapping[os.path.join(self.objdir, o)] = srcfile
+            dumped_files.append(os.path.join(self.objdir, 'x', 'y',
+                                             '..', '..', o))
+        # mock the dump_syms output
+        file_id = ("X" * 33, 'somefile')
+        def mk_output(files):
+            return iter(
+                [
+                    'MODULE os x86 %s %s\n' % file_id
+                ] +
+                [
+                    'FILE %d %s\n' % (i,s) for i, s in enumerate(files)
+                ] +
+                [
+                    'PUBLIC xyz 123\n'
+                ]
+            )
+        mock_Popen.return_value.stdout = mk_output(dumped_files)
+
+        d = symbolstore.Dumper('dump_syms', self.symboldir,
+                               file_mapping=file_mapping)
+        f = os.path.join(self.objdir, 'somefile')
+        open(f, 'wb').write('blah')
+        d.Process(f)
+        d.Finish(stop_pool=False)
+        expected_output = ''.join(mk_output(expected_files))
+        symbol_file = os.path.join(self.symboldir,
+                                   file_id[1], file_id[0], file_id[1] + '.sym')
+        self.assertEqual(open(symbol_file, 'r').read(), expected_output)
+
 if __name__ == '__main__':
     # use the multiprocessing.dummy module to use threading wrappers so
     # that our mocking/module-patching works

From fb38365e6ccf81c0fd090d68a1ce4cf95285bc54 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Fri, 25 Jul 2014 07:29:39 -0400
Subject: [PATCH 033/128] bug 820716 - Call OOPInit during startup. r=khuey

---
 toolkit/crashreporter/nsExceptionHandler.cpp | 15 ---------------
 toolkit/xre/nsAppRunner.cpp                  |  6 ++++++
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index bfb36d80309..3ec202324d1 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -2547,21 +2547,6 @@ static bool ChildFilter(void *context) {
 void
 OOPInit()
 {
-  class ProxyToMainThread : public nsRunnable
-  {
-  public:
-    NS_IMETHOD Run() {
-      OOPInit();
-      return NS_OK;
-    }
-  };
-  if (!NS_IsMainThread()) {
-    // This logic needs to run on the main thread
-    nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
-    mozilla::SyncRunnable::DispatchToThread(mainThread, new ProxyToMainThread());
-    return;
-  }
-
   if (OOPInitialized())
     return;
 
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 36e7aea2bc5..d3695f5548d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4080,6 +4080,12 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
   rv = mScopedXPCom->Initialize();
   NS_ENSURE_SUCCESS(rv, 1);
 
+#ifdef MOZ_CRASHREPORTER
+  if (CrashReporter::GetEnabled()) {
+    CrashReporter::OOPInit();
+  }
+#endif
+
   // run!
   rv = XRE_mainRun();
 

From 953c66eeb80c576c97246f4d00ed6ca574dd7b55 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 20:45:39 -0400
Subject: [PATCH 034/128] Touch CLOBBER to fix a raft of build bustage on bug
 1044165's push

---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 96205e06f35..1a23e9a0205 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 946065 - Move content/ to dom/
+Multiple bugs that happened to trigger bug 1042115.

From b3a72bfdc684826503453fb586065652bda7252d Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 25 Jul 2014 17:49:36 -0700
Subject: [PATCH 035/128] Back out the remainder of 3f6ee18b1e9d (bug 1038357),
 most of which was backed out in 8da875b402fe (backout of bug 1020416).

---
 netwerk/cache2/CacheStorageService.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/netwerk/cache2/CacheStorageService.h b/netwerk/cache2/CacheStorageService.h
index 8927d4181a1..0e833b163b2 100644
--- a/netwerk/cache2/CacheStorageService.h
+++ b/netwerk/cache2/CacheStorageService.h
@@ -260,8 +260,6 @@ private:
                            bool aReplace,
                            CacheEntryHandle** aResult);
 
-  void ForcedValidEntriesPrune(TimeStamp &now);
-
   static CacheStorageService* sSelf;
 
   mozilla::Mutex mLock;

From 7754f21be2d43053adf9a0c08e094436f0ce7ba8 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Sat, 26 Jul 2014 11:01:45 +1000
Subject: [PATCH 036/128] Bug 1043461 - Make test_bug657143.html resilient to
 custom properties from the UA style sheet. r=dholbert

---
 layout/style/test/test_bug657143.html | 105 ++++++++++++++++----------
 1 file changed, 66 insertions(+), 39 deletions(-)

diff --git a/layout/style/test/test_bug657143.html b/layout/style/test/test_bug657143.html
index 330c15a15f2..83b7ac682b5 100644
--- a/layout/style/test/test_bug657143.html
+++ b/layout/style/test/test_bug657143.html
@@ -21,53 +21,80 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=657143
 /** Test for Bug 657143 **/
 
 // Checks ordering of CSS properties in nsComputedDOMStyle.cpp
-// by splitting the getComputedStyle() into the three sublists
-// then cloning and sort()ing the lists and comparing with originals 
+// by splitting the getComputedStyle() into four sublists
+// then cloning and sort()ing the lists and comparing with originals.
+
+function isPrefixed(aProp) {
+  return aProp.startsWith("-moz");
+}
+
+function isNotPrefixed(aProp) {
+  return !isPrefixed(aProp);
+}
+
+function isCustom(aProp) {
+  return aProp.startsWith("--");
+}
+
+function isNotCustom(aProp) {
+  return !isCustom(aProp);
+}
 
 var styleList = window.getComputedStyle(document.documentElement);
-    cssA = [], mozA = [], svgA = [], mozList = false,
-    svgList = false, noMozInSVG = true;
-// Need to split into sublists to compare
+    cssA = [], mozA = [], svgA = [], customA = [];
+
+// Partition the list of property names into four lists:
+//
+//   cssA: regular, non-SVG properties
+//   mozA: '-moz-' prefixed properties
+//   svgA: SVG properties
+//   customA: '--' prefixed custom properties
+
+var list = cssA;
 for (var i = 0, j = styleList.length; i < j; i++) {
   var prop = styleList.item(i);
-  // Check for start of -moz- list
-  if (!mozList && /^-moz-/.test(prop)) {
-    // Make sure no -moz- in the SVG list
-    if (!svgList) {
-      mozList = true;
-    } else {
-      noMozInSVG = false;
-      // Don't add to svgA so can still test SVG order
-      continue;
-    }
-  }
-  // Add properties to the three lists
-  if (mozList) {
-    // Check for start of SVG list
-    // Will break if any SVG props added before, unlikely though?
-    if (prop == 'clip-path') {
-      svgList = true;
-      mozList = false;
-      svgA.push(prop);
-    } else {
-      mozA.push(prop);
-    }
-  } else if (svgList) {
-    svgA.push(prop);
-  } else {
-    cssA.push(prop);
+
+  switch (list) {
+    case cssA:
+      if (isPrefixed(prop)) {
+        list = mozA;
+      }
+      // fall through
+    case mozA:
+      if (prop == "clip-path") {
+        // Assumes that the first SVG property is 'clip-path'.
+        list = svgA;
+      }
+      // fall through
+    case svgA:
+      if (isCustom(prop)) {
+        list = customA;
+      }
+      // fall through
   }
+
+  list.push(prop);
 }
-var cssB = cssA.slice(0),
-mozB = mozA.slice(0),
-svgB = svgA.slice(0);
-cssB.sort();
-mozB.sort();
-svgB.sort();
+
+var cssB = cssA.slice(0).sort(),
+    mozB = mozA.slice(0).sort(),
+    svgB = svgA.slice(0).sort();
+
 is(cssA.toString(), cssB.toString(), 'CSS property list should be alphabetical');
-is(mozA.toString(), mozB.toString(), 'Experimental -moz- CSS property list should be alphabetical and not contain mature properties');
+is(mozA.toString(), mozB.toString(), 'Experimental -moz- CSS property list should be alphabetical');
 is(svgA.toString(), svgB.toString(), 'SVG property list should be alphabetical');
-ok(noMozInSVG, 'Experimental -moz- CSS properties should not be in the SVG property list');
+
+// We don't test that the custom property is sorted, as the CSSOM
+// specification does not yet require it, and we don't return them
+// in sorted order.
+
+ok(!cssA.find(isPrefixed), 'Experimental -moz- CSS properties should not be in the mature CSS property list');
+ok(!cssA.find(isCustom), 'Custom CSS properties should not be in the mature CSS property list');
+ok(!mozA.find(isNotPrefixed), 'Experimental -moz- CSS property list should not contain mature CSS properties');
+ok(!mozA.find(isCustom), 'Custom CSS properties should not be in the experimental -moz- CSS property list');
+ok(!svgA.find(isPrefixed), 'Experimental -moz- CSS properties should not be in the SVG property list'); 
+ok(!svgA.find(isCustom), 'Custom CSS properties should not be in the SVG property list');
+ok(!customA.find(isNotCustom), 'Non-custom CSS properties should not be in the custom property list');
 
 </script>
 </pre>

From ffb58238686ecbec28684cc9ac8dc6a8680113d0 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 25 Jul 2014 21:51:41 -0400
Subject: [PATCH 037/128] Bug 1041181 - Fix repeated GMPInstallManager log
 lines. r=gfritzsche

---
 toolkit/modules/GMPInstallManager.jsm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
index f0df15aa7ab..bb78792c16c 100644
--- a/toolkit/modules/GMPInstallManager.jsm
+++ b/toolkit/modules/GMPInstallManager.jsm
@@ -30,6 +30,14 @@ this.EXPORTED_SYMBOLS = ["GMPInstallManager", "GMPExtractor", "GMPDownloader",
                          "GMPAddon", "GMPPrefs"];
 
 var gLocale = null;
+const PARENT_LOGGER_ID = "GMPInstallManager";
+
+// Setup the parent logger with dump logging. It'll only be used if logging is
+// enabled though.
+let parentLogger = Log.repository.getLogger(PARENT_LOGGER_ID);
+parentLogger.level = Log.Level.Debug;
+let appender = new Log.DumpAppender();
+parentLogger.addAppender(appender);
 
 // Shared code for suppressing bad cert dialogs
 XPCOMUtils.defineLazyGetter(this, "gCertUtils", function() {
@@ -48,13 +56,8 @@ XPCOMUtils.defineLazyGetter(this, "gLogEnabled", function() {
 
 
 function getScopedLogger(prefix) {
-  let logger = Log.repository.getLogger(prefix);
-  if (gLogEnabled) {
-    logger.level = Log.Level.Debug;
-    let appender = new Log.DumpAppender();
-    logger.addAppender(appender);
-  }
-  return logger;
+  var parentScope = gLogEnabled ? PARENT_LOGGER_ID + "." : "";
+  return Log.repository.getLogger(parentScope + prefix);
 }
 
 

From e2c1ed56cdb1956f4c4105a01891cbae62b93bb4 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 25 Jul 2014 23:00:54 -0400
Subject: [PATCH 038/128] Backout 8613370d058a (bug 820716) on suspicion of
 breaking e10s M3 tests on a CLOSED TREE

---
 toolkit/crashreporter/nsExceptionHandler.cpp | 15 +++++++++++++++
 toolkit/xre/nsAppRunner.cpp                  |  6 ------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index 3ec202324d1..bfb36d80309 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -2547,6 +2547,21 @@ static bool ChildFilter(void *context) {
 void
 OOPInit()
 {
+  class ProxyToMainThread : public nsRunnable
+  {
+  public:
+    NS_IMETHOD Run() {
+      OOPInit();
+      return NS_OK;
+    }
+  };
+  if (!NS_IsMainThread()) {
+    // This logic needs to run on the main thread
+    nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
+    mozilla::SyncRunnable::DispatchToThread(mainThread, new ProxyToMainThread());
+    return;
+  }
+
   if (OOPInitialized())
     return;
 
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index d3695f5548d..36e7aea2bc5 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4080,12 +4080,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
   rv = mScopedXPCom->Initialize();
   NS_ENSURE_SUCCESS(rv, 1);
 
-#ifdef MOZ_CRASHREPORTER
-  if (CrashReporter::GetEnabled()) {
-    CrashReporter::OOPInit();
-  }
-#endif
-
   // run!
   rv = XRE_mainRun();
 

From 309458ae4cca653516009eed588675c36bedff28 Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Fri, 25 Jul 2014 16:59:22 -0700
Subject: [PATCH 039/128] bug 1040889 - don't re-cache OCSP server failures if
 no fetch was attempted r=briansmith r=cviecco

--HG--
extra : rebase_source : e00c84e62ecca3e97794d3ceafcd1f5f618045d1
---
 .../certverifier/NSSCertDBTrustDomain.cpp     | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
index 2f18a63f656..88a6df724eb 100644
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
+++ b/security/certverifier/NSSCertDBTrustDomain.cpp
@@ -493,7 +493,12 @@ NSSCertDBTrustDomain::CheckRevocation(EndEntityOrCA endEntityOrCA,
 
   // Only request a response if we didn't have a cached indication of failure
   // (don't keep requesting responses from a failing server).
-  const SECItem* response = nullptr;
+  const SECItem* response;
+  bool attemptedRequest;
+  // Initialize error here to a value we check that it isn't later, because
+  // the compiler on windows isn't smart enough to figure out that it's
+  // always initialized before it gets used.
+  PRErrorCode error = 0;
   if (cachedResponseErrorCode == 0 ||
       cachedResponseErrorCode == SEC_ERROR_OCSP_UNKNOWN_CERT ||
       cachedResponseErrorCode == SEC_ERROR_OCSP_OLD_RESPONSE) {
@@ -506,16 +511,28 @@ NSSCertDBTrustDomain::CheckRevocation(EndEntityOrCA endEntityOrCA,
     response = DoOCSPRequest(arena.get(), url, request,
                              OCSPFetchingTypeToTimeoutTime(mOCSPFetching),
                              mOCSPGetConfig == CertVerifier::ocsp_get_enabled);
+    if (!response) {
+      error = PR_GetError();
+    }
+    attemptedRequest = true;
+  } else {
+    error = cachedResponseErrorCode;
+    response = nullptr;
+    attemptedRequest = false;
   }
 
+  // If we don't have a response, either something went wrong when fetching it
+  // or we didn't attempt to fetch a response because of a failing responder.
   if (!response) {
-    PRErrorCode error = PR_GetError();
-    if (error == 0) {
-      error = cachedResponseErrorCode;
-    }
-    PRTime timeout = time + ServerFailureDelay;
-    if (mOCSPCache.Put(certID, error, time, timeout) != SECSuccess) {
-      return SECFailure;
+    MOZ_ASSERT(error != 0);
+    // If we haven't actually attempted to fetch a response, we have nothing
+    // new to tell the cache. Otherwise, we do.
+    if (attemptedRequest) {
+      PRTime timeout = time + ServerFailureDelay;
+      SECStatus rv = mOCSPCache.Put(certID, error, time, timeout);
+      if (rv != SECSuccess) {
+        return SECFailure;
+      }
     }
     PR_SetError(error, 0);
     if (mOCSPFetching != FetchOCSPForDVSoftFail) {
@@ -560,7 +577,7 @@ NSSCertDBTrustDomain::CheckRevocation(EndEntityOrCA endEntityOrCA,
     return rv;
   }
 
-  PRErrorCode error = PR_GetError();
+  error = PR_GetError();
   if (error == SEC_ERROR_OCSP_UNKNOWN_CERT ||
       error == SEC_ERROR_REVOKED_CERTIFICATE) {
     return rv;

From e8da07630241adba0b3bcb6f55c89e190adbbde2 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Fri, 25 Jul 2014 22:10:51 -0700
Subject: [PATCH 040/128] Bug 1012456: Use 'using namespace' in
 DebuggerMemory.cpp, to avoid wrapping top-level definitions in a namespace {
 ... } form. r=sfink

---
 js/src/vm/DebuggerMemory.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/src/vm/DebuggerMemory.cpp b/js/src/vm/DebuggerMemory.cpp
index 170a053a9d6..45320f6d79c 100644
--- a/js/src/vm/DebuggerMemory.cpp
+++ b/js/src/vm/DebuggerMemory.cpp
@@ -171,5 +171,3 @@ DebuggerMemory::getTrackingAllocationSites(JSContext *cx, unsigned argc, Value *
 /* static */ const JSFunctionSpec DebuggerMemory::methods[] = {
     JS_FS_END
 };
-
-} /* namespace js */

From 1c5248cfaf241d41bb24e999bd2bb5a56a74ca92 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Fri, 25 Jul 2014 22:17:34 -0700
Subject: [PATCH 041/128] Bug 1012456: Use 'using namespace' in
 DebuggerMemory.cpp, to avoid wrapping top-level definitions in a namespace {
 ... } form. r=sfink

---
 js/src/vm/DebuggerMemory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/vm/DebuggerMemory.cpp b/js/src/vm/DebuggerMemory.cpp
index 45320f6d79c..ea3d8995589 100644
--- a/js/src/vm/DebuggerMemory.cpp
+++ b/js/src/vm/DebuggerMemory.cpp
@@ -13,7 +13,8 @@
 
 #include "vm/Debugger-inl.h"
 
-namespace js {
+using namespace js;
+using namespace JS;
 
 /* static */ DebuggerMemory *
 DebuggerMemory::create(JSContext *cx, Debugger *dbg)

From 0e91f75f598f73891783408789446cefcb8b5ab0 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 26 Jul 2014 01:41:10 -0400
Subject: [PATCH 042/128] Bug 1031945.  Don't expose showModalDialog on Window
 if it's preffed off.  r=smaug

---
 dom/base/nsGlobalWindow.cpp | 17 ++++++++++++++++-
 dom/base/nsGlobalWindow.h   |  3 +++
 dom/webidl/Window.webidl    |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 4991e4fa1f3..aa8b45278b9 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -4365,6 +4365,21 @@ nsGlobalWindow::IsChromeWindow(JSContext* aCx, JSObject* aObj)
   return xpc::WindowOrNull(aObj)->IsChromeWindow();
 }
 
+/* static */ bool
+nsGlobalWindow::IsShowModalDialogEnabled(JSContext*, JSObject*)
+{
+  static bool sAddedPrefCache = false;
+  static bool sIsDisabled;
+  static const char sShowModalDialogPref[] = "dom.disable_window_showModalDialog";
+
+  if (!sAddedPrefCache) {
+    Preferences::AddBoolVarCache(&sIsDisabled, sShowModalDialogPref, false);
+    sAddedPrefCache = true;
+  }
+
+  return !sIsDisabled;
+}
+
 nsIDOMOfflineResourceList*
 nsGlobalWindow::GetApplicationCache(ErrorResult& aError)
 {
@@ -9121,7 +9136,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aUrl, nsIVariant* aArgument,
                             (aUrl, aArgument, aOptions, aError), aError,
                             nullptr);
 
-  if (Preferences::GetBool("dom.disable_window_showModalDialog", false)) {
+  if (!IsShowModalDialogEnabled()) {
     aError.Throw(NS_ERROR_NOT_AVAILABLE);
     return nullptr;
   }
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index f0052b94c24..31a8811bdc1 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -512,6 +512,9 @@ public:
 
   static bool IsChromeWindow(JSContext* /* unused */, JSObject* aObj);
 
+  static bool IsShowModalDialogEnabled(JSContext* /* unused */ = nullptr,
+                                       JSObject* /* unused */ = nullptr);
+
   bool DoNewResolve(JSContext* aCx, JS::Handle<JSObject*> aObj,
                     JS::Handle<jsid> aId,
                     JS::MutableHandle<JSPropertyDescriptor> aDesc);
diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
index caec3bc67c9..94d2160c5f4 100644
--- a/dom/webidl/Window.webidl
+++ b/dom/webidl/Window.webidl
@@ -79,7 +79,8 @@ typedef any Transferable;
   [Throws] DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
   [Throws] void print();
   //[Throws] any showModalDialog(DOMString url, optional any argument);
-  [Throws] any showModalDialog(DOMString url, optional any argument, optional DOMString options = "");
+  [Throws, Func="nsGlobalWindow::IsShowModalDialogEnabled"]
+  any showModalDialog(DOMString url, optional any argument, optional DOMString options = "");
 
   [Throws, CrossOriginCallable] void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);
 

From 5e6d105dec47d81bfc8cb3e6ecd44724d8af4910 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 26 Jul 2014 01:41:14 -0400
Subject: [PATCH 043/128] Bug 1037271.  When loading sandboxed without a
 loading principal, just create a NullPrincipal instead of asserting and
 misbehaving.  r=smaug

---
 content/base/src/nsContentUtils.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index b4ca2e7e75f..cd2baae7e22 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -6498,10 +6498,20 @@ nsContentUtils::SetUpChannelOwner(nsIPrincipal* aLoadingPrincipal,
                                   bool aIsSandboxed,
                                   bool aForceInherit)
 {
-  if (!aLoadingPrincipal) {
-    // Nothing to do here
-    MOZ_ASSERT(!aIsSandboxed);
-    return false;
+  nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingPrincipal;
+  if (!loadingPrincipal) {
+    if (!aIsSandboxed) {
+      // Nothing to do here
+      return false;
+    }
+
+    // Go ahead and create a nullprincipal to use as our loading principal,
+    // since we need to make sure to sandbox the load but we have no clue who's
+    // loading us.
+    loadingPrincipal = do_CreateInstance(NS_NULLPRINCIPAL_CONTRACTID);
+    if (!loadingPrincipal) {
+      NS_RUNTIMEABORT("Failed to create a principal?");
+    }
   }
 
   // If we're sandboxed, make sure to clear any owner the channel
@@ -6541,14 +6551,14 @@ nsContentUtils::SetUpChannelOwner(nsIPrincipal* aLoadingPrincipal,
       // based on its own codebase later.
       //
       (URIIsLocalFile(aURI) &&
-       NS_SUCCEEDED(aLoadingPrincipal->CheckMayLoad(aURI, false, false)) &&
+       NS_SUCCEEDED(loadingPrincipal->CheckMayLoad(aURI, false, false)) &&
        // One more check here.  CheckMayLoad will always return true for the
        // system principal, but we do NOT want to inherit in that case.
-       !IsSystemPrincipal(aLoadingPrincipal));
+       !IsSystemPrincipal(loadingPrincipal));
   }
 
   nsCOMPtr<nsILoadInfo> loadInfo =
-    new LoadInfo(aLoadingPrincipal,
+    new LoadInfo(loadingPrincipal,
                  inherit ?
                    LoadInfo::eInheritPrincipal : LoadInfo::eDontInheritPrincipal,
                  aIsSandboxed ? LoadInfo::eSandboxed : LoadInfo::eNotSandboxed);

From 4bf16401067854394ed732a1f06d274d6223837c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 26 Jul 2014 01:41:18 -0400
Subject: [PATCH 044/128] Bug 1041646.  Don't assume mStack is non-null in
 JSStackFrame, since people sometimes operate on them after unlinking. 
 r=khuey

---
 dom/base/DOMException.h                |  3 +-
 dom/bindings/Exceptions.cpp            | 20 ++++++++---
 dom/bindings/test/mochitest.ini        |  1 +
 dom/bindings/test/test_bug1041646.html | 49 ++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 dom/bindings/test/test_bug1041646.html

diff --git a/dom/base/DOMException.h b/dom/base/DOMException.h
index 230bdc46ea5..9e8ce08d545 100644
--- a/dom/base/DOMException.h
+++ b/dom/base/DOMException.h
@@ -71,7 +71,8 @@ public:
 
   void GetName(nsString& retval);
 
-  // The XPCOM GetFilename does the right thing.
+  // The XPCOM GetFilename does the right thing.  It might throw, but we want to
+  // return an empty filename in that case anyway, instead of throwing.
 
   uint32_t LineNumber() const;
 
diff --git a/dom/bindings/Exceptions.cpp b/dom/bindings/Exceptions.cpp
index 9b709b426e2..61b75019b7c 100644
--- a/dom/bindings/Exceptions.cpp
+++ b/dom/bindings/Exceptions.cpp
@@ -359,7 +359,9 @@ NS_IMETHODIMP JSStackFrame::GetLanguageName(nsACString& aLanguageName)
 /* readonly attribute AString filename; */
 NS_IMETHODIMP JSStackFrame::GetFilename(nsAString& aFilename)
 {
-  if (!mFilenameInitialized) {
+  // We can get called after unlink; in that case we can't do much
+  // about producing a useful value.
+  if (!mFilenameInitialized && mStack) {
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JSObject*> stack(cx, mStack);
     JS::ExposeObjectToActiveJS(mStack);
@@ -395,7 +397,9 @@ NS_IMETHODIMP StackFrame::GetFilename(nsAString& aFilename)
 /* readonly attribute AString name; */
 NS_IMETHODIMP JSStackFrame::GetName(nsAString& aFunction)
 {
-  if (!mFunnameInitialized) {
+  // We can get called after unlink; in that case we can't do much
+  // about producing a useful value.
+  if (!mFunnameInitialized && mStack) {
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JSObject*> stack(cx, mStack);
     JS::ExposeObjectToActiveJS(mStack);
@@ -435,7 +439,9 @@ NS_IMETHODIMP StackFrame::GetName(nsAString& aFunction)
 nsresult
 JSStackFrame::GetLineno(int32_t* aLineNo)
 {
-  if (!mLinenoInitialized) {
+  // We can get called after unlink; in that case we can't do much
+  // about producing a useful value.
+  if (!mLinenoInitialized && mStack) {
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JSObject*> stack(cx, mStack);
     JS::ExposeObjectToActiveJS(mStack);
@@ -468,7 +474,9 @@ NS_IMETHODIMP StackFrame::GetSourceLine(nsACString& aSourceLine)
 /* readonly attribute nsIStackFrame caller; */
 NS_IMETHODIMP JSStackFrame::GetCaller(nsIStackFrame** aCaller)
 {
-  if (!mCallerInitialized) {
+  // We can get called after unlink; in that case we can't do much
+  // about producing a useful value.
+  if (!mCallerInitialized && mStack) {
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JSObject*> stack(cx, mStack);
     JS::ExposeObjectToActiveJS(mStack);
@@ -501,7 +509,9 @@ NS_IMETHODIMP StackFrame::GetCaller(nsIStackFrame** aCaller)
 
 NS_IMETHODIMP JSStackFrame::GetFormattedStack(nsAString& aStack)
 {
-  if (!mFormattedStackInitialized) {
+  // We can get called after unlink; in that case we can't do much
+  // about producing a useful value.
+  if (!mFormattedStackInitialized && mStack) {
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JS::Value> stack(cx, JS::ObjectValue(*mStack));
     JS::ExposeObjectToActiveJS(mStack);
diff --git a/dom/bindings/test/mochitest.ini b/dom/bindings/test/mochitest.ini
index 863b4c047dc..420035bc139 100644
--- a/dom/bindings/test/mochitest.ini
+++ b/dom/bindings/test/mochitest.ini
@@ -21,6 +21,7 @@ support-files =
 # where we have our test component. So this should become skip-if = debug == false.
 [test_bug923904.html]
 skip-if = true
+[test_bug1041646.html]
 [test_barewordGetsWindow.html]
 [test_callback_default_thisval.html]
 [test_cloneAndImportNode.html]
diff --git a/dom/bindings/test/test_bug1041646.html b/dom/bindings/test/test_bug1041646.html
new file mode 100644
index 00000000000..22baed454e2
--- /dev/null
+++ b/dom/bindings/test/test_bug1041646.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1041646
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1041646</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 1041646 **/
+  // We need to reject the promise with a DOMException, so make sure we have
+  // something that produces one.
+  function throwException() {
+    document.createTextNode("").appendChild(document);
+  }
+  try {
+    throwException();
+  } catch (e) {
+    ok(e instanceof DOMException, "This test won't test what it should be testing");
+  }
+
+  SimpleTest.waitForExplicitFinish();
+
+  // We want a new DOMException each time here.
+  for (var i = 0; i < 100; ++i) {
+    new Promise(throwException);
+  }
+
+  // Now make sure we wait for all those promises above to reject themselves
+  Promise.resolve(1).then(function() {
+    SpecialPowers.gc(); // This should not assert or crash
+    SimpleTest.finish();
+  });
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1041646">Mozilla Bug 1041646</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>

From 18c20640625fc20a03af725c9b294b653eca8a7a Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 26 Jul 2014 01:41:26 -0400
Subject: [PATCH 045/128] Bug 1044049.  Bump bindings to unify 32 files per
 unified file instead of 16, since we keep getting more bindings.  r=ehsan

---
 python/mozbuild/mozbuild/backend/recursivemake.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 454c235da73..5d2f32fabe8 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -1385,7 +1385,8 @@ class RecursiveMakeBackend(CommonBackend):
             bindings_dir,
             unified_prefix='UnifiedBindings',
             unified_files_makefile_variable='unified_binding_cpp_files',
-            poison_windows_h=True)
+            poison_windows_h=True,
+            files_per_unified_file=32)
 
         webidls_mk = mozpath.join(bindings_dir, 'webidlsrcs.mk')
         with self._write_file(webidls_mk) as fh:

From d9e695483de83bf2d71277bdf4c24a77116809e6 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 26 Jul 2014 08:17:24 +0200
Subject: [PATCH 046/128] Bug 1043963 - Collapse test-only moz.build files
 under dom/ into ancestor moz.build files; r=ted

There is very little benefit to having another layer of moz.build files, and
removing them will speed up the build a minimal amount. It also paves the way
for removing TEST_DIRS, which could simplify the build system somewhat.
---
 dom/activities/moz.build                     |  2 +-
 dom/activities/tests/moz.build               |  7 ---
 dom/alarm/moz.build                          |  4 +-
 dom/alarm/test/moz.build                     |  8 ---
 dom/archivereader/moz.build                  |  4 +-
 dom/archivereader/test/moz.build             |  8 ---
 dom/asmjscache/moz.build                     |  4 +-
 dom/asmjscache/test/moz.build                |  8 ---
 dom/base/moz.build                           |  5 +-
 dom/base/test/moz.build                      | 10 ----
 dom/battery/moz.build                        |  4 +-
 dom/battery/test/moz.build                   |  8 ---
 dom/camera/moz.build                         |  2 +-
 dom/camera/test/moz.build                    |  8 ---
 dom/cellbroadcast/moz.build                  |  1 -
 dom/cellbroadcast/tests/moz.build            |  6 ---
 dom/contacts/moz.build                       |  3 +-
 dom/contacts/tests/moz.build                 | 10 ----
 dom/crypto/moz.build                         |  3 +-
 dom/crypto/test/moz.build                    |  7 ---
 dom/downloads/moz.build                      |  2 +-
 dom/downloads/tests/moz.build                |  7 ---
 dom/encoding/moz.build                       |  9 +++-
 dom/icc/moz.build                            |  1 -
 dom/icc/tests/moz.build                      |  6 ---
 dom/identity/moz.build                       |  3 +-
 dom/identity/tests/moz.build                 |  8 ---
 dom/indexedDB/moz.build                      |  9 +++-
 dom/indexedDB/test/moz.build                 | 18 -------
 dom/indexedDB/test/unit/moz.build            |  8 ---
 dom/inputmethod/mochitest/moz.build          |  8 ---
 dom/inputmethod/moz.build                    |  4 +-
 dom/ipc/moz.build                            |  4 +-
 dom/ipc/tests/moz.build                      |  9 ----
 dom/media/moz.build                          |  8 ++-
 dom/media/tests/identity/moz.build           |  8 ---
 dom/media/tests/ipc/moz.build                |  7 ---
 dom/media/tests/mochitest/moz.build          | 10 ----
 dom/messages/moz.build                       |  4 +-
 dom/messages/test/moz.build                  |  8 ---
 dom/mobileconnection/moz.build               |  3 +-
 dom/mobileconnection/tests/moz.build         |  7 ---
 dom/mobileid/moz.build                       |  2 +-
 dom/mobileid/test/moz.build                  |  7 ---
 dom/mobilemessage/moz.build                  |  3 +-
 dom/mobilemessage/tests/moz.build            | 11 ----
 dom/network/moz.build                        | 11 +++-
 dom/network/tests/moz.build                  | 12 -----
 dom/nfc/moz.build                            |  2 -
 dom/nfc/tests/moz.build                      |  5 --
 dom/payment/moz.build                        |  3 +-
 dom/payment/tests/moz.build                  |  7 ---
 dom/permission/moz.build                     | 21 +++++++-
 dom/permission/tests/moz.build               | 25 ---------
 dom/phonenumberutils/moz.build               |  5 +-
 dom/phonenumberutils/tests/moz.build         | 10 ----
 dom/power/moz.build                          |  5 +-
 dom/power/test/moz.build                     | 10 ----
 dom/promise/moz.build                        |  4 +-
 dom/promise/tests/moz.build                  |  8 ---
 dom/resourcestats/moz.build                  |  7 ++-
 dom/resourcestats/tests/moz.build            | 10 ----
 dom/settings/moz.build                       |  6 ++-
 dom/settings/tests/moz.build                 | 11 ----
 dom/src/json/moz.build                       |  5 +-
 dom/src/json/test/moz.build                  | 10 ----
 dom/src/jsurl/moz.build                      |  4 +-
 dom/src/jsurl/test/moz.build                 |  8 ---
 dom/system/moz.build                         |  6 +--
 dom/system/tests/moz.build                   |  8 ---
 dom/tests/mochitest/ajax/moz.build           | 16 ------
 dom/tests/mochitest/beacon/moz.build         |  9 ----
 dom/tests/mochitest/bugs/moz.build           |  8 ---
 dom/tests/mochitest/dom-level0/moz.build     |  8 ---
 dom/tests/mochitest/gamepad/Makefile.in      |  6 ---
 dom/tests/mochitest/gamepad/moz.build        |  8 ---
 dom/tests/mochitest/general/moz.build        | 10 ----
 dom/tests/mochitest/geolocation/moz.build    |  8 ---
 dom/tests/mochitest/localstorage/moz.build   | 10 ----
 dom/tests/mochitest/moz.build                | 53 ------------------
 dom/tests/mochitest/notification/moz.build   |  7 ---
 dom/tests/mochitest/orientation/moz.build    |  8 ---
 dom/tests/mochitest/sessionstorage/moz.build | 10 ----
 dom/tests/mochitest/storageevent/moz.build   |  8 ---
 dom/tests/mochitest/webcomponents/moz.build  |  8 ---
 dom/tests/moz.build                          | 57 +++++++++++++++++++-
 dom/workers/moz.build                        | 16 +++++-
 dom/workers/test/moz.build                   | 16 ------
 dom/workers/test/serviceworkers/moz.build    |  7 ---
 dom/xbl/moz.build                            |  4 +-
 dom/xbl/test/moz.build                       | 10 ----
 dom/xslt/moz.build                           |  7 ++-
 dom/xslt/tests/buster/moz.build              |  7 ---
 dom/xslt/tests/mochitest/moz.build           |  8 ---
 94 files changed, 182 insertions(+), 616 deletions(-)
 delete mode 100644 dom/activities/tests/moz.build
 delete mode 100644 dom/alarm/test/moz.build
 delete mode 100644 dom/archivereader/test/moz.build
 delete mode 100644 dom/asmjscache/test/moz.build
 delete mode 100644 dom/base/test/moz.build
 delete mode 100644 dom/battery/test/moz.build
 delete mode 100644 dom/camera/test/moz.build
 delete mode 100644 dom/cellbroadcast/tests/moz.build
 delete mode 100644 dom/contacts/tests/moz.build
 delete mode 100644 dom/crypto/test/moz.build
 delete mode 100644 dom/downloads/tests/moz.build
 delete mode 100644 dom/icc/tests/moz.build
 delete mode 100644 dom/identity/tests/moz.build
 delete mode 100644 dom/indexedDB/test/moz.build
 delete mode 100644 dom/indexedDB/test/unit/moz.build
 delete mode 100644 dom/inputmethod/mochitest/moz.build
 delete mode 100644 dom/ipc/tests/moz.build
 delete mode 100644 dom/media/tests/identity/moz.build
 delete mode 100644 dom/media/tests/ipc/moz.build
 delete mode 100644 dom/media/tests/mochitest/moz.build
 delete mode 100644 dom/messages/test/moz.build
 delete mode 100644 dom/mobileconnection/tests/moz.build
 delete mode 100644 dom/mobileid/test/moz.build
 delete mode 100644 dom/mobilemessage/tests/moz.build
 delete mode 100644 dom/network/tests/moz.build
 delete mode 100644 dom/nfc/tests/moz.build
 delete mode 100644 dom/payment/tests/moz.build
 delete mode 100644 dom/permission/tests/moz.build
 delete mode 100644 dom/phonenumberutils/tests/moz.build
 delete mode 100644 dom/power/test/moz.build
 delete mode 100644 dom/promise/tests/moz.build
 delete mode 100644 dom/resourcestats/tests/moz.build
 delete mode 100644 dom/settings/tests/moz.build
 delete mode 100644 dom/src/json/test/moz.build
 delete mode 100644 dom/src/jsurl/test/moz.build
 delete mode 100644 dom/system/tests/moz.build
 delete mode 100644 dom/tests/mochitest/ajax/moz.build
 delete mode 100644 dom/tests/mochitest/beacon/moz.build
 delete mode 100644 dom/tests/mochitest/bugs/moz.build
 delete mode 100644 dom/tests/mochitest/dom-level0/moz.build
 delete mode 100644 dom/tests/mochitest/gamepad/Makefile.in
 delete mode 100644 dom/tests/mochitest/gamepad/moz.build
 delete mode 100644 dom/tests/mochitest/general/moz.build
 delete mode 100644 dom/tests/mochitest/geolocation/moz.build
 delete mode 100644 dom/tests/mochitest/localstorage/moz.build
 delete mode 100644 dom/tests/mochitest/moz.build
 delete mode 100644 dom/tests/mochitest/notification/moz.build
 delete mode 100644 dom/tests/mochitest/orientation/moz.build
 delete mode 100644 dom/tests/mochitest/sessionstorage/moz.build
 delete mode 100644 dom/tests/mochitest/storageevent/moz.build
 delete mode 100644 dom/tests/mochitest/webcomponents/moz.build
 delete mode 100644 dom/workers/test/moz.build
 delete mode 100644 dom/workers/test/serviceworkers/moz.build
 delete mode 100644 dom/xbl/test/moz.build
 delete mode 100644 dom/xslt/tests/buster/moz.build
 delete mode 100644 dom/xslt/tests/mochitest/moz.build

diff --git a/dom/activities/moz.build b/dom/activities/moz.build
index 80787537cd3..bd55e42906a 100644
--- a/dom/activities/moz.build
+++ b/dom/activities/moz.build
@@ -6,4 +6,4 @@
 
 PARALLEL_DIRS += ['interfaces', 'src']
 
-TEST_DIRS += ['tests']
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/dom/activities/tests/moz.build b/dom/activities/tests/moz.build
deleted file mode 100644
index 191c90f0b92..00000000000
--- a/dom/activities/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index aa3f34ebf5e..7895800c383 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 XPIDL_SOURCES += [
     'nsIAlarmHalService.idl',
 ]
@@ -35,3 +33,5 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/alarm/test/moz.build b/dom/alarm/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/alarm/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/archivereader/moz.build b/dom/archivereader/moz.build
index 02501e3180a..0084cf5b44b 100644
--- a/dom/archivereader/moz.build
+++ b/dom/archivereader/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom.archivereader += [
     'ArchiveEvent.h',
     'ArchiveReader.h',
@@ -30,3 +28,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/archivereader/test/moz.build b/dom/archivereader/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/archivereader/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/asmjscache/moz.build b/dom/asmjscache/moz.build
index 4e0f244698a..ade61935f19 100644
--- a/dom/asmjscache/moz.build
+++ b/dom/asmjscache/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom.asmjscache += [
     'AsmJSCache.h'
 ]
@@ -25,3 +23,5 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/asmjscache/test/moz.build b/dom/asmjscache/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/asmjscache/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 9ac79b40acc..bf6a336417f 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 XPIDL_SOURCES += [
     'nsIConsoleAPIStorage.idl',
     'nsIDOMDOMCursor.idl',
@@ -189,3 +187,6 @@ for var in ('MOZ_B2G_RIL', 'MOZ_B2G_FM'):
 
 if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
     DEFINES['HAVE_SIDEBAR'] = True
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/base/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/battery/moz.build b/dom/battery/moz.build
index ed1b9a40d50..baa0b5ce1e0 100644
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom.battery += [
     'Constants.h',
     'Types.h',
@@ -20,3 +18,5 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/battery/test/moz.build b/dom/battery/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/battery/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index ba48092c91c..e7ff0162071 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    TEST_DIRS += ['test']
+    MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 EXPORTS += [
     'CameraCommon.h',
diff --git a/dom/camera/test/moz.build b/dom/camera/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/camera/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/cellbroadcast/moz.build b/dom/cellbroadcast/moz.build
index 6834f77cb13..0f03209577a 100644
--- a/dom/cellbroadcast/moz.build
+++ b/dom/cellbroadcast/moz.build
@@ -5,4 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
-TEST_DIRS += ['tests']
diff --git a/dom/cellbroadcast/tests/moz.build b/dom/cellbroadcast/tests/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/dom/cellbroadcast/tests/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
diff --git a/dom/contacts/moz.build b/dom/contacts/moz.build
index 5355b6a1ed5..7e1d4e09132 100644
--- a/dom/contacts/moz.build
+++ b/dom/contacts/moz.build
@@ -6,7 +6,8 @@
 
 # Disable the tests on Android for now (bug 927869)
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
-    TEST_DIRS += ['tests']
+    MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+    MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 EXTRA_COMPONENTS += [
     'ContactManager.js',
diff --git a/dom/contacts/tests/moz.build b/dom/contacts/tests/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/contacts/tests/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build
index 2e9aacd71c5..f2c6540e727 100644
--- a/dom/crypto/moz.build
+++ b/dom/crypto/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom += [
     'AesKeyAlgorithm.h',
     'BasicSymmetricKeyAlgorithm.h',
@@ -42,3 +40,4 @@ LOCAL_INCLUDES += [
     '/security/manager/ssl/src',
 ]
 
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/crypto/test/moz.build b/dom/crypto/test/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/crypto/test/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/downloads/moz.build b/dom/downloads/moz.build
index 18d41b844c2..8deb9caac78 100644
--- a/dom/downloads/moz.build
+++ b/dom/downloads/moz.build
@@ -5,6 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG["MOZ_B2G"]:
-    TEST_DIRS += ['tests']
+    MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 PARALLEL_DIRS += ['src']
diff --git a/dom/downloads/tests/moz.build b/dom/downloads/tests/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/downloads/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build
index a314722ef4a..3297b37f4e5 100644
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom += [
     'EncodingUtils.h',
     'FallbackEncoding.h',
@@ -34,3 +32,10 @@ GENERATED_FILES += [
     'localesfallbacks.properties.h',
     'nonparticipatingdomains.properties.h',
 ]
+
+MOCHITEST_MANIFESTS += [
+    'test/mochitest.ini',
+    'test/unit/mochitest.ini',
+]
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/dom/icc/moz.build b/dom/icc/moz.build
index 6834f77cb13..0f03209577a 100644
--- a/dom/icc/moz.build
+++ b/dom/icc/moz.build
@@ -5,4 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
-TEST_DIRS += ['tests']
diff --git a/dom/icc/tests/moz.build b/dom/icc/tests/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/dom/icc/tests/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
diff --git a/dom/identity/moz.build b/dom/identity/moz.build
index fa489a08dfe..f0d7524730b 100644
--- a/dom/identity/moz.build
+++ b/dom/identity/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXTRA_COMPONENTS += [
     'Identity.manifest',
     'nsDOMIdentity.js',
@@ -16,3 +14,4 @@ EXTRA_PP_JS_MODULES += [
     'DOMIdentity.jsm',
 ]
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
diff --git a/dom/identity/tests/moz.build b/dom/identity/tests/moz.build
deleted file mode 100644
index 1c6f43d0bc5..00000000000
--- a/dom/identity/tests/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
-
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index 1226f335f88..0056af8f423 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['ipc']
-TEST_DIRS += ['test']
+TEST_DIRS += ['test/extensions']
 
 EXPORTS.mozilla.dom.indexedDB += [
     'Client.h',
@@ -80,3 +80,10 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
+MOCHITEST_MANIFESTS += [
+    'test/mochitest.ini',
+    'test/unit/mochitest.ini',
+]
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/dom/indexedDB/test/moz.build b/dom/indexedDB/test/moz.build
deleted file mode 100644
index 41b8f4e58ea..00000000000
--- a/dom/indexedDB/test/moz.build
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['extensions']
-
-TEST_DIRS += ['unit']
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/indexedDB/test/unit/moz.build b/dom/indexedDB/test/unit/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/indexedDB/test/unit/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/inputmethod/mochitest/moz.build b/dom/inputmethod/mochitest/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/inputmethod/mochitest/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build
index f156f761d13..b867207a83f 100644
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['mochitest']
-
 EXTRA_COMPONENTS += [
     'InputMethod.manifest',
     'MozKeyboard.js',
@@ -16,3 +14,5 @@ EXTRA_JS_MODULES += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index acf4092c96b..d549143383c 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXPORTS += [
     'nsICachedFileDescriptorListener.h',
     'PCOMContentPermissionRequestChild.h',
@@ -147,3 +145,5 @@ if CONFIG['ENABLE_TESTS']:
 
 JAR_MANIFESTS += ['jar.mn']
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
diff --git a/dom/ipc/tests/moz.build b/dom/ipc/tests/moz.build
deleted file mode 100644
index 5244ac16b12..00000000000
--- a/dom/ipc/tests/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/media/moz.build b/dom/media/moz.build
index cfac0a30927..f40e1e69bc6 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -17,7 +17,8 @@ if CONFIG['MOZ_WEBRTC']:
             '-Wno-unused-local-typedefs', # Workaround until we fix bug 1020661
         ]
 
-TEST_DIRS += ['tests/mochitest', 'tests/ipc', 'tests/identity']
+    MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+    WEBRTC_SIGNALLING_TEST_MANIFESTS += ['tests/mochitest/steeplechase.ini']
 
 XPIDL_SOURCES += [
     'nsIDOMMediaStream.idl',
@@ -72,3 +73,8 @@ LOCAL_INCLUDES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += [
+    'tests/identity/mochitest.ini',
+    'tests/ipc/mochitest.ini',
+]
diff --git a/dom/media/tests/identity/moz.build b/dom/media/tests/identity/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/media/tests/identity/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/media/tests/ipc/moz.build b/dom/media/tests/ipc/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/media/tests/ipc/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/media/tests/mochitest/moz.build b/dom/media/tests/mochitest/moz.build
deleted file mode 100644
index 770c1a5c84a..00000000000
--- a/dom/media/tests/mochitest/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG ['MOZ_WEBRTC']:
-    MOCHITEST_MANIFESTS += ['mochitest.ini']
-    WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
-
diff --git a/dom/messages/moz.build b/dom/messages/moz.build
index 9f04caca6be..20e7f4c662b 100644
--- a/dom/messages/moz.build
+++ b/dom/messages/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 PARALLEL_DIRS += ['interfaces']
 
 EXTRA_COMPONENTS += [
@@ -17,3 +15,5 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'SystemMessagePermissionsChecker.jsm',
 ]
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/messages/test/moz.build b/dom/messages/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/messages/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/mobileconnection/moz.build b/dom/mobileconnection/moz.build
index 6834f77cb13..d9982eec489 100644
--- a/dom/mobileconnection/moz.build
+++ b/dom/mobileconnection/moz.build
@@ -5,4 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
-TEST_DIRS += ['tests']
+
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
diff --git a/dom/mobileconnection/tests/moz.build b/dom/mobileconnection/tests/moz.build
deleted file mode 100644
index 045aac5ca6a..00000000000
--- a/dom/mobileconnection/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
diff --git a/dom/mobileid/moz.build b/dom/mobileid/moz.build
index 79d04afb85b..a6aac9a5c03 100644
--- a/dom/mobileid/moz.build
+++ b/dom/mobileid/moz.build
@@ -6,4 +6,4 @@
 
 PARALLEL_DIRS += ['interfaces', 'src']
 
-TEST_DIRS += ['test']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/mobileid/test/moz.build b/dom/mobileid/test/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/mobileid/test/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/mobilemessage/moz.build b/dom/mobilemessage/moz.build
index 4c48b5e19ca..2e88f43a898 100644
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -5,5 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['interfaces', 'src']
-TEST_DIRS += ['tests']
 
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
diff --git a/dom/mobilemessage/tests/moz.build b/dom/mobilemessage/tests/moz.build
deleted file mode 100644
index af5439a45fc..00000000000
--- a/dom/mobilemessage/tests/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
-
-if CONFIG['ENABLE_TESTS']:
-        XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
-
diff --git a/dom/network/moz.build b/dom/network/moz.build
index 6834f77cb13..76c3f3f886c 100644
--- a/dom/network/moz.build
+++ b/dom/network/moz.build
@@ -5,4 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
-TEST_DIRS += ['tests']
+
+XPCSHELL_TESTS_MANIFESTS += [
+    'tests/unit/xpcshell.ini',
+    'tests/unit_ipc/xpcshell.ini',
+]
+
+if CONFIG['tests/MOZ_B2G_RIL']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/unit_stats/xpcshell.ini']
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
diff --git a/dom/network/tests/moz.build b/dom/network/tests/moz.build
deleted file mode 100644
index 0472fb89bd1..00000000000
--- a/dom/network/tests/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
-
-if CONFIG['MOZ_B2G_RIL']:
-    XPCSHELL_TESTS_MANIFESTS += ['unit_stats/xpcshell.ini']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/nfc/moz.build b/dom/nfc/moz.build
index d89d0b80b2a..0568688239f 100644
--- a/dom/nfc/moz.build
+++ b/dom/nfc/moz.build
@@ -17,8 +17,6 @@ if CONFIG['MOZ_NFC']:
       'nsNfc.manifest',
     ]
 
-TEST_DIRS += ['tests']
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/nfc/tests/moz.build b/dom/nfc/tests/moz.build
deleted file mode 100644
index c271ec3908c..00000000000
--- a/dom/nfc/tests/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/dom/payment/moz.build b/dom/payment/moz.build
index 9d79d979dff..c697d97fc0d 100644
--- a/dom/payment/moz.build
+++ b/dom/payment/moz.build
@@ -6,8 +6,6 @@
 
 PARALLEL_DIRS += ['interfaces']
 
-TEST_DIRS += ['tests']
-
 EXTRA_JS_MODULES += [
     'Payment.jsm',
 ]
@@ -18,3 +16,4 @@ EXTRA_COMPONENTS += [
     'PaymentFlowInfo.js',
 ]
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/dom/payment/tests/moz.build b/dom/payment/tests/moz.build
deleted file mode 100644
index 191c90f0b92..00000000000
--- a/dom/payment/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/permission/moz.build b/dom/permission/moz.build
index e428bbaf222..f17b89f2ec6 100644
--- a/dom/permission/moz.build
+++ b/dom/permission/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXTRA_COMPONENTS += [
     'PermissionPromptService.js',
     'PermissionPromptService.manifest',
@@ -16,3 +14,22 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'PermissionSettings.jsm',
 ]
+
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+
+if CONFIG['MOZ_B2G_RIL']:
+    MOCHITEST_MANIFESTS += ['tests/mochitest-ril.ini']
+
+if CONFIG['MOZ_B2G_FM']:
+    MOCHITEST_MANIFESTS += ['tests/mochitest-fm.ini']
+
+if CONFIG['MOZ_B2G_BT']:
+    MOCHITEST_MANIFESTS += ['tests/mochitest-bt.ini']
+
+if CONFIG['MOZ_WEBSMS_BACKEND']:
+    MOCHITEST_MANIFESTS += ['tests/mochitest-websms.ini']
+
+if CONFIG['MOZ_TIME_MANAGER']:
+    MOCHITEST_MANIFESTS += ['tests/mochitest-time.ini']
diff --git a/dom/permission/tests/moz.build b/dom/permission/tests/moz.build
deleted file mode 100644
index 204e900e7e6..00000000000
--- a/dom/permission/tests/moz.build
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-if CONFIG['MOZ_B2G_RIL']:
-    MOCHITEST_MANIFESTS += ['mochitest-ril.ini']
-
-if CONFIG['MOZ_B2G_FM']:
-    MOCHITEST_MANIFESTS += ['mochitest-fm.ini']
-
-if CONFIG['MOZ_B2G_BT']:
-    MOCHITEST_MANIFESTS += ['mochitest-bt.ini']
-
-if CONFIG['MOZ_WEBSMS_BACKEND']:
-    MOCHITEST_MANIFESTS += ['mochitest-websms.ini']
-
-if CONFIG['MOZ_TIME_MANAGER']:
-    MOCHITEST_MANIFESTS += ['mochitest-time.ini']
-
diff --git a/dom/phonenumberutils/moz.build b/dom/phonenumberutils/moz.build
index aa236cf7b26..43f946de0f0 100644
--- a/dom/phonenumberutils/moz.build
+++ b/dom/phonenumberutils/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXTRA_COMPONENTS += [
     'PhoneNumberService.js',
     'PhoneNumberService.manifest',
@@ -21,3 +19,6 @@ EXTRA_JS_MODULES += [
 EXTRA_PP_JS_MODULES += [
     'PhoneNumberUtils.jsm',
 ]
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
diff --git a/dom/phonenumberutils/tests/moz.build b/dom/phonenumberutils/tests/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/phonenumberutils/tests/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/power/moz.build b/dom/power/moz.build
index 00a1862d8a4..a54c38d8af3 100644
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 XPIDL_SOURCES += [
     'nsIDOMWakeLockListener.idl',
     'nsIPowerManagerService.idl',
@@ -34,3 +32,6 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff --git a/dom/power/test/moz.build b/dom/power/test/moz.build
deleted file mode 100644
index 363dfa971e6..00000000000
--- a/dom/power/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
diff --git a/dom/promise/moz.build b/dom/promise/moz.build
index ef17e4cd177..3e275f7757c 100644
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXPORTS.mozilla.dom += [
     'Promise.h',
     'PromiseDebugging.h',
@@ -27,3 +25,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
diff --git a/dom/promise/tests/moz.build b/dom/promise/tests/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/promise/tests/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/resourcestats/moz.build b/dom/resourcestats/moz.build
index 221913bc77f..437457a638f 100644
--- a/dom/resourcestats/moz.build
+++ b/dom/resourcestats/moz.build
@@ -14,6 +14,9 @@ EXTRA_JS_MODULES += [
     'ResourceStatsService.jsm',
 ]
 
-TEST_DIRS += ['tests']
-
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['MOZ_B2G_RIL']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
diff --git a/dom/resourcestats/tests/moz.build b/dom/resourcestats/tests/moz.build
deleted file mode 100644
index fb14732db91..00000000000
--- a/dom/resourcestats/tests/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['MOZ_B2G_RIL']:
-    XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
-
-MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
diff --git a/dom/settings/moz.build b/dom/settings/moz.build
index de2d83f972c..63cdc1ed4fd 100644
--- a/dom/settings/moz.build
+++ b/dom/settings/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
-
 EXTRA_COMPONENTS += [
     'SettingsManager.js',
     'SettingsManager.manifest',
@@ -17,8 +15,12 @@ if CONFIG['MOZ_B2G']:
         'SettingsService.manifest',
     ]
 
+    MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+
 EXTRA_JS_MODULES += [
     'SettingsChangeNotifier.jsm',
     'SettingsDB.jsm',
     'SettingsQueue.jsm',
 ]
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
diff --git a/dom/settings/tests/moz.build b/dom/settings/tests/moz.build
deleted file mode 100644
index e7491d5470f..00000000000
--- a/dom/settings/tests/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-if CONFIG['MOZ_B2G']:
-    MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build
index d277450c9e7..83389f02dfa 100644
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS += [
     'nsJSON.h',
 ]
@@ -21,3 +19,6 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/src/json/test/moz.build b/dom/src/json/test/moz.build
deleted file mode 100644
index b4ecb536e86..00000000000
--- a/dom/src/json/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build
index c0b41d917f0..608d4be0106 100644
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
@@ -22,3 +20,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/dom/src/jsurl/test/moz.build b/dom/src/jsurl/test/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/src/jsurl/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/system/moz.build b/dom/system/moz.build
index 62056a046dd..bb917648c09 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -6,7 +6,7 @@
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
-if toolkit in ('qt'):
+if toolkit == 'qt':
     DIRS += ['qt']
 elif toolkit == 'windows':
     DIRS += ['windows']
@@ -17,8 +17,6 @@ elif toolkit == 'android':
 elif toolkit == 'gonk':
     DIRS += ['gonk']
 
-TEST_DIRS += ['tests']
-
 XPIDL_SOURCES += [
     'nsIOSFileConstantsService.idl',
 ]
@@ -57,3 +55,5 @@ LOCAL_INCLUDES += [
 
 DEFINES['DLL_PREFIX'] = '"%s"' % CONFIG['DLL_PREFIX']
 DEFINES['DLL_SUFFIX'] = '"%s"' % CONFIG['DLL_SUFFIX']
+
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
diff --git a/dom/system/tests/moz.build b/dom/system/tests/moz.build
deleted file mode 100644
index 87c88dfddbc..00000000000
--- a/dom/system/tests/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/tests/mochitest/ajax/moz.build b/dom/tests/mochitest/ajax/moz.build
deleted file mode 100644
index aa00ad4bec8..00000000000
--- a/dom/tests/mochitest/ajax/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += [
-    'jquery/mochitest.ini',
-    'lib/mochitest.ini',
-    'mochikit/mochitest.ini',
-    'mochikit/tests/mochitest.ini',
-    'offline/mochitest.ini',
-    'prototype/mochitest.ini',
-    'scriptaculous/mochitest.ini',
-]
-
diff --git a/dom/tests/mochitest/beacon/moz.build b/dom/tests/mochitest/beacon/moz.build
deleted file mode 100644
index 76deffb6d1f..00000000000
--- a/dom/tests/mochitest/beacon/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/tests/mochitest/bugs/moz.build b/dom/tests/mochitest/bugs/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/bugs/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/dom-level0/moz.build b/dom/tests/mochitest/dom-level0/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/dom-level0/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/gamepad/Makefile.in b/dom/tests/mochitest/gamepad/Makefile.in
deleted file mode 100644
index 9ae77193a8a..00000000000
--- a/dom/tests/mochitest/gamepad/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-relativesrcdir	= dom/tests/mochitest/gamepad
-
diff --git a/dom/tests/mochitest/gamepad/moz.build b/dom/tests/mochitest/gamepad/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/gamepad/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/general/moz.build b/dom/tests/mochitest/general/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/tests/mochitest/general/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/tests/mochitest/geolocation/moz.build b/dom/tests/mochitest/geolocation/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/geolocation/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/localstorage/moz.build b/dom/tests/mochitest/localstorage/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/tests/mochitest/localstorage/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/tests/mochitest/moz.build b/dom/tests/mochitest/moz.build
deleted file mode 100644
index 4837747975a..00000000000
--- a/dom/tests/mochitest/moz.build
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += [
-    'dom-level0',
-    'ajax',
-    'beacon',
-    'bugs',
-    'general',
-    'geolocation',
-    'localstorage',
-    'orientation',
-    'sessionstorage',
-    'storageevent',
-    'notification',
-    'webcomponents',
-]
-
-if CONFIG['MOZ_GAMEPAD']:
-   DIRS += ['gamepad']
-
-MOCHITEST_MANIFESTS += [
-    'crypto/mochitest.ini',
-    'dom-level1-core/mochitest.ini',
-    'dom-level2-core/mochitest.ini',
-    'dom-level2-html/mochitest.ini',
-    'webapps/mochitest.ini',
-    'whatwg/mochitest.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'chrome/chrome.ini',
-    'webapps/chrome.ini',
-    'whatwg/chrome.ini',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk2':
-    # Bug 788164.
-    MOCHITEST_MANIFESTS += [
-        'pointerlock/mochitest.ini',
-    ]
-
-if CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
-   MOCHITEST_MANIFESTS += [
-      'crypto/mochitest-no-legacy.ini',
-   ]
-else:
-   MOCHITEST_MANIFESTS += [
-      'crypto/mochitest-legacy.ini',
-   ]
diff --git a/dom/tests/mochitest/notification/moz.build b/dom/tests/mochitest/notification/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/tests/mochitest/notification/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/tests/mochitest/orientation/moz.build b/dom/tests/mochitest/orientation/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/orientation/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/sessionstorage/moz.build b/dom/tests/mochitest/sessionstorage/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/tests/mochitest/sessionstorage/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/tests/mochitest/storageevent/moz.build b/dom/tests/mochitest/storageevent/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/storageevent/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/mochitest/webcomponents/moz.build b/dom/tests/mochitest/webcomponents/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/tests/mochitest/webcomponents/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index d2dbab521e5..829c585815d 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -4,7 +4,62 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['mochitest']
+MOCHITEST_MANIFESTS += [
+    'mochitest/ajax/jquery/mochitest.ini',
+    'mochitest/ajax/lib/mochitest.ini',
+    'mochitest/ajax/mochikit/mochitest.ini',
+    'mochitest/ajax/mochikit/tests/mochitest.ini',
+    'mochitest/ajax/offline/mochitest.ini',
+    'mochitest/ajax/prototype/mochitest.ini',
+    'mochitest/ajax/scriptaculous/mochitest.ini',
+    'mochitest/beacon/mochitest.ini',
+    'mochitest/bugs/mochitest.ini',
+    'mochitest/crypto/mochitest.ini',
+    'mochitest/dom-level0/mochitest.ini',
+    'mochitest/dom-level1-core/mochitest.ini',
+    'mochitest/dom-level2-core/mochitest.ini',
+    'mochitest/dom-level2-html/mochitest.ini',
+    'mochitest/general/mochitest.ini',
+    'mochitest/geolocation/mochitest.ini',
+    'mochitest/localstorage/mochitest.ini',
+    'mochitest/notification/mochitest.ini',
+    'mochitest/orientation/mochitest.ini',
+    'mochitest/sessionstorage/mochitest.ini',
+    'mochitest/storageevent/mochitest.ini',
+    'mochitest/webapps/mochitest.ini',
+    'mochitest/webcomponents/mochitest.ini',
+    'mochitest/whatwg/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'mochitest/beacon/chrome.ini',
+    'mochitest/chrome/chrome.ini',
+    'mochitest/general/chrome.ini',
+    'mochitest/localstorage/chrome.ini',
+    'mochitest/sessionstorage/chrome.ini',
+    'mochitest/webapps/chrome.ini',
+    'mochitest/whatwg/chrome.ini',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk2':
+    # Bug 788164.
+    MOCHITEST_MANIFESTS += [
+        'mochitest/pointerlock/mochitest.ini',
+    ]
+
+if CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
+    MOCHITEST_MANIFESTS += [
+        'mochitest/crypto/mochitest-no-legacy.ini',
+    ]
+else:
+    MOCHITEST_MANIFESTS += [
+        'mochitest/crypto/mochitest-legacy.ini',
+    ]
+
+if CONFIG['MOZ_GAMEPAD']:
+    MOCHITEST_MANIFESTS += [
+        'mochitest/gamepad/mochitest.ini',
+    ]
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
diff --git a/dom/workers/moz.build b/dom/workers/moz.build
index 66975d5643e..eee48316a6a 100644
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 # Public stuff.
 EXPORTS.mozilla.dom += [
     'ServiceWorkerContainer.h',
@@ -76,3 +74,17 @@ LOCAL_INCLUDES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+TEST_DIRS += [
+    'test/extensions/bootstrap',
+    'test/extensions/traditional',
+]
+
+MOCHITEST_MANIFESTS += [
+    'test/mochitest.ini',
+    'test/serviceworkers/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
diff --git a/dom/workers/test/moz.build b/dom/workers/test/moz.build
deleted file mode 100644
index ae9dc4af329..00000000000
--- a/dom/workers/test/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += [
-    'extensions',
-    'serviceworkers',
-]
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
-XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/dom/workers/test/serviceworkers/moz.build b/dom/workers/test/serviceworkers/moz.build
deleted file mode 100644
index 8421b15157a..00000000000
--- a/dom/workers/test/serviceworkers/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
index af0524e67b6..a87a3e78abc 100644
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['builtin']
-TEST_DIRS += ['test']
 
 EXPORTS += [
     'nsBindingManager.h',
@@ -52,3 +51,6 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
diff --git a/dom/xbl/test/moz.build b/dom/xbl/test/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/dom/xbl/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/dom/xslt/moz.build b/dom/xslt/moz.build
index a9ea0a9196c..76d70047109 100644
--- a/dom/xslt/moz.build
+++ b/dom/xslt/moz.build
@@ -27,7 +27,6 @@ PARALLEL_DIRS += [
     'xslt',
 ]
 
-TEST_DIRS += [
-    'tests/buster',
-    'tests/mochitest',
-]
+if CONFIG['ENABLE_TESTS']:
+    JAR_MANIFESTS += ['tests/buster/jar.mn']
+    MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
diff --git a/dom/xslt/tests/buster/moz.build b/dom/xslt/tests/buster/moz.build
deleted file mode 100644
index c97072bba2d..00000000000
--- a/dom/xslt/tests/buster/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/dom/xslt/tests/mochitest/moz.build b/dom/xslt/tests/mochitest/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/dom/xslt/tests/mochitest/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

From a107e396fa97791bbf28b3e07fadee883ced06be Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 26 Jul 2014 03:30:56 -0400
Subject: [PATCH 047/128] Back out bug 1031945 for now because we have silly
 pref settings on mobile and dumb tests.  a=orange

---
 dom/base/nsGlobalWindow.cpp | 17 +----------------
 dom/base/nsGlobalWindow.h   |  3 ---
 dom/webidl/Window.webidl    |  3 +--
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index aa8b45278b9..4991e4fa1f3 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -4365,21 +4365,6 @@ nsGlobalWindow::IsChromeWindow(JSContext* aCx, JSObject* aObj)
   return xpc::WindowOrNull(aObj)->IsChromeWindow();
 }
 
-/* static */ bool
-nsGlobalWindow::IsShowModalDialogEnabled(JSContext*, JSObject*)
-{
-  static bool sAddedPrefCache = false;
-  static bool sIsDisabled;
-  static const char sShowModalDialogPref[] = "dom.disable_window_showModalDialog";
-
-  if (!sAddedPrefCache) {
-    Preferences::AddBoolVarCache(&sIsDisabled, sShowModalDialogPref, false);
-    sAddedPrefCache = true;
-  }
-
-  return !sIsDisabled;
-}
-
 nsIDOMOfflineResourceList*
 nsGlobalWindow::GetApplicationCache(ErrorResult& aError)
 {
@@ -9136,7 +9121,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aUrl, nsIVariant* aArgument,
                             (aUrl, aArgument, aOptions, aError), aError,
                             nullptr);
 
-  if (!IsShowModalDialogEnabled()) {
+  if (Preferences::GetBool("dom.disable_window_showModalDialog", false)) {
     aError.Throw(NS_ERROR_NOT_AVAILABLE);
     return nullptr;
   }
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 31a8811bdc1..f0052b94c24 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -512,9 +512,6 @@ public:
 
   static bool IsChromeWindow(JSContext* /* unused */, JSObject* aObj);
 
-  static bool IsShowModalDialogEnabled(JSContext* /* unused */ = nullptr,
-                                       JSObject* /* unused */ = nullptr);
-
   bool DoNewResolve(JSContext* aCx, JS::Handle<JSObject*> aObj,
                     JS::Handle<jsid> aId,
                     JS::MutableHandle<JSPropertyDescriptor> aDesc);
diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
index 94d2160c5f4..caec3bc67c9 100644
--- a/dom/webidl/Window.webidl
+++ b/dom/webidl/Window.webidl
@@ -79,8 +79,7 @@ typedef any Transferable;
   [Throws] DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
   [Throws] void print();
   //[Throws] any showModalDialog(DOMString url, optional any argument);
-  [Throws, Func="nsGlobalWindow::IsShowModalDialogEnabled"]
-  any showModalDialog(DOMString url, optional any argument, optional DOMString options = "");
+  [Throws] any showModalDialog(DOMString url, optional any argument, optional DOMString options = "");
 
   [Throws, CrossOriginCallable] void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);
 

From 47b1ca614089e0b9a8a1bfdd5035176c2862e43b Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:31:41 -0700
Subject: [PATCH 048/128] Bug 1038458 - Part 1: Flatten
 browser/components/customizableui/src/ directory. r=mak

--HG--
rename : browser/components/customizableui/src/CustomizableUI.jsm => browser/components/customizableui/CustomizableUI.jsm
rename : browser/components/customizableui/src/CustomizableWidgets.jsm => browser/components/customizableui/CustomizableWidgets.jsm
rename : browser/components/customizableui/src/CustomizeMode.jsm => browser/components/customizableui/CustomizeMode.jsm
rename : browser/components/customizableui/src/DragPositionManager.jsm => browser/components/customizableui/DragPositionManager.jsm
rename : browser/components/customizableui/src/PanelWideWidgetTracker.jsm => browser/components/customizableui/PanelWideWidgetTracker.jsm
rename : browser/components/customizableui/src/ScrollbarSampler.jsm => browser/components/customizableui/ScrollbarSampler.jsm
rename : browser/components/customizableui/src/logging.js => browser/components/customizableui/logging.js
---
 .../{src => }/CustomizableUI.jsm              |  0
 .../{src => }/CustomizableWidgets.jsm         |  0
 .../{src => }/CustomizeMode.jsm               |  0
 .../{src => }/DragPositionManager.jsm         |  0
 .../{src => }/PanelWideWidgetTracker.jsm      |  0
 .../{src => }/ScrollbarSampler.jsm            |  0
 .../customizableui/{src => }/logging.js       |  0
 browser/components/customizableui/moz.build   | 21 +++++++++++++++-
 .../components/customizableui/src/moz.build   | 25 -------------------
 9 files changed, 20 insertions(+), 26 deletions(-)
 rename browser/components/customizableui/{src => }/CustomizableUI.jsm (100%)
 rename browser/components/customizableui/{src => }/CustomizableWidgets.jsm (100%)
 rename browser/components/customizableui/{src => }/CustomizeMode.jsm (100%)
 rename browser/components/customizableui/{src => }/DragPositionManager.jsm (100%)
 rename browser/components/customizableui/{src => }/PanelWideWidgetTracker.jsm (100%)
 rename browser/components/customizableui/{src => }/ScrollbarSampler.jsm (100%)
 rename browser/components/customizableui/{src => }/logging.js (100%)
 delete mode 100644 browser/components/customizableui/src/moz.build

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
similarity index 100%
rename from browser/components/customizableui/src/CustomizableUI.jsm
rename to browser/components/customizableui/CustomizableUI.jsm
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
similarity index 100%
rename from browser/components/customizableui/src/CustomizableWidgets.jsm
rename to browser/components/customizableui/CustomizableWidgets.jsm
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm
similarity index 100%
rename from browser/components/customizableui/src/CustomizeMode.jsm
rename to browser/components/customizableui/CustomizeMode.jsm
diff --git a/browser/components/customizableui/src/DragPositionManager.jsm b/browser/components/customizableui/DragPositionManager.jsm
similarity index 100%
rename from browser/components/customizableui/src/DragPositionManager.jsm
rename to browser/components/customizableui/DragPositionManager.jsm
diff --git a/browser/components/customizableui/src/PanelWideWidgetTracker.jsm b/browser/components/customizableui/PanelWideWidgetTracker.jsm
similarity index 100%
rename from browser/components/customizableui/src/PanelWideWidgetTracker.jsm
rename to browser/components/customizableui/PanelWideWidgetTracker.jsm
diff --git a/browser/components/customizableui/src/ScrollbarSampler.jsm b/browser/components/customizableui/ScrollbarSampler.jsm
similarity index 100%
rename from browser/components/customizableui/src/ScrollbarSampler.jsm
rename to browser/components/customizableui/ScrollbarSampler.jsm
diff --git a/browser/components/customizableui/src/logging.js b/browser/components/customizableui/logging.js
similarity index 100%
rename from browser/components/customizableui/src/logging.js
rename to browser/components/customizableui/logging.js
diff --git a/browser/components/customizableui/moz.build b/browser/components/customizableui/moz.build
index 0f9ebfb4c11..4c20c05f55f 100644
--- a/browser/components/customizableui/moz.build
+++ b/browser/components/customizableui/moz.build
@@ -6,7 +6,26 @@
 
 PARALLEL_DIRS += [
     'content',
-    'src',
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+EXTRA_JS_MODULES += [
+    'DragPositionManager.jsm',
+    'ScrollbarSampler.jsm',
+]
+
+DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
+    DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
+
+EXTRA_PP_JS_MODULES += [
+    'CustomizableUI.jsm',
+    'CustomizableWidgets.jsm',
+    'CustomizeMode.jsm',
+    'PanelWideWidgetTracker.jsm',
+]
diff --git a/browser/components/customizableui/src/moz.build b/browser/components/customizableui/src/moz.build
deleted file mode 100644
index f5e98c08c5d..00000000000
--- a/browser/components/customizableui/src/moz.build
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_JS_MODULES += [
-    'DragPositionManager.jsm',
-    'ScrollbarSampler.jsm',
-]
-
-DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
-    DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
-
-EXTRA_PP_JS_MODULES += [
-    'CustomizableUI.jsm',
-    'CustomizableWidgets.jsm',
-    'CustomizeMode.jsm',
-    'PanelWideWidgetTracker.jsm',
-]

From 3bf9435aaf118923a6de0ef9e3191b132fe460d1 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:31:46 -0700
Subject: [PATCH 049/128] Bug 1038458 - Part 2: Flatten
 browser/components/downloads/src/ directory. r=mak

--HG--
rename : browser/components/downloads/src/BrowserDownloads.manifest => browser/components/downloads/BrowserDownloads.manifest
rename : browser/components/downloads/src/DownloadsCommon.jsm => browser/components/downloads/DownloadsCommon.jsm
rename : browser/components/downloads/src/DownloadsLogger.jsm => browser/components/downloads/DownloadsLogger.jsm
rename : browser/components/downloads/src/DownloadsStartup.js => browser/components/downloads/DownloadsStartup.js
rename : browser/components/downloads/src/DownloadsTaskbar.jsm => browser/components/downloads/DownloadsTaskbar.jsm
rename : browser/components/downloads/src/DownloadsUI.js => browser/components/downloads/DownloadsUI.js
---
 .../{src => }/BrowserDownloads.manifest       |  0
 .../downloads/{src => }/DownloadsCommon.jsm   |  0
 .../downloads/{src => }/DownloadsLogger.jsm   |  0
 .../downloads/{src => }/DownloadsStartup.js   |  0
 .../downloads/{src => }/DownloadsTaskbar.jsm  |  0
 .../downloads/{src => }/DownloadsUI.js        |  0
 browser/components/downloads/moz.build        | 19 ++++++++++++-------
 browser/components/downloads/src/moz.build    | 18 ------------------
 8 files changed, 12 insertions(+), 25 deletions(-)
 rename browser/components/downloads/{src => }/BrowserDownloads.manifest (100%)
 rename browser/components/downloads/{src => }/DownloadsCommon.jsm (100%)
 rename browser/components/downloads/{src => }/DownloadsLogger.jsm (100%)
 rename browser/components/downloads/{src => }/DownloadsStartup.js (100%)
 rename browser/components/downloads/{src => }/DownloadsTaskbar.jsm (100%)
 rename browser/components/downloads/{src => }/DownloadsUI.js (100%)
 delete mode 100644 browser/components/downloads/src/moz.build

diff --git a/browser/components/downloads/src/BrowserDownloads.manifest b/browser/components/downloads/BrowserDownloads.manifest
similarity index 100%
rename from browser/components/downloads/src/BrowserDownloads.manifest
rename to browser/components/downloads/BrowserDownloads.manifest
diff --git a/browser/components/downloads/src/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm
similarity index 100%
rename from browser/components/downloads/src/DownloadsCommon.jsm
rename to browser/components/downloads/DownloadsCommon.jsm
diff --git a/browser/components/downloads/src/DownloadsLogger.jsm b/browser/components/downloads/DownloadsLogger.jsm
similarity index 100%
rename from browser/components/downloads/src/DownloadsLogger.jsm
rename to browser/components/downloads/DownloadsLogger.jsm
diff --git a/browser/components/downloads/src/DownloadsStartup.js b/browser/components/downloads/DownloadsStartup.js
similarity index 100%
rename from browser/components/downloads/src/DownloadsStartup.js
rename to browser/components/downloads/DownloadsStartup.js
diff --git a/browser/components/downloads/src/DownloadsTaskbar.jsm b/browser/components/downloads/DownloadsTaskbar.jsm
similarity index 100%
rename from browser/components/downloads/src/DownloadsTaskbar.jsm
rename to browser/components/downloads/DownloadsTaskbar.jsm
diff --git a/browser/components/downloads/src/DownloadsUI.js b/browser/components/downloads/DownloadsUI.js
similarity index 100%
rename from browser/components/downloads/src/DownloadsUI.js
rename to browser/components/downloads/DownloadsUI.js
diff --git a/browser/components/downloads/moz.build b/browser/components/downloads/moz.build
index e43c5774c55..d93cfa1853c 100644
--- a/browser/components/downloads/moz.build
+++ b/browser/components/downloads/moz.build
@@ -4,14 +4,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+EXTRA_COMPONENTS += [
+    'BrowserDownloads.manifest',
+    'DownloadsStartup.js',
+    'DownloadsUI.js',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser/browser.ini',
+EXTRA_JS_MODULES += [
+    'DownloadsCommon.jsm',
+    'DownloadsLogger.jsm',
+    'DownloadsTaskbar.jsm',
 ]
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/components/downloads/src/moz.build b/browser/components/downloads/src/moz.build
deleted file mode 100644
index f7b6c7e686c..00000000000
--- a/browser/components/downloads/src/moz.build
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'BrowserDownloads.manifest',
-    'DownloadsStartup.js',
-    'DownloadsUI.js',
-]
-
-EXTRA_JS_MODULES += [
-    'DownloadsCommon.jsm',
-    'DownloadsLogger.jsm',
-    'DownloadsTaskbar.jsm',
-]
-

From 463453b4689d60da09c357d53d2c491335ddf26e Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:31:52 -0700
Subject: [PATCH 050/128] Bug 1038458 - Part 3: Flatten
 browser/components/feeds/{public,src}/ directories. r=mak

--HG--
rename : browser/components/feeds/src/BrowserFeeds.manifest => browser/components/feeds/BrowserFeeds.manifest
rename : browser/components/feeds/src/FeedConverter.js => browser/components/feeds/FeedConverter.js
rename : browser/components/feeds/src/FeedWriter.js => browser/components/feeds/FeedWriter.js
rename : browser/components/feeds/src/WebContentConverter.js => browser/components/feeds/WebContentConverter.js
rename : browser/components/feeds/src/nsFeedSniffer.cpp => browser/components/feeds/nsFeedSniffer.cpp
rename : browser/components/feeds/src/nsFeedSniffer.h => browser/components/feeds/nsFeedSniffer.h
rename : browser/components/feeds/public/nsIFeedResultService.idl => browser/components/feeds/nsIFeedResultService.idl
rename : browser/components/feeds/public/nsIWebContentConverterRegistrar.idl => browser/components/feeds/nsIWebContentConverterRegistrar.idl
---
 browser/base/content/browser.js               |  2 +-
 browser/components/build/moz.build            |  2 +-
 .../feeds/{src => }/BrowserFeeds.manifest     |  0
 .../feeds/{src => }/FeedConverter.js          |  0
 .../components/feeds/{src => }/FeedWriter.js  |  0
 .../feeds/{src => }/WebContentConverter.js    |  0
 browser/components/feeds/moz.build            | 36 ++++++++++++++-----
 .../feeds/{src => }/nsFeedSniffer.cpp         |  0
 .../feeds/{src => }/nsFeedSniffer.h           |  0
 .../{public => }/nsIFeedResultService.idl     |  0
 .../nsIWebContentConverterRegistrar.idl       |  0
 browser/components/feeds/public/moz.build     | 13 -------
 browser/components/feeds/src/moz.build        | 29 ---------------
 13 files changed, 30 insertions(+), 52 deletions(-)
 rename browser/components/feeds/{src => }/BrowserFeeds.manifest (100%)
 rename browser/components/feeds/{src => }/FeedConverter.js (100%)
 rename browser/components/feeds/{src => }/FeedWriter.js (100%)
 rename browser/components/feeds/{src => }/WebContentConverter.js (100%)
 rename browser/components/feeds/{src => }/nsFeedSniffer.cpp (100%)
 rename browser/components/feeds/{src => }/nsFeedSniffer.h (100%)
 rename browser/components/feeds/{public => }/nsIFeedResultService.idl (100%)
 rename browser/components/feeds/{public => }/nsIWebContentConverterRegistrar.idl (100%)
 delete mode 100644 browser/components/feeds/public/moz.build
 delete mode 100644 browser/components/feeds/src/moz.build

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 74e0fbd4253..f90ed9b0956 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5604,7 +5604,7 @@ var OfflineApps = {
   // OfflineApps Implementation Methods
 
   // XXX: _getBrowserWindowForContentWindow and _getBrowserForContentWindow
-  // were taken from browser/components/feeds/src/WebContentConverter.
+  // were taken from browser/components/feeds/WebContentConverter.
   _getBrowserWindowForContentWindow: function(aContentWindow) {
     return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                          .getInterface(Ci.nsIWebNavigation)
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 3c6f304fcde..262ec6198fb 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -19,7 +19,7 @@ IS_COMPONENT = True
 LOCAL_INCLUDES += [
     '../about',
     '../dirprovider',
-    '../feeds/src',
+    '../feeds',
     '../migration/src',
     '../shell/src',
 ]
diff --git a/browser/components/feeds/src/BrowserFeeds.manifest b/browser/components/feeds/BrowserFeeds.manifest
similarity index 100%
rename from browser/components/feeds/src/BrowserFeeds.manifest
rename to browser/components/feeds/BrowserFeeds.manifest
diff --git a/browser/components/feeds/src/FeedConverter.js b/browser/components/feeds/FeedConverter.js
similarity index 100%
rename from browser/components/feeds/src/FeedConverter.js
rename to browser/components/feeds/FeedConverter.js
diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/FeedWriter.js
similarity index 100%
rename from browser/components/feeds/src/FeedWriter.js
rename to browser/components/feeds/FeedWriter.js
diff --git a/browser/components/feeds/src/WebContentConverter.js b/browser/components/feeds/WebContentConverter.js
similarity index 100%
rename from browser/components/feeds/src/WebContentConverter.js
rename to browser/components/feeds/WebContentConverter.js
diff --git a/browser/components/feeds/moz.build b/browser/components/feeds/moz.build
index 97ead0f9873..429339039a9 100644
--- a/browser/components/feeds/moz.build
+++ b/browser/components/feeds/moz.build
@@ -4,18 +4,38 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+XPIDL_SOURCES += [
+    'nsIFeedResultService.idl',
+    'nsIWebContentConverterRegistrar.idl',
 ]
 
-MOCHITEST_CHROME_MANIFESTS += [
-    'test/chrome/chrome.ini',
+XPIDL_MODULE = 'browser-feeds'
+
+SOURCES += [
+    'nsFeedSniffer.cpp',
 ]
 
-MOCHITEST_MANIFESTS += [
-    'test/mochitest.ini'
+EXTRA_COMPONENTS += [
+    'BrowserFeeds.manifest',
+    'FeedConverter.js',
+    'WebContentConverter.js',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+EXTRA_PP_COMPONENTS += [
+    'FeedWriter.js',
+]
+
+FINAL_LIBRARY = 'browsercomps'
+
+for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
+    DEFINES[var] = CONFIG[var]
+
+LOCAL_INCLUDES += [
+    '../build',
+]
diff --git a/browser/components/feeds/src/nsFeedSniffer.cpp b/browser/components/feeds/nsFeedSniffer.cpp
similarity index 100%
rename from browser/components/feeds/src/nsFeedSniffer.cpp
rename to browser/components/feeds/nsFeedSniffer.cpp
diff --git a/browser/components/feeds/src/nsFeedSniffer.h b/browser/components/feeds/nsFeedSniffer.h
similarity index 100%
rename from browser/components/feeds/src/nsFeedSniffer.h
rename to browser/components/feeds/nsFeedSniffer.h
diff --git a/browser/components/feeds/public/nsIFeedResultService.idl b/browser/components/feeds/nsIFeedResultService.idl
similarity index 100%
rename from browser/components/feeds/public/nsIFeedResultService.idl
rename to browser/components/feeds/nsIFeedResultService.idl
diff --git a/browser/components/feeds/public/nsIWebContentConverterRegistrar.idl b/browser/components/feeds/nsIWebContentConverterRegistrar.idl
similarity index 100%
rename from browser/components/feeds/public/nsIWebContentConverterRegistrar.idl
rename to browser/components/feeds/nsIWebContentConverterRegistrar.idl
diff --git a/browser/components/feeds/public/moz.build b/browser/components/feeds/public/moz.build
deleted file mode 100644
index 664ff93bd40..00000000000
--- a/browser/components/feeds/public/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIFeedResultService.idl',
-    'nsIWebContentConverterRegistrar.idl',
-]
-
-XPIDL_MODULE = 'browser-feeds'
-
diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build
deleted file mode 100644
index 31639f79396..00000000000
--- a/browser/components/feeds/src/moz.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-SOURCES += [
-    'nsFeedSniffer.cpp',
-]
-
-EXTRA_COMPONENTS += [
-    'BrowserFeeds.manifest',
-    'FeedConverter.js',
-    'WebContentConverter.js',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'FeedWriter.js',
-]
-
-FINAL_LIBRARY = 'browsercomps'
-
-for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
-    DEFINES[var] = CONFIG[var]
-
-LOCAL_INCLUDES += [
-    '../../build',
-]
-

From a42b197151e61bd34cd368725f68917560fe9418 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:31:57 -0700
Subject: [PATCH 051/128] Bug 1038458 - Part 4: Flatten
 browser/components/migration/{public,src}/ directories. r=mak

--HG--
rename : browser/components/migration/src/BrowserProfileMigrators.manifest => browser/components/migration/BrowserProfileMigrators.manifest
rename : browser/components/migration/src/ChromeProfileMigrator.js => browser/components/migration/ChromeProfileMigrator.js
rename : browser/components/migration/src/FirefoxProfileMigrator.js => browser/components/migration/FirefoxProfileMigrator.js
rename : browser/components/migration/src/IEProfileMigrator.js => browser/components/migration/IEProfileMigrator.js
rename : browser/components/migration/src/MigrationUtils.jsm => browser/components/migration/MigrationUtils.jsm
rename : browser/components/migration/src/ProfileMigrator.js => browser/components/migration/ProfileMigrator.js
rename : browser/components/migration/src/SafariProfileMigrator.js => browser/components/migration/SafariProfileMigrator.js
rename : browser/components/migration/public/nsIBrowserProfileMigrator.idl => browser/components/migration/nsIBrowserProfileMigrator.idl
rename : browser/components/migration/src/nsIEHistoryEnumerator.cpp => browser/components/migration/nsIEHistoryEnumerator.cpp
rename : browser/components/migration/src/nsIEHistoryEnumerator.h => browser/components/migration/nsIEHistoryEnumerator.h
---
 browser/components/build/moz.build            |  2 +-
 .../BrowserProfileMigrators.manifest          |  0
 .../{src => }/ChromeProfileMigrator.js        |  0
 .../{src => }/FirefoxProfileMigrator.js       |  0
 .../migration/{src => }/IEProfileMigrator.js  |  0
 .../migration/{src => }/MigrationUtils.jsm    |  0
 .../migration/{src => }/ProfileMigrator.js    |  0
 .../{src => }/SafariProfileMigrator.js        |  0
 browser/components/migration/moz.build        | 49 +++++++++++++++++--
 .../nsIBrowserProfileMigrator.idl             |  0
 .../{src => }/nsIEHistoryEnumerator.cpp       |  0
 .../{src => }/nsIEHistoryEnumerator.h         |  0
 browser/components/migration/public/moz.build | 12 -----
 browser/components/migration/src/moz.build    | 44 -----------------
 14 files changed, 46 insertions(+), 61 deletions(-)
 rename browser/components/migration/{src => }/BrowserProfileMigrators.manifest (100%)
 rename browser/components/migration/{src => }/ChromeProfileMigrator.js (100%)
 rename browser/components/migration/{src => }/FirefoxProfileMigrator.js (100%)
 rename browser/components/migration/{src => }/IEProfileMigrator.js (100%)
 rename browser/components/migration/{src => }/MigrationUtils.jsm (100%)
 rename browser/components/migration/{src => }/ProfileMigrator.js (100%)
 rename browser/components/migration/{src => }/SafariProfileMigrator.js (100%)
 rename browser/components/migration/{public => }/nsIBrowserProfileMigrator.idl (100%)
 rename browser/components/migration/{src => }/nsIEHistoryEnumerator.cpp (100%)
 rename browser/components/migration/{src => }/nsIEHistoryEnumerator.h (100%)
 delete mode 100644 browser/components/migration/public/moz.build
 delete mode 100644 browser/components/migration/src/moz.build

diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 262ec6198fb..6b6b57adcdb 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -20,7 +20,7 @@ LOCAL_INCLUDES += [
     '../about',
     '../dirprovider',
     '../feeds',
-    '../migration/src',
+    '../migration',
     '../shell/src',
 ]
 
diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/BrowserProfileMigrators.manifest
similarity index 100%
rename from browser/components/migration/src/BrowserProfileMigrators.manifest
rename to browser/components/migration/BrowserProfileMigrators.manifest
diff --git a/browser/components/migration/src/ChromeProfileMigrator.js b/browser/components/migration/ChromeProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/ChromeProfileMigrator.js
rename to browser/components/migration/ChromeProfileMigrator.js
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/FirefoxProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/FirefoxProfileMigrator.js
rename to browser/components/migration/FirefoxProfileMigrator.js
diff --git a/browser/components/migration/src/IEProfileMigrator.js b/browser/components/migration/IEProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/IEProfileMigrator.js
rename to browser/components/migration/IEProfileMigrator.js
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
similarity index 100%
rename from browser/components/migration/src/MigrationUtils.jsm
rename to browser/components/migration/MigrationUtils.jsm
diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/ProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/ProfileMigrator.js
rename to browser/components/migration/ProfileMigrator.js
diff --git a/browser/components/migration/src/SafariProfileMigrator.js b/browser/components/migration/SafariProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/SafariProfileMigrator.js
rename to browser/components/migration/SafariProfileMigrator.js
diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build
index 857759511de..ca9aea4c28e 100644
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -4,10 +4,51 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+XPIDL_SOURCES += [
+    'nsIBrowserProfileMigrator.idl',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+XPIDL_MODULE = 'migration'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    SOURCES += [
+        'nsIEHistoryEnumerator.cpp',
+    ]
+
+EXTRA_COMPONENTS += [
+    'FirefoxProfileMigrator.js',
+    'ProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_COMPONENTS += [
+        'IEProfileMigrator.js',
+    ]
+    DEFINES['HAS_IE_MIGRATOR'] = True
+
+EXTRA_PP_COMPONENTS += [
+    'BrowserProfileMigrators.manifest',
+    'ChromeProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+EXTRA_PP_JS_MODULES += [
+    'MigrationUtils.jsm',
+]
+
+FINAL_LIBRARY = 'browsercomps'
diff --git a/browser/components/migration/public/nsIBrowserProfileMigrator.idl b/browser/components/migration/nsIBrowserProfileMigrator.idl
similarity index 100%
rename from browser/components/migration/public/nsIBrowserProfileMigrator.idl
rename to browser/components/migration/nsIBrowserProfileMigrator.idl
diff --git a/browser/components/migration/src/nsIEHistoryEnumerator.cpp b/browser/components/migration/nsIEHistoryEnumerator.cpp
similarity index 100%
rename from browser/components/migration/src/nsIEHistoryEnumerator.cpp
rename to browser/components/migration/nsIEHistoryEnumerator.cpp
diff --git a/browser/components/migration/src/nsIEHistoryEnumerator.h b/browser/components/migration/nsIEHistoryEnumerator.h
similarity index 100%
rename from browser/components/migration/src/nsIEHistoryEnumerator.h
rename to browser/components/migration/nsIEHistoryEnumerator.h
diff --git a/browser/components/migration/public/moz.build b/browser/components/migration/public/moz.build
deleted file mode 100644
index b496622bc3c..00000000000
--- a/browser/components/migration/public/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIBrowserProfileMigrator.idl',
-]
-
-XPIDL_MODULE = 'migration'
-
diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build
deleted file mode 100644
index 43d08fe9e25..00000000000
--- a/browser/components/migration/src/moz.build
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsIEHistoryEnumerator.cpp',
-    ]
-
-EXTRA_COMPONENTS += [
-    'FirefoxProfileMigrator.js',
-    'ProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_COMPONENTS += [
-        'IEProfileMigrator.js',
-    ]
-    DEFINES['HAS_IE_MIGRATOR'] = True
-
-EXTRA_PP_COMPONENTS += [
-    'BrowserProfileMigrators.manifest',
-    'ChromeProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-EXTRA_PP_JS_MODULES += [
-    'MigrationUtils.jsm',
-]
-
-FINAL_LIBRARY = 'browsercomps'

From be8e08a9d6c337b9de950821faed2ffd61bb29f1 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:32:02 -0700
Subject: [PATCH 052/128] Bug 1038458 - Part 5: Flatten
 browser/components/places/src/ directory. r=mak

--HG--
rename : browser/components/places/src/BrowserPlaces.manifest => browser/components/places/BrowserPlaces.manifest
rename : browser/components/places/src/PlacesProtocolHandler.js => browser/components/places/PlacesProtocolHandler.js
rename : browser/components/places/src/PlacesUIUtils.jsm => browser/components/places/PlacesUIUtils.jsm
---
 .../places/{src => }/BrowserPlaces.manifest   |  0
 .../places/{src => }/PlacesProtocolHandler.js |  0
 .../places/{src => }/PlacesUIUtils.jsm        |  0
 browser/components/places/moz.build           | 21 +++++++++----------
 browser/components/places/src/moz.build       | 15 -------------
 5 files changed, 10 insertions(+), 26 deletions(-)
 rename browser/components/places/{src => }/BrowserPlaces.manifest (100%)
 rename browser/components/places/{src => }/PlacesProtocolHandler.js (100%)
 rename browser/components/places/{src => }/PlacesUIUtils.jsm (100%)
 delete mode 100644 browser/components/places/src/moz.build

diff --git a/browser/components/places/src/BrowserPlaces.manifest b/browser/components/places/BrowserPlaces.manifest
similarity index 100%
rename from browser/components/places/src/BrowserPlaces.manifest
rename to browser/components/places/BrowserPlaces.manifest
diff --git a/browser/components/places/src/PlacesProtocolHandler.js b/browser/components/places/PlacesProtocolHandler.js
similarity index 100%
rename from browser/components/places/src/PlacesProtocolHandler.js
rename to browser/components/places/PlacesProtocolHandler.js
diff --git a/browser/components/places/src/PlacesUIUtils.jsm b/browser/components/places/PlacesUIUtils.jsm
similarity index 100%
rename from browser/components/places/src/PlacesUIUtils.jsm
rename to browser/components/places/PlacesUIUtils.jsm
diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build
index 68f83cd7e66..549531fd079 100644
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -4,18 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['src']
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
+BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+EXTRA_COMPONENTS += [
+    'BrowserPlaces.manifest',
+    'PlacesProtocolHandler.js',
 ]
 
-MOCHITEST_CHROME_MANIFESTS += [
-    'tests/chrome/chrome.ini'
+EXTRA_PP_JS_MODULES += [
+    'PlacesUIUtils.jsm',
 ]
-
-BROWSER_CHROME_MANIFESTS += [
-    'tests/browser/browser.ini',
-]
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/components/places/src/moz.build b/browser/components/places/src/moz.build
deleted file mode 100644
index cbeaf1cc811..00000000000
--- a/browser/components/places/src/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'BrowserPlaces.manifest',
-    'PlacesProtocolHandler.js',
-]
-
-EXTRA_PP_JS_MODULES += [
-    'PlacesUIUtils.jsm',
-]
-

From f0bc0952af001cf4b52e5dc6eb709583e840aa36 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:32:08 -0700
Subject: [PATCH 053/128] Bug 1038458 - Part 6: Flatten
 browser/components/sessionstore/src/ directory. r=mak

--HG--
rename : browser/components/sessionstore/src/ContentRestore.jsm => browser/components/sessionstore/ContentRestore.jsm
rename : browser/components/sessionstore/src/DocShellCapabilities.jsm => browser/components/sessionstore/DocShellCapabilities.jsm
rename : browser/components/sessionstore/src/FrameTree.jsm => browser/components/sessionstore/FrameTree.jsm
rename : browser/components/sessionstore/src/GlobalState.jsm => browser/components/sessionstore/GlobalState.jsm
rename : browser/components/sessionstore/src/PageStyle.jsm => browser/components/sessionstore/PageStyle.jsm
rename : browser/components/sessionstore/src/PrivacyFilter.jsm => browser/components/sessionstore/PrivacyFilter.jsm
rename : browser/components/sessionstore/src/PrivacyLevel.jsm => browser/components/sessionstore/PrivacyLevel.jsm
rename : browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm => browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
rename : browser/components/sessionstore/src/SessionCookies.jsm => browser/components/sessionstore/SessionCookies.jsm
rename : browser/components/sessionstore/src/SessionFile.jsm => browser/components/sessionstore/SessionFile.jsm
rename : browser/components/sessionstore/src/SessionHistory.jsm => browser/components/sessionstore/SessionHistory.jsm
rename : browser/components/sessionstore/src/SessionMigration.jsm => browser/components/sessionstore/SessionMigration.jsm
rename : browser/components/sessionstore/src/SessionSaver.jsm => browser/components/sessionstore/SessionSaver.jsm
rename : browser/components/sessionstore/src/SessionStorage.jsm => browser/components/sessionstore/SessionStorage.jsm
rename : browser/components/sessionstore/src/SessionStore.jsm => browser/components/sessionstore/SessionStore.jsm
rename : browser/components/sessionstore/src/SessionWorker.js => browser/components/sessionstore/SessionWorker.js
rename : browser/components/sessionstore/src/SessionWorker.jsm => browser/components/sessionstore/SessionWorker.jsm
rename : browser/components/sessionstore/src/TabAttributes.jsm => browser/components/sessionstore/TabAttributes.jsm
rename : browser/components/sessionstore/src/TabState.jsm => browser/components/sessionstore/TabState.jsm
rename : browser/components/sessionstore/src/TabStateCache.jsm => browser/components/sessionstore/TabStateCache.jsm
rename : browser/components/sessionstore/src/Utils.jsm => browser/components/sessionstore/Utils.jsm
rename : browser/components/sessionstore/src/nsSessionStartup.js => browser/components/sessionstore/nsSessionStartup.js
rename : browser/components/sessionstore/src/nsSessionStore.js => browser/components/sessionstore/nsSessionStore.js
rename : browser/components/sessionstore/src/nsSessionStore.manifest => browser/components/sessionstore/nsSessionStore.manifest
---
 .../sessionstore/{src => }/ContentRestore.jsm |  0
 .../{src => }/DocShellCapabilities.jsm        |  0
 .../sessionstore/{src => }/FrameTree.jsm      |  0
 .../sessionstore/{src => }/GlobalState.jsm    |  0
 .../sessionstore/{src => }/PageStyle.jsm      |  0
 .../sessionstore/{src => }/PrivacyFilter.jsm  |  0
 .../sessionstore/{src => }/PrivacyLevel.jsm   |  0
 .../RecentlyClosedTabsAndWindowsMenuUtils.jsm |  0
 .../sessionstore/{src => }/SessionCookies.jsm |  0
 .../sessionstore/{src => }/SessionFile.jsm    |  0
 .../sessionstore/{src => }/SessionHistory.jsm |  0
 .../{src => }/SessionMigration.jsm            |  0
 .../sessionstore/{src => }/SessionSaver.jsm   |  0
 .../sessionstore/{src => }/SessionStorage.jsm |  0
 .../sessionstore/{src => }/SessionStore.jsm   |  0
 .../sessionstore/{src => }/SessionWorker.js   |  0
 .../sessionstore/{src => }/SessionWorker.jsm  |  0
 .../sessionstore/{src => }/TabAttributes.jsm  |  0
 .../sessionstore/{src => }/TabState.jsm       |  0
 .../sessionstore/{src => }/TabStateCache.jsm  |  0
 .../sessionstore/{src => }/Utils.jsm          |  0
 browser/components/sessionstore/moz.build     | 41 ++++++++++++++++---
 .../{src => }/nsSessionStartup.js             |  0
 .../sessionstore/{src => }/nsSessionStore.js  |  0
 .../{src => }/nsSessionStore.manifest         |  0
 browser/components/sessionstore/src/moz.build | 41 -------------------
 26 files changed, 35 insertions(+), 47 deletions(-)
 rename browser/components/sessionstore/{src => }/ContentRestore.jsm (100%)
 rename browser/components/sessionstore/{src => }/DocShellCapabilities.jsm (100%)
 rename browser/components/sessionstore/{src => }/FrameTree.jsm (100%)
 rename browser/components/sessionstore/{src => }/GlobalState.jsm (100%)
 rename browser/components/sessionstore/{src => }/PageStyle.jsm (100%)
 rename browser/components/sessionstore/{src => }/PrivacyFilter.jsm (100%)
 rename browser/components/sessionstore/{src => }/PrivacyLevel.jsm (100%)
 rename browser/components/sessionstore/{src => }/RecentlyClosedTabsAndWindowsMenuUtils.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionCookies.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionFile.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionHistory.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionMigration.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionSaver.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionStorage.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionStore.jsm (100%)
 rename browser/components/sessionstore/{src => }/SessionWorker.js (100%)
 rename browser/components/sessionstore/{src => }/SessionWorker.jsm (100%)
 rename browser/components/sessionstore/{src => }/TabAttributes.jsm (100%)
 rename browser/components/sessionstore/{src => }/TabState.jsm (100%)
 rename browser/components/sessionstore/{src => }/TabStateCache.jsm (100%)
 rename browser/components/sessionstore/{src => }/Utils.jsm (100%)
 rename browser/components/sessionstore/{src => }/nsSessionStartup.js (100%)
 rename browser/components/sessionstore/{src => }/nsSessionStore.js (100%)
 rename browser/components/sessionstore/{src => }/nsSessionStore.manifest (100%)
 delete mode 100644 browser/components/sessionstore/src/moz.build

diff --git a/browser/components/sessionstore/src/ContentRestore.jsm b/browser/components/sessionstore/ContentRestore.jsm
similarity index 100%
rename from browser/components/sessionstore/src/ContentRestore.jsm
rename to browser/components/sessionstore/ContentRestore.jsm
diff --git a/browser/components/sessionstore/src/DocShellCapabilities.jsm b/browser/components/sessionstore/DocShellCapabilities.jsm
similarity index 100%
rename from browser/components/sessionstore/src/DocShellCapabilities.jsm
rename to browser/components/sessionstore/DocShellCapabilities.jsm
diff --git a/browser/components/sessionstore/src/FrameTree.jsm b/browser/components/sessionstore/FrameTree.jsm
similarity index 100%
rename from browser/components/sessionstore/src/FrameTree.jsm
rename to browser/components/sessionstore/FrameTree.jsm
diff --git a/browser/components/sessionstore/src/GlobalState.jsm b/browser/components/sessionstore/GlobalState.jsm
similarity index 100%
rename from browser/components/sessionstore/src/GlobalState.jsm
rename to browser/components/sessionstore/GlobalState.jsm
diff --git a/browser/components/sessionstore/src/PageStyle.jsm b/browser/components/sessionstore/PageStyle.jsm
similarity index 100%
rename from browser/components/sessionstore/src/PageStyle.jsm
rename to browser/components/sessionstore/PageStyle.jsm
diff --git a/browser/components/sessionstore/src/PrivacyFilter.jsm b/browser/components/sessionstore/PrivacyFilter.jsm
similarity index 100%
rename from browser/components/sessionstore/src/PrivacyFilter.jsm
rename to browser/components/sessionstore/PrivacyFilter.jsm
diff --git a/browser/components/sessionstore/src/PrivacyLevel.jsm b/browser/components/sessionstore/PrivacyLevel.jsm
similarity index 100%
rename from browser/components/sessionstore/src/PrivacyLevel.jsm
rename to browser/components/sessionstore/PrivacyLevel.jsm
diff --git a/browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm b/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
similarity index 100%
rename from browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm
rename to browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
diff --git a/browser/components/sessionstore/src/SessionCookies.jsm b/browser/components/sessionstore/SessionCookies.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionCookies.jsm
rename to browser/components/sessionstore/SessionCookies.jsm
diff --git a/browser/components/sessionstore/src/SessionFile.jsm b/browser/components/sessionstore/SessionFile.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionFile.jsm
rename to browser/components/sessionstore/SessionFile.jsm
diff --git a/browser/components/sessionstore/src/SessionHistory.jsm b/browser/components/sessionstore/SessionHistory.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionHistory.jsm
rename to browser/components/sessionstore/SessionHistory.jsm
diff --git a/browser/components/sessionstore/src/SessionMigration.jsm b/browser/components/sessionstore/SessionMigration.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionMigration.jsm
rename to browser/components/sessionstore/SessionMigration.jsm
diff --git a/browser/components/sessionstore/src/SessionSaver.jsm b/browser/components/sessionstore/SessionSaver.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionSaver.jsm
rename to browser/components/sessionstore/SessionSaver.jsm
diff --git a/browser/components/sessionstore/src/SessionStorage.jsm b/browser/components/sessionstore/SessionStorage.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionStorage.jsm
rename to browser/components/sessionstore/SessionStorage.jsm
diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionStore.jsm
rename to browser/components/sessionstore/SessionStore.jsm
diff --git a/browser/components/sessionstore/src/SessionWorker.js b/browser/components/sessionstore/SessionWorker.js
similarity index 100%
rename from browser/components/sessionstore/src/SessionWorker.js
rename to browser/components/sessionstore/SessionWorker.js
diff --git a/browser/components/sessionstore/src/SessionWorker.jsm b/browser/components/sessionstore/SessionWorker.jsm
similarity index 100%
rename from browser/components/sessionstore/src/SessionWorker.jsm
rename to browser/components/sessionstore/SessionWorker.jsm
diff --git a/browser/components/sessionstore/src/TabAttributes.jsm b/browser/components/sessionstore/TabAttributes.jsm
similarity index 100%
rename from browser/components/sessionstore/src/TabAttributes.jsm
rename to browser/components/sessionstore/TabAttributes.jsm
diff --git a/browser/components/sessionstore/src/TabState.jsm b/browser/components/sessionstore/TabState.jsm
similarity index 100%
rename from browser/components/sessionstore/src/TabState.jsm
rename to browser/components/sessionstore/TabState.jsm
diff --git a/browser/components/sessionstore/src/TabStateCache.jsm b/browser/components/sessionstore/TabStateCache.jsm
similarity index 100%
rename from browser/components/sessionstore/src/TabStateCache.jsm
rename to browser/components/sessionstore/TabStateCache.jsm
diff --git a/browser/components/sessionstore/src/Utils.jsm b/browser/components/sessionstore/Utils.jsm
similarity index 100%
rename from browser/components/sessionstore/src/Utils.jsm
rename to browser/components/sessionstore/Utils.jsm
diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build
index 4a5e274ba01..9f6d8091d1c 100644
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -4,7 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
@@ -13,12 +16,38 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'sessionstore'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
+EXTRA_COMPONENTS += [
+    'nsSessionStartup.js',
+    'nsSessionStore.js',
+    'nsSessionStore.manifest',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
+JS_MODULES_PATH = 'modules/sessionstore'
+
+EXTRA_JS_MODULES = [
+    'ContentRestore.jsm',
+    'DocShellCapabilities.jsm',
+    'FrameTree.jsm',
+    'GlobalState.jsm',
+    'PageStyle.jsm',
+    'PrivacyFilter.jsm',
+    'PrivacyLevel.jsm',
+    'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
+    'SessionCookies.jsm',
+    'SessionFile.jsm',
+    'SessionHistory.jsm',
+    'SessionMigration.jsm',
+    'SessionStorage.jsm',
+    'SessionWorker.js',
+    'SessionWorker.jsm',
+    'TabAttributes.jsm',
+    'TabState.jsm',
+    'TabStateCache.jsm',
+    'Utils.jsm',
+]
+
+EXTRA_PP_JS_MODULES += [
+    'SessionSaver.jsm',
+    'SessionStore.jsm',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/components/sessionstore/src/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js
similarity index 100%
rename from browser/components/sessionstore/src/nsSessionStartup.js
rename to browser/components/sessionstore/nsSessionStartup.js
diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/nsSessionStore.js
similarity index 100%
rename from browser/components/sessionstore/src/nsSessionStore.js
rename to browser/components/sessionstore/nsSessionStore.js
diff --git a/browser/components/sessionstore/src/nsSessionStore.manifest b/browser/components/sessionstore/nsSessionStore.manifest
similarity index 100%
rename from browser/components/sessionstore/src/nsSessionStore.manifest
rename to browser/components/sessionstore/nsSessionStore.manifest
diff --git a/browser/components/sessionstore/src/moz.build b/browser/components/sessionstore/src/moz.build
deleted file mode 100644
index 77634f59a18..00000000000
--- a/browser/components/sessionstore/src/moz.build
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'nsSessionStartup.js',
-    'nsSessionStore.js',
-    'nsSessionStore.manifest',
-]
-
-JS_MODULES_PATH = 'modules/sessionstore'
-
-EXTRA_JS_MODULES = [
-    'ContentRestore.jsm',
-    'DocShellCapabilities.jsm',
-    'FrameTree.jsm',
-    'GlobalState.jsm',
-    'PageStyle.jsm',
-    'PrivacyFilter.jsm',
-    'PrivacyLevel.jsm',
-    'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
-    'SessionCookies.jsm',
-    'SessionFile.jsm',
-    'SessionHistory.jsm',
-    'SessionMigration.jsm',
-    'SessionStorage.jsm',
-    'SessionWorker.js',
-    'SessionWorker.jsm',
-    'TabAttributes.jsm',
-    'TabState.jsm',
-    'TabStateCache.jsm',
-    'Utils.jsm',
-]
-
-EXTRA_PP_JS_MODULES += [
-    'SessionSaver.jsm',
-    'SessionStore.jsm',
-]
-

From 80ab6f57282d50bb09f63c7f4dbe053a46c2ca23 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 26 Jul 2014 09:32:14 -0700
Subject: [PATCH 054/128] Bug 1038458 - Part 7: Flatten
 browser/components/shell/{public,src}/ directories. r=mak

--HG--
rename : browser/components/shell/src/Makefile.in => browser/components/shell/Makefile.in
rename : browser/components/shell/src/nsGNOMEShellService.cpp => browser/components/shell/nsGNOMEShellService.cpp
rename : browser/components/shell/src/nsGNOMEShellService.h => browser/components/shell/nsGNOMEShellService.h
rename : browser/components/shell/public/nsIMacShellService.idl => browser/components/shell/nsIMacShellService.idl
rename : browser/components/shell/public/nsIShellService.idl => browser/components/shell/nsIShellService.idl
rename : browser/components/shell/public/nsIWindowsShellService.idl => browser/components/shell/nsIWindowsShellService.idl
rename : browser/components/shell/src/nsMacShellService.cpp => browser/components/shell/nsMacShellService.cpp
rename : browser/components/shell/src/nsMacShellService.h => browser/components/shell/nsMacShellService.h
rename : browser/components/shell/src/nsSetDefaultBrowser.js => browser/components/shell/nsSetDefaultBrowser.js
rename : browser/components/shell/src/nsSetDefaultBrowser.manifest => browser/components/shell/nsSetDefaultBrowser.manifest
rename : browser/components/shell/src/nsShellService.h => browser/components/shell/nsShellService.h
rename : browser/components/shell/src/nsWindowsShellService.cpp => browser/components/shell/nsWindowsShellService.cpp
rename : browser/components/shell/src/nsWindowsShellService.h => browser/components/shell/nsWindowsShellService.h
---
 browser/components/build/moz.build            |  2 +-
 .../components/shell/{src => }/Makefile.in    |  0
 browser/components/shell/moz.build            | 44 ++++++++++++++++---
 .../shell/{src => }/nsGNOMEShellService.cpp   |  0
 .../shell/{src => }/nsGNOMEShellService.h     |  0
 .../shell/{public => }/nsIMacShellService.idl |  0
 .../shell/{public => }/nsIShellService.idl    |  0
 .../{public => }/nsIWindowsShellService.idl   |  0
 .../shell/{src => }/nsMacShellService.cpp     |  0
 .../shell/{src => }/nsMacShellService.h       |  0
 .../shell/{src => }/nsSetDefaultBrowser.js    |  0
 .../{src => }/nsSetDefaultBrowser.manifest    |  0
 .../shell/{src => }/nsShellService.h          |  0
 .../shell/{src => }/nsWindowsShellService.cpp |  0
 .../shell/{src => }/nsWindowsShellService.h   |  0
 browser/components/shell/public/moz.build     | 21 ---------
 browser/components/shell/src/moz.build        | 29 ------------
 17 files changed, 39 insertions(+), 57 deletions(-)
 rename browser/components/shell/{src => }/Makefile.in (100%)
 rename browser/components/shell/{src => }/nsGNOMEShellService.cpp (100%)
 rename browser/components/shell/{src => }/nsGNOMEShellService.h (100%)
 rename browser/components/shell/{public => }/nsIMacShellService.idl (100%)
 rename browser/components/shell/{public => }/nsIShellService.idl (100%)
 rename browser/components/shell/{public => }/nsIWindowsShellService.idl (100%)
 rename browser/components/shell/{src => }/nsMacShellService.cpp (100%)
 rename browser/components/shell/{src => }/nsMacShellService.h (100%)
 rename browser/components/shell/{src => }/nsSetDefaultBrowser.js (100%)
 rename browser/components/shell/{src => }/nsSetDefaultBrowser.manifest (100%)
 rename browser/components/shell/{src => }/nsShellService.h (100%)
 rename browser/components/shell/{src => }/nsWindowsShellService.cpp (100%)
 rename browser/components/shell/{src => }/nsWindowsShellService.h (100%)
 delete mode 100644 browser/components/shell/public/moz.build
 delete mode 100644 browser/components/shell/src/moz.build

diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 6b6b57adcdb..629e539b8f2 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -21,7 +21,7 @@ LOCAL_INCLUDES += [
     '../dirprovider',
     '../feeds',
     '../migration',
-    '../shell/src',
+    '../shell',
 ]
 
 USE_LIBS += [
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/Makefile.in
similarity index 100%
rename from browser/components/shell/src/Makefile.in
rename to browser/components/shell/Makefile.in
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
index 3b401f4ec08..89025787c89 100644
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -4,14 +4,46 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini'
+JAR_MANIFESTS += ['jar.mn']
+
+XPIDL_SOURCES += [
+    'nsIShellService.idl',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsIMacShellService.idl',
+    ]
+
+XPIDL_MODULE = 'shellservice'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    SOURCES += [
+        'nsWindowsShellService.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    SOURCES += [
+        'nsMacShellService.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_GTK']:
+    SOURCES += [
+        'nsGNOMEShellService.cpp',
+    ]
+
+if SOURCES:
+    FINAL_LIBRARY = 'browsercomps'
+
+EXTRA_COMPONENTS += [
+    'nsSetDefaultBrowser.js',
+    'nsSetDefaultBrowser.manifest',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
+    DEFINES[var] = '"%s"' % CONFIG[var]
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
similarity index 100%
rename from browser/components/shell/src/nsGNOMEShellService.cpp
rename to browser/components/shell/nsGNOMEShellService.cpp
diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/nsGNOMEShellService.h
similarity index 100%
rename from browser/components/shell/src/nsGNOMEShellService.h
rename to browser/components/shell/nsGNOMEShellService.h
diff --git a/browser/components/shell/public/nsIMacShellService.idl b/browser/components/shell/nsIMacShellService.idl
similarity index 100%
rename from browser/components/shell/public/nsIMacShellService.idl
rename to browser/components/shell/nsIMacShellService.idl
diff --git a/browser/components/shell/public/nsIShellService.idl b/browser/components/shell/nsIShellService.idl
similarity index 100%
rename from browser/components/shell/public/nsIShellService.idl
rename to browser/components/shell/nsIShellService.idl
diff --git a/browser/components/shell/public/nsIWindowsShellService.idl b/browser/components/shell/nsIWindowsShellService.idl
similarity index 100%
rename from browser/components/shell/public/nsIWindowsShellService.idl
rename to browser/components/shell/nsIWindowsShellService.idl
diff --git a/browser/components/shell/src/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp
similarity index 100%
rename from browser/components/shell/src/nsMacShellService.cpp
rename to browser/components/shell/nsMacShellService.cpp
diff --git a/browser/components/shell/src/nsMacShellService.h b/browser/components/shell/nsMacShellService.h
similarity index 100%
rename from browser/components/shell/src/nsMacShellService.h
rename to browser/components/shell/nsMacShellService.h
diff --git a/browser/components/shell/src/nsSetDefaultBrowser.js b/browser/components/shell/nsSetDefaultBrowser.js
similarity index 100%
rename from browser/components/shell/src/nsSetDefaultBrowser.js
rename to browser/components/shell/nsSetDefaultBrowser.js
diff --git a/browser/components/shell/src/nsSetDefaultBrowser.manifest b/browser/components/shell/nsSetDefaultBrowser.manifest
similarity index 100%
rename from browser/components/shell/src/nsSetDefaultBrowser.manifest
rename to browser/components/shell/nsSetDefaultBrowser.manifest
diff --git a/browser/components/shell/src/nsShellService.h b/browser/components/shell/nsShellService.h
similarity index 100%
rename from browser/components/shell/src/nsShellService.h
rename to browser/components/shell/nsShellService.h
diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
similarity index 100%
rename from browser/components/shell/src/nsWindowsShellService.cpp
rename to browser/components/shell/nsWindowsShellService.cpp
diff --git a/browser/components/shell/src/nsWindowsShellService.h b/browser/components/shell/nsWindowsShellService.h
similarity index 100%
rename from browser/components/shell/src/nsWindowsShellService.h
rename to browser/components/shell/nsWindowsShellService.h
diff --git a/browser/components/shell/public/moz.build b/browser/components/shell/public/moz.build
deleted file mode 100644
index 53f78cb6d1e..00000000000
--- a/browser/components/shell/public/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIShellService.idl',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    XPIDL_SOURCES += [
-        'nsIWindowsShellService.idl',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    XPIDL_SOURCES += [
-        'nsIMacShellService.idl',
-    ]
-
-XPIDL_MODULE = 'shellservice'
-
diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
deleted file mode 100644
index 61ed38f5e44..00000000000
--- a/browser/components/shell/src/moz.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsWindowsShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'nsMacShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_GTK']:
-    SOURCES += [
-        'nsGNOMEShellService.cpp',
-    ]
-
-if SOURCES:
-    FINAL_LIBRARY = 'browsercomps'
-
-EXTRA_COMPONENTS += [
-    'nsSetDefaultBrowser.js',
-    'nsSetDefaultBrowser.manifest',
-]
-
-for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
-    DEFINES[var] = '"%s"' % CONFIG[var]

From 9a11c843f45b87f12d77090179adc7eb78f44eb3 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Sat, 26 Jul 2014 13:28:48 -0400
Subject: [PATCH 055/128] Bug 1044305: Remove Location classinfo r=bz

---
 dom/base/nsDOMClassInfo.cpp            | 66 --------------------------
 dom/base/nsDOMClassInfo.h              | 25 ----------
 dom/base/nsDOMClassInfoClasses.h       |  1 -
 dom/base/nsLocation.cpp                |  3 --
 js/xpconnect/src/dom_quickstubs.qsconf |  4 --
 5 files changed, 99 deletions(-)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index d9067d9e872..6a5bca1d9f9 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -50,7 +50,6 @@
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsIDOMGlobalPropertyInitializer.h"
-#include "nsLocation.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Telemetry.h"
 
@@ -261,11 +260,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DEFAULT_SCRIPTABLE_FLAGS |
                            WINDOW_SCRIPTABLE_FLAGS)
 
-  NS_DEFINE_CLASSINFO_DATA(Location, nsLocationSH,
-                           ((DOM_DEFAULT_SCRIPTABLE_FLAGS |
-                             nsIXPCScriptable::WANT_ADDPROPERTY) &
-                            ~nsIXPCScriptable::ALLOW_PROP_MODS_TO_PROTOTYPE))
-
   NS_DEFINE_CLASSINFO_DATA(DOMPrototype, nsDOMConstructorSH,
                            DOM_BASE_SCRIPTABLE_FLAGS |
                            nsIXPCScriptable::WANT_PRECREATE |
@@ -823,10 +817,6 @@ nsDOMClassInfo::Init()
 #endif
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(Location, nsIDOMLocation)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMLocation)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(DOMPrototype, nsIDOMDOMConstructor)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDOMConstructor)
   DOM_CLASSINFO_MAP_END
@@ -3277,62 +3267,6 @@ nsWindowSH::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsLocationSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
-                        JSObject *globalObj, JSObject **parentObj)
-{
-  // window.location can be held onto by both evil pages that want to track the
-  // user's progress on the web and bookmarklets that want to use the location
-  // object. Parent it to the outer window so that access checks do the Right
-  // Thing.
-  *parentObj = globalObj;
-
-  nsCOMPtr<nsIDOMLocation> safeLoc(do_QueryInterface(nativeObj));
-  if (!safeLoc) {
-    // Oops, this wasn't really a location object. This can happen if someone
-    // tries to use our scriptable helper as a real object and tries to wrap
-    // it, see bug 319296
-    return NS_OK;
-  }
-
-  nsLocation *loc = (nsLocation *)safeLoc.get();
-  nsIDocShell *ds = loc->GetDocShell();
-  if (!ds) {
-    NS_WARNING("Refusing to create a location in the wrong scope");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  nsCOMPtr<nsIScriptGlobalObject> sgo = do_GetInterface(ds);
-  if (!sgo) {
-    NS_WARNING("Refusing to create a location in the wrong scope because the "
-               "docshell is being destroyed");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  *parentObj = sgo->GetGlobalJSObject();
-  return *parentObj ? NS_OK : NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsLocationSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj, jsid aId, jsval *vp, bool *_retval)
-{
-  JS::Rooted<JSObject*> rootedObj(cx, obj);
-
-  // Shadowing protection. This will go away when nsLocation moves to the new
-  // bindings.
-  JS::Rooted<jsid> id(cx, aId);
-  if (wrapper->HasNativeMember(id)) {
-    JS_ReportError(cx, "Permission denied to shadow native property");
-    return NS_ERROR_FAILURE;
-  }
-
-  nsLocation* location = static_cast<nsLocation*>(GetNative(wrapper, rootedObj));
-  location->PreserveWrapper(location);
-
-  return NS_OK;
-}
-
 // EventTarget helper
 
 NS_IMETHODIMP
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index fe0e872340f..36ac3e74525 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -277,31 +277,6 @@ public:
   }
 };
 
-// Location scriptable helper
-
-class nsLocationSH : public nsDOMGenericSH
-{
-protected:
-  nsLocationSH(nsDOMClassInfoData* aData) : nsDOMGenericSH(aData)
-  {
-  }
-
-  virtual ~nsLocationSH()
-  {
-  }
-
-public:
-  NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
-                       JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE;
-  NS_IMETHODIMP AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                            JSObject *obj, jsid id, JS::Value *vp, bool *_retval);
-
-  static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
-  {
-    return new nsLocationSH(aData);
-  }
-};
-
 
 // Event handler 'this' translator class, this is called by XPConnect
 // when a "function interface" (nsIDOMEventListener) is called, this
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 316e178575d..e069a30361d 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -5,7 +5,6 @@
 // IWYU pragma: private, include "nsDOMClassInfoID.h"
 
 DOMCI_CLASS(Window)
-DOMCI_CLASS(Location)
 DOMCI_CLASS(DOMPrototype)
 DOMCI_CLASS(DOMConstructor)
 
diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp
index 4727e4bdb04..7012d500176 100644
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -70,14 +70,11 @@ nsLocation::~nsLocation()
 {
 }
 
-DOMCI_DATA(Location, nsLocation)
-
 // QueryInterface implementation for nsLocation
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsLocation)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsIDOMLocation)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Location)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsLocation, mInnerWindow)
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index a945096024d..68be77a1c23 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -27,10 +27,6 @@ members = [
     #
     # (And nsIDOMModalContentWindow.returnValue is an attribute of type
     # nsIVariant, which qsgen.py can't handle.)
-    #
-    # nsLocationSH has ~ALLOW_PROP_MODS_TO_PROTOTYPE, so don't try.
-    #'nsIDOMLocation.hostname',
-    #'nsIDOMLocation.href',
 
     # dom/interfaces/xpath
     'nsIDOMXPathNSResolver.lookupNamespaceURI',

From 5cbc0128fb7ebc38c069e700853f70a1fd0ab04d Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Sat, 26 Jul 2014 12:21:57 -0700
Subject: [PATCH 056/128] Bug 1001039 - Disable APZ tests in desktop e10s
 (r=roc)

---
 layout/reftests/async-scrolling/reftest.list | 20 ++++++++++----------
 layout/reftests/reftest-sanity/reftest.list  |  4 ++--
 layout/tools/reftest/reftest.js              |  6 ++++++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/layout/reftests/async-scrolling/reftest.list b/layout/reftests/async-scrolling/reftest.list
index 48ee9cda712..4ef8ab84b76 100644
--- a/layout/reftests/async-scrolling/reftest.list
+++ b/layout/reftests/async-scrolling/reftest.list
@@ -1,10 +1,10 @@
-skip-if(!browserIsRemote) == bg-fixed-1.html bg-fixed-1-ref.html
-skip-if(!browserIsRemote) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
-skip-if(!browserIsRemote) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
-skip-if(!browserIsRemote) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
-skip-if(!browserIsRemote) == element-1.html element-1-ref.html
-skip-if(!browserIsRemote) == position-fixed-1.html position-fixed-1-ref.html
-skip-if(!browserIsRemote) == position-fixed-2.html position-fixed-2-ref.html
-skip-if(!browserIsRemote) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
-skip-if(!browserIsRemote) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
-skip-if(!browserIsRemote) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
+skip-if(!asyncPanZoom) == bg-fixed-1.html bg-fixed-1-ref.html
+skip-if(!asyncPanZoom) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
+skip-if(!asyncPanZoom) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
+skip-if(!asyncPanZoom) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
+skip-if(!asyncPanZoom) == element-1.html element-1-ref.html
+skip-if(!asyncPanZoom) == position-fixed-1.html position-fixed-1-ref.html
+skip-if(!asyncPanZoom) == position-fixed-2.html position-fixed-2-ref.html
+skip-if(!asyncPanZoom) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
+skip-if(!asyncPanZoom) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
+skip-if(!asyncPanZoom) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index 758a3d2dd4e..b66f9f721b1 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -159,10 +159,10 @@ fails fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy-ref.html
 # Test that reftest-no-paint fails correctly
 fails == reftest-no-paint.html reftest-no-paint-ref.html
 
-skip-if(!browserIsRemote) == async-scroll-1a.html async-scroll-1-ref.html
+skip-if(!asyncPanZoom) == async-scroll-1a.html async-scroll-1-ref.html
 
 # Disable low-res painting for this test as it will cause more to
 # be drawn than we want.
 default-preferences pref(layers.low-precision-buffer,false)
-skip-if(!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
+skip-if(!asyncPanZoom) != async-scroll-1b.html async-scroll-1-ref.html
 default-preferences
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index e9ed64d9a64..3bc44a3241c 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -752,6 +752,12 @@ function BuildConditionSandbox(aURL) {
     // crash the content process
     sandbox.browserIsRemote = gBrowserIsRemote;
 
+    try {
+        sandbox.asyncPanZoom = prefs.getBoolPref("layers.async-pan-zoom.enabled");
+    } catch (e) {
+        sandbox.asyncPanZoom = false;
+    }
+
     // Distinguish the Fennecs:
     sandbox.xulFennec    = sandbox.Android &&  sandbox.browserIsRemote;
     sandbox.nativeFennec = sandbox.Android && !sandbox.browserIsRemote;

From 5958b21ca4c5a56935e839a5c5df5f1d169b4bbe Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Sat, 26 Jul 2014 12:22:13 -0700
Subject: [PATCH 057/128] Bug 1001039 - Disable plugin tests in desktop e10s
 (r=roc)

---
 dom/plugins/test/reftest/reftest.list | 2 +-
 layout/reftests/bugs/reftest.list     | 4 ++--
 layout/tools/reftest/reftest.js       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/plugins/test/reftest/reftest.list b/dom/plugins/test/reftest/reftest.list
index 800328afead..83d98625609 100644
--- a/dom/plugins/test/reftest/reftest.list
+++ b/dom/plugins/test/reftest/reftest.list
@@ -11,7 +11,7 @@ fails-if(!haveTestPlugin) == plugin-alpha-opacity.html div-alpha-opacity.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == windowless-clipping-1.html windowless-clipping-1-ref.html # bug 631832
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html # bug 629430
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html # bug 629430
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482
 # The following two "pluginproblemui-direction" tests are unreliable on all platforms. They should be re-written or replaced.
 #random-if(cocoaWidget||d2d||/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(!haveTestPlugin&&!Android) skip-if(!testPluginIsOOP()) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html # bug 567367
 #random-if(cocoaWidget) fails-if(!haveTestPlugin&&!Android) skip-if(!testPluginIsOOP()) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index a1f19ed95d8..51615160e16 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1564,7 +1564,7 @@ random-if(!winWidget) fails-if(winWidget&&!d2d) random-if(winWidget&&d2d) != 574
 == 579323-1.html 579323-1-ref.html
 == 579349-1.html 579349-1-ref.html
 == 579655-1.html 579655-1-ref.html
-skip-if(B2G) fails-if(Android) == 579808-1.html 579808-1-ref.html
+skip-if(!haveTestPlugin) skip-if(B2G) fails-if(Android) == 579808-1.html 579808-1-ref.html
 skip-if(B2G) fails-if(Android) random-if(layersGPUAccelerated) == 579985-1.html 579985-1-ref.html # bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway
 skip-if(B2G) skip-if(Android) == 580160-1.html 580160-1-ref.html # bug 920927 for Android; issues without the test-plugin
 HTTP(..) == 580863-1.html 580863-1-ref.html
@@ -1644,7 +1644,7 @@ fuzzy-if(Android&&AndroidVersion>=15,8,300) == 625409-1.html 625409-1-ref.html
 == 627393-1.html about:blank
 == 630835-1.html about:blank
 == 631352-1.html 631352-1-ref.html
-skip-if(B2G) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535)  == 632423-1.html 632423-1-ref.html
+skip-if(!haveTestPlugin) skip-if(B2G) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535)  == 632423-1.html 632423-1-ref.html
 skip-if(Android||B2G) random-if(winWidget) == 632781-verybig.html 632781-ref.html
 == 632781-normalsize.html 632781-ref.html
 == 633344-1.html 633344-1-ref.html
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 3bc44a3241c..43bc0842ead 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -686,7 +686,7 @@ function BuildConditionSandbox(aURL) {
     // and set a sandox prop accordingly
     var navigator = gContainingWindow.navigator;
     var testPlugin = navigator.plugins["Test Plug-in"];
-    sandbox.haveTestPlugin = !!testPlugin;
+    sandbox.haveTestPlugin = !!testPlugin && !gBrowserIsRemote;
 
     // Set a flag on sandbox if the windows default theme is active
     var box = gContainingWindow.document.createElement("box");

From 7a7b057e50fea9b0b63c0390a5b5cde556406f18 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Sat, 26 Jul 2014 14:22:31 -0700
Subject: [PATCH 058/128] Bug 1001039 - Disable APZ tests for Rs-oop

---
 layout/reftests/reftest-sanity/reftest.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index b66f9f721b1..d79cb6f4c1e 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -159,10 +159,10 @@ fails fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy-ref.html
 # Test that reftest-no-paint fails correctly
 fails == reftest-no-paint.html reftest-no-paint-ref.html
 
-skip-if(!asyncPanZoom) == async-scroll-1a.html async-scroll-1-ref.html
+skip-if(!asyncPanZoom||!browserIsRemote) == async-scroll-1a.html async-scroll-1-ref.html
 
 # Disable low-res painting for this test as it will cause more to
 # be drawn than we want.
 default-preferences pref(layers.low-precision-buffer,false)
-skip-if(!asyncPanZoom) != async-scroll-1b.html async-scroll-1-ref.html
+skip-if(!asyncPanZoom||!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
 default-preferences

From 2339628644a1b9860aefdd5dcaada0e11e050106 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sun, 27 Jul 2014 08:52:51 -0700
Subject: [PATCH 059/128] Bug 1009812 - Change about:neterror text/background
 colors to match about:preferences. r=Unfocused

---
 browser/base/content/aboutneterror/info.svg | 4 ++--
 browser/themes/shared/in-content/common.css | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/aboutneterror/info.svg b/browser/base/content/aboutneterror/info.svg
index 2d3e564b8ec..5b586334345 100644
--- a/browser/base/content/aboutneterror/info.svg
+++ b/browser/base/content/aboutneterror/info.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100">
-<g fill="#85898C">
-  <circle cx="50" cy="50" r="44" style="stroke: #85898C; stroke-width: 11; fill: transparent;"/>
+<g fill="#424E5A">
+  <circle cx="50" cy="50" r="44" style="stroke: #424E5A; stroke-width: 11; fill: transparent;"/>
   <circle cx="50" cy="24.6" r="6.4"/>
   <rect x="45" y="39.9" width="10.1" height="41.8"/>
 </g>
diff --git a/browser/themes/shared/in-content/common.css b/browser/themes/shared/in-content/common.css
index c48744e9986..732286350c6 100644
--- a/browser/themes/shared/in-content/common.css
+++ b/browser/themes/shared/in-content/common.css
@@ -7,8 +7,8 @@ body {
   font-size: 15px;
   font-weight: normal;
   margin: 0;
-  color: #737980;
-  background-image: linear-gradient(#fff, #ededed 100px);
+  color: #424e5a;
+  background-color: #f1f1f1;
 }
 
 h1 {
@@ -24,7 +24,7 @@ button {
   height: 30px;
   max-height: 30px;
   padding: 3px;
-  color: #737980;
+  color: #333333;
   border: 1px solid rgba(23,50,77,.4);
   border-radius: 5px;
   background-color: #f1f1f1;

From 079b2e7778daa306787f3004d2bb81dae4aedeb7 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sun, 27 Jul 2014 08:52:52 -0700
Subject: [PATCH 060/128] Bug 1035884 - Follow-up: Remove SubstringType
 template argument for ns{CharSeparated,Whitespace}Tokenizer. r=froydnj

---
 xpcom/ds/nsCharSeparatedTokenizer.h | 21 +++++++--------------
 xpcom/ds/nsWhitespaceTokenizer.h    | 19 +++++++------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/xpcom/ds/nsCharSeparatedTokenizer.h b/xpcom/ds/nsCharSeparatedTokenizer.h
index 06e3a08cd0a..ba2f8911f8e 100644
--- a/xpcom/ds/nsCharSeparatedTokenizer.h
+++ b/xpcom/ds/nsCharSeparatedTokenizer.h
@@ -29,12 +29,11 @@
  * The function used for whitespace detection is a template argument.
  * By default, it is NS_IsAsciiWhitespace.
  */
-template<typename SubstringType,
-         typename DependentSubstringType,
-         bool IsWhitespace(char16_t)>
+template<typename DependentSubstringType, bool IsWhitespace(char16_t)>
 class nsTCharSeparatedTokenizer
 {
-  typedef typename SubstringType::char_type CharType;
+  typedef typename DependentSubstringType::char_type CharType;
+  typedef typename DependentSubstringType::substring_type SubstringType;
 
 public:
     // Flags -- only one for now. If we need more, they should be defined to
@@ -166,16 +165,13 @@ private:
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsCharSeparatedTokenizerTemplate
-  : public nsTCharSeparatedTokenizer<nsSubstring,
-                                     nsDependentSubstring,
-                                     IsWhitespace>
+  : public nsTCharSeparatedTokenizer<nsDependentSubstring, IsWhitespace>
 {
 public:
   nsCharSeparatedTokenizerTemplate(const nsSubstring& aSource,
                                    char16_t aSeparatorChar,
                                    uint32_t aFlags = 0)
-    : nsTCharSeparatedTokenizer<nsSubstring,
-                                nsDependentSubstring,
+    : nsTCharSeparatedTokenizer<nsDependentSubstring,
                                 IsWhitespace>(aSource, aSeparatorChar, aFlags)
   {
   }
@@ -195,16 +191,13 @@ public:
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsCCharSeparatedTokenizerTemplate
-  : public nsTCharSeparatedTokenizer<nsCSubstring,
-                                     nsDependentCSubstring,
-                                     IsWhitespace>
+  : public nsTCharSeparatedTokenizer<nsDependentCSubstring, IsWhitespace>
 {
 public:
   nsCCharSeparatedTokenizerTemplate(const nsCSubstring& aSource,
                                     char aSeparatorChar,
                                     uint32_t aFlags = 0)
-    : nsTCharSeparatedTokenizer<nsCSubstring,
-                                nsDependentCSubstring,
+    : nsTCharSeparatedTokenizer<nsDependentCSubstring,
                                 IsWhitespace>(aSource, aSeparatorChar, aFlags)
   {
   }
diff --git a/xpcom/ds/nsWhitespaceTokenizer.h b/xpcom/ds/nsWhitespaceTokenizer.h
index 1ebb7c6614a..7895a1bd7c5 100644
--- a/xpcom/ds/nsWhitespaceTokenizer.h
+++ b/xpcom/ds/nsWhitespaceTokenizer.h
@@ -10,12 +10,11 @@
 #include "nsDependentSubstring.h"
 #include "nsCRT.h"
 
-template<typename SubstringType,
-         typename DependentSubstringType,
-         bool IsWhitespace(char16_t)>
+template<typename DependentSubstringType, bool IsWhitespace(char16_t)>
 class nsTWhitespaceTokenizer
 {
-  typedef typename SubstringType::char_type CharType;
+  typedef typename DependentSubstringType::char_type CharType;
+  typedef typename DependentSubstringType::substring_type SubstringType;
 
 public:
     nsTWhitespaceTokenizer(const SubstringType& aSource)
@@ -83,13 +82,11 @@ private:
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsWhitespaceTokenizerTemplate
-  : public nsTWhitespaceTokenizer<nsSubstring, nsDependentSubstring,
-                                  IsWhitespace>
+  : public nsTWhitespaceTokenizer<nsDependentSubstring, IsWhitespace>
 {
 public:
   nsWhitespaceTokenizerTemplate(const nsSubstring& aSource)
-    : nsTWhitespaceTokenizer<nsSubstring, nsDependentSubstring,
-                             IsWhitespace>(aSource)
+    : nsTWhitespaceTokenizer<nsDependentSubstring, IsWhitespace>(aSource)
   {
   }
 };
@@ -106,13 +103,11 @@ public:
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsCWhitespaceTokenizerTemplate
-  : public nsTWhitespaceTokenizer<nsCSubstring, nsDependentCSubstring,
-                                  IsWhitespace>
+  : public nsTWhitespaceTokenizer<nsDependentCSubstring, IsWhitespace>
 {
 public:
   nsCWhitespaceTokenizerTemplate(const nsCSubstring& aSource)
-    : nsTWhitespaceTokenizer<nsCSubstring, nsDependentCSubstring,
-                             IsWhitespace>(aSource)
+    : nsTWhitespaceTokenizer<nsDependentCSubstring, IsWhitespace>(aSource)
   {
   }
 };

From 1fc653d7cbf9952144fc4a3f259701a3d33b8cf6 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sun, 27 Jul 2014 08:52:52 -0700
Subject: [PATCH 061/128] Bug 1035884 - Follow-up: Use typedef for
 ns(C){CharSeparated,Whitespace}Tokenizer. r=froydnj

---
 xpcom/ds/nsCharSeparatedTokenizer.h | 24 ++----------------------
 xpcom/ds/nsWhitespaceTokenizer.h    | 20 ++------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/xpcom/ds/nsCharSeparatedTokenizer.h b/xpcom/ds/nsCharSeparatedTokenizer.h
index ba2f8911f8e..fe68cf24e91 100644
--- a/xpcom/ds/nsCharSeparatedTokenizer.h
+++ b/xpcom/ds/nsCharSeparatedTokenizer.h
@@ -177,17 +177,7 @@ public:
   }
 };
 
-class nsCharSeparatedTokenizer
-  : public nsCharSeparatedTokenizerTemplate<>
-{
-public:
-  nsCharSeparatedTokenizer(const nsSubstring& aSource,
-                           char16_t aSeparatorChar,
-                           uint32_t aFlags = 0)
-    : nsCharSeparatedTokenizerTemplate<>(aSource, aSeparatorChar, aFlags)
-  {
-  }
-};
+typedef nsCharSeparatedTokenizerTemplate<> nsCharSeparatedTokenizer;
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsCCharSeparatedTokenizerTemplate
@@ -203,16 +193,6 @@ public:
   }
 };
 
-class nsCCharSeparatedTokenizer
-  : public nsCCharSeparatedTokenizerTemplate<>
-{
-public:
-  nsCCharSeparatedTokenizer(const nsCSubstring& aSource,
-                            char aSeparatorChar,
-                            uint32_t aFlags = 0)
-    : nsCCharSeparatedTokenizerTemplate<>(aSource, aSeparatorChar, aFlags)
-  {
-  }
-};
+typedef nsCCharSeparatedTokenizerTemplate<> nsCCharSeparatedTokenizer;
 
 #endif /* __nsCharSeparatedTokenizer_h */
diff --git a/xpcom/ds/nsWhitespaceTokenizer.h b/xpcom/ds/nsWhitespaceTokenizer.h
index 7895a1bd7c5..7b196e0de6b 100644
--- a/xpcom/ds/nsWhitespaceTokenizer.h
+++ b/xpcom/ds/nsWhitespaceTokenizer.h
@@ -91,15 +91,7 @@ public:
   }
 };
 
-class nsWhitespaceTokenizer
-  : public nsWhitespaceTokenizerTemplate<>
-{
-public:
-  nsWhitespaceTokenizer(const nsSubstring& aSource)
-    : nsWhitespaceTokenizerTemplate<>(aSource)
-  {
-  }
-};
+typedef nsWhitespaceTokenizerTemplate<> nsWhitespaceTokenizer;
 
 template<bool IsWhitespace(char16_t) = NS_IsAsciiWhitespace>
 class nsCWhitespaceTokenizerTemplate
@@ -112,14 +104,6 @@ public:
   }
 };
 
-class nsCWhitespaceTokenizer
-  : public nsCWhitespaceTokenizerTemplate<>
-{
-public:
-  nsCWhitespaceTokenizer(const nsCSubstring& aSource)
-    : nsCWhitespaceTokenizerTemplate<>(aSource)
-  {
-  }
-};
+typedef nsCWhitespaceTokenizerTemplate<> nsCWhitespaceTokenizer;
 
 #endif /* __nsWhitespaceTokenizer_h */

From 3b40f69f4ac4cf91616d61f59918358aba5fff49 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sun, 27 Jul 2014 08:52:52 -0700
Subject: [PATCH 062/128] No bug - Revert changes to nsPluginArray.h in
 e8ad29f1166a. r=me The #include is not needed after 231c5bbd4a75.

---
 dom/base/nsPluginArray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/nsPluginArray.h b/dom/base/nsPluginArray.h
index 26e5d409075..b8fb4d19cec 100644
--- a/dom/base/nsPluginArray.h
+++ b/dom/base/nsPluginArray.h
@@ -13,9 +13,9 @@
 #include "nsWrapperCache.h"
 #include "nsPluginTags.h"
 #include "nsPIDOMWindow.h"
-#include "nsMimeTypeArray.h"
 
 class nsPluginElement;
+class nsMimeType;
 
 class nsPluginArray MOZ_FINAL : public nsIObserver,
                                 public nsSupportsWeakReference,

From ae8fce71b822f2f28c6cb32af5976e1eb40296ef Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sun, 27 Jul 2014 12:23:36 -0400
Subject: [PATCH 063/128] Bug 993787: remove use of RefCounted<> in LoadInfo
 r=ehsan

---
 content/media/webrtc/LoadMonitor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/content/media/webrtc/LoadMonitor.cpp b/content/media/webrtc/LoadMonitor.cpp
index aa96594fdb7..b545e84b2a1 100644
--- a/content/media/webrtc/LoadMonitor.cpp
+++ b/content/media/webrtc/LoadMonitor.cpp
@@ -301,10 +301,14 @@ public:
 // member of LoadInfoCollectRunner, which can't be in the anonymous namespace,
 // so it also can't be in an anonymous namespace: gcc warns about that setup
 // and this directory is fail-on-warnings.
-class RTCLoadInfo : public mozilla::RefCounted<RTCLoadInfo>
+class RTCLoadInfo MOZ_FINAL
 {
+private:
+  ~RTCLoadInfo() {}
+
 public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(RTCLoadInfo)
+  NS_INLINE_DECL_REFCOUNTING(RTCLoadInfo)
+
   RTCLoadInfo(): mLoadUpdateInterval(0) {};
   nsresult Init(int aLoadUpdateInterval);
   double GetSystemLoad() { return mSystemLoad.GetLoad(); };

From e4e48ec56124201370cc15db2765c35e12d4dd32 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sun, 27 Jul 2014 13:08:43 -0400
Subject: [PATCH 064/128] Bug 1044478 - Just use the libraries that we really
 need when linking cubeb tests; r=padenot

---
 media/libcubeb/tests/Makefile.in | 3 +++
 media/libcubeb/tests/moz.build   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media/libcubeb/tests/Makefile.in b/media/libcubeb/tests/Makefile.in
index cdae29aca12..8c47ac94474 100644
--- a/media/libcubeb/tests/Makefile.in
+++ b/media/libcubeb/tests/Makefile.in
@@ -9,6 +9,9 @@ else
   ifeq ($(OS_TARGET), OpenBSD)
     OS_LIBS += -lsndio
   else
+    ifeq ($(OS_TARGET),WINNT)
+      OS_LIBS += $(call EXPAND_LIBNAME,ole32)
+    endif
     OS_LIBS += $(MOZ_ALSA_LIBS) \
             $(MOZ_PULSEAUDIO_LIBS)
   endif
diff --git a/media/libcubeb/tests/moz.build b/media/libcubeb/tests/moz.build
index d93f4ad8814..9395eaa2bcf 100644
--- a/media/libcubeb/tests/moz.build
+++ b/media/libcubeb/tests/moz.build
@@ -28,7 +28,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     # /media/libspeex_resampler, so we can't get away with just linking cubeb's
     # .o
     USE_LIBS += [
-        'gkmedias',
+        'cubeb',
+        'speex',
     ]
 else:
     # Otherwise, we can just grab all the compiled .o and compile against that,

From fcbaa5e89782b6c4ba3722fdf682cc8cc7d43ff6 Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Wed, 23 Jul 2014 15:08:27 +1200
Subject: [PATCH 065/128] Bug 1041950 - Fix codec context allocation; r=edwin

---
 .../media/fmp4/ffmpeg/FFmpegAACDecoder.cpp    |  4 +--
 .../media/fmp4/ffmpeg/FFmpegDataDecoder.cpp   | 33 ++++++++++---------
 content/media/fmp4/ffmpeg/FFmpegDataDecoder.h |  2 +-
 .../media/fmp4/ffmpeg/FFmpegFunctionList.h    |  5 ++-
 .../media/fmp4/ffmpeg/FFmpegH264Decoder.cpp   | 12 +++----
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp b/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
index acf3847777e..730a891bdd2 100644
--- a/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
@@ -78,7 +78,7 @@ FFmpegAACDecoder<LIBAV_VER>::DecodePacket(MP4Sample* aSample)
 
   int decoded;
   int bytesConsumed =
-    avcodec_decode_audio4(&mCodecContext, frame.get(), &decoded, &packet);
+    avcodec_decode_audio4(mCodecContext, frame.get(), &decoded, &packet);
 
   if (bytesConsumed < 0 || !decoded) {
     NS_WARNING("FFmpeg audio decoder error.");
@@ -89,7 +89,7 @@ FFmpegAACDecoder<LIBAV_VER>::DecodePacket(MP4Sample* aSample)
   NS_ASSERTION(bytesConsumed == (int)aSample->size,
                "Only one audio packet should be received at a time.");
 
-  uint32_t numChannels = mCodecContext.channels;
+  uint32_t numChannels = mCodecContext->channels;
 
   nsAutoArrayPtr<AudioDataValue> audio(
     CopyAndPackAudio(frame.get(), numChannels, frame->nb_samples));
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
index b65b8f4914d..7af9590fac4 100644
--- a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
@@ -21,7 +21,7 @@ bool FFmpegDataDecoder<LIBAV_VER>::sFFmpegInitDone = false;
 
 FFmpegDataDecoder<LIBAV_VER>::FFmpegDataDecoder(MediaTaskQueue* aTaskQueue,
                                                 AVCodecID aCodecID)
-  : mTaskQueue(aTaskQueue), mCodecID(aCodecID)
+  : mTaskQueue(aTaskQueue), mCodecContext(nullptr), mCodecID(aCodecID)
 {
   MOZ_COUNT_CTOR(FFmpegDataDecoder);
 }
@@ -71,38 +71,38 @@ FFmpegDataDecoder<LIBAV_VER>::Init()
     return NS_ERROR_FAILURE;
   }
 
-  if (avcodec_get_context_defaults3(&mCodecContext, codec) < 0) {
+  if (!(mCodecContext = avcodec_alloc_context3(codec))) {
     NS_WARNING("Couldn't init ffmpeg context");
     return NS_ERROR_FAILURE;
   }
 
-  mCodecContext.opaque = this;
+  mCodecContext->opaque = this;
 
   // FFmpeg takes this as a suggestion for what format to use for audio samples.
-  mCodecContext.request_sample_fmt = AV_SAMPLE_FMT_FLT;
+  mCodecContext->request_sample_fmt = AV_SAMPLE_FMT_FLT;
 
   // FFmpeg will call back to this to negotiate a video pixel format.
-  mCodecContext.get_format = ChoosePixelFormat;
+  mCodecContext->get_format = ChoosePixelFormat;
 
-  mCodecContext.thread_count = PR_GetNumberOfProcessors();
-  mCodecContext.thread_type = FF_THREAD_SLICE | FF_THREAD_FRAME;
-  mCodecContext.thread_safe_callbacks = false;
+  mCodecContext->thread_count = PR_GetNumberOfProcessors();
+  mCodecContext->thread_type = FF_THREAD_SLICE | FF_THREAD_FRAME;
+  mCodecContext->thread_safe_callbacks = false;
 
-  mCodecContext.extradata_size = mExtraData.length();
+  mCodecContext->extradata_size = mExtraData.length();
   for (int i = 0; i < FF_INPUT_BUFFER_PADDING_SIZE; i++) {
     mExtraData.append(0);
   }
-  mCodecContext.extradata = mExtraData.begin();
+  mCodecContext->extradata = mExtraData.begin();
 
   AVDictionary* opts = nullptr;
-  if (avcodec_open2(&mCodecContext, codec, &opts) < 0) {
+  if (avcodec_open2(mCodecContext, codec, &opts) < 0) {
     NS_WARNING("Couldn't initialise ffmpeg decoder");
     return NS_ERROR_FAILURE;
   }
 
-  if (mCodecContext.codec_type == AVMEDIA_TYPE_AUDIO &&
-      mCodecContext.sample_fmt != AV_SAMPLE_FMT_FLT &&
-      mCodecContext.sample_fmt != AV_SAMPLE_FMT_FLTP) {
+  if (mCodecContext->codec_type == AVMEDIA_TYPE_AUDIO &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLT &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLTP) {
     NS_WARNING("FFmpeg AAC decoder outputs unsupported audio format.");
     return NS_ERROR_FAILURE;
   }
@@ -115,7 +115,7 @@ nsresult
 FFmpegDataDecoder<LIBAV_VER>::Flush()
 {
   mTaskQueue->Flush();
-  avcodec_flush_buffers(&mCodecContext);
+  avcodec_flush_buffers(mCodecContext);
   return NS_OK;
 }
 
@@ -123,7 +123,8 @@ nsresult
 FFmpegDataDecoder<LIBAV_VER>::Shutdown()
 {
   if (sFFmpegInitDone) {
-    avcodec_close(&mCodecContext);
+    avcodec_close(mCodecContext);
+    av_freep(&mCodecContext);
   }
   return NS_OK;
 }
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
index e861426b3c0..9dda82e0f6e 100644
--- a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
+++ b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
@@ -36,7 +36,7 @@ public:
 
 protected:
   MediaTaskQueue* mTaskQueue;
-  AVCodecContext mCodecContext;
+  AVCodecContext* mCodecContext;
   Vector<uint8_t> mExtraData;
 
 private:
diff --git a/content/media/fmp4/ffmpeg/FFmpegFunctionList.h b/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
index 27fab790818..c91fc037903 100644
--- a/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
+++ b/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
@@ -15,7 +15,7 @@ AV_FUNC(avcodec_default_get_buffer)
 AV_FUNC(avcodec_default_release_buffer)
 AV_FUNC(avcodec_find_decoder)
 AV_FUNC(avcodec_flush_buffers)
-AV_FUNC(avcodec_get_context_defaults3)
+AV_FUNC(avcodec_alloc_context3)
 AV_FUNC(avcodec_get_edge_width)
 AV_FUNC(avcodec_get_frame_defaults)
 AV_FUNC(avcodec_open2)
@@ -26,3 +26,6 @@ AV_FUNC(av_dict_get)
 AV_FUNC(av_image_fill_linesizes)
 AV_FUNC(av_image_fill_pointers)
 AV_FUNC(av_log_set_level)
+AV_FUNC(av_malloc)
+AV_FUNC(av_freep)
+
diff --git a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp b/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
index 598ab26d9ad..1a2cfdda791 100644
--- a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
@@ -41,8 +41,8 @@ FFmpegH264Decoder<LIBAV_VER>::Init()
   nsresult rv = FFmpegDataDecoder::Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mCodecContext.get_buffer = AllocateBufferCb;
-  mCodecContext.release_buffer = ReleaseBufferCb;
+  mCodecContext->get_buffer = AllocateBufferCb;
+  mCodecContext->release_buffer = ReleaseBufferCb;
 
   return NS_OK;
 }
@@ -65,7 +65,7 @@ FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(mp4_demuxer::MP4Sample* aSample)
 
   int decoded;
   int bytesConsumed =
-    avcodec_decode_video2(&mCodecContext, frame, &decoded, &packet);
+    avcodec_decode_video2(mCodecContext, frame, &decoded, &packet);
 
   if (bytesConsumed < 0) {
     NS_WARNING("FFmpeg video decoder error.");
@@ -78,7 +78,7 @@ FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(mp4_demuxer::MP4Sample* aSample)
     nsAutoPtr<VideoData> data;
 
     VideoInfo info;
-    info.mDisplay = nsIntSize(mCodecContext.width, mCodecContext.height);
+    info.mDisplay = nsIntSize(mCodecContext->width, mCodecContext->height);
     info.mStereoMode = StereoMode::MONO;
     info.mHasVideo = true;
 
@@ -86,7 +86,7 @@ FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(mp4_demuxer::MP4Sample* aSample)
       info, mImageContainer, aSample->byte_offset, frame->pkt_pts,
       aSample->duration, reinterpret_cast<Image*>(frame->opaque),
       aSample->is_sync_point, -1,
-      gfx::IntRect(0, 0, mCodecContext.width, mCodecContext.height));
+      gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
 
     mCallback->Output(data.forget());
   }
@@ -234,7 +234,7 @@ FFmpegH264Decoder<LIBAV_VER>::Drain()
 {
   // The maximum number of frames that can be waiting to be decoded is
   // max_b_frames + 1: One P frame and max_b_frames B frames.
-  for (int32_t i = 0; i <= mCodecContext.max_b_frames; i++) {
+  for (int32_t i = 0; i <= mCodecContext->max_b_frames; i++) {
     // An empty frame tells FFmpeg to decode the next delayed frame it has in
     // its queue, if it has any.
     nsAutoPtr<MP4Sample> empty(new MP4Sample());

From 2de855d731c9abc5cf2f7f42616772e761692209 Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Fri, 25 Jul 2014 14:20:22 +1200
Subject: [PATCH 066/128] Bug 1041950 - Fix usage with FFmpeg version 54 and
 above; r=k17e

---
 .../media/fmp4/ffmpeg/FFmpegAACDecoder.cpp    | 15 +++---
 .../media/fmp4/ffmpeg/FFmpegDataDecoder.cpp   | 39 ++++++++++++--
 content/media/fmp4/ffmpeg/FFmpegDataDecoder.h |  3 ++
 .../media/fmp4/ffmpeg/FFmpegFunctionList.h    | 54 +++++++++++--------
 .../media/fmp4/ffmpeg/FFmpegH264Decoder.cpp   | 38 ++++++++-----
 content/media/fmp4/ffmpeg/FFmpegLibs.h        |  2 +-
 .../media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp | 27 ++++++----
 .../media/fmp4/ffmpeg/FFmpegRuntimeLinker.h   |  2 +-
 8 files changed, 125 insertions(+), 55 deletions(-)

diff --git a/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp b/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
index 730a891bdd2..8d7cbede776 100644
--- a/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
@@ -65,9 +65,6 @@ CopyAndPackAudio(AVFrame* aFrame, uint32_t aNumChannels, uint32_t aNumSamples)
 void
 FFmpegAACDecoder<LIBAV_VER>::DecodePacket(MP4Sample* aSample)
 {
-  nsAutoPtr<AVFrame> frame(avcodec_alloc_frame());
-  avcodec_get_frame_defaults(frame);
-
   AVPacket packet;
   av_init_packet(&packet);
 
@@ -76,9 +73,15 @@ FFmpegAACDecoder<LIBAV_VER>::DecodePacket(MP4Sample* aSample)
   packet.size = aSample->size;
   packet.pos = aSample->byte_offset;
 
+  if (!PrepareFrame()) {
+    NS_WARNING("FFmpeg audio decoder failed to allocate frame.");
+    mCallback->Error();
+    return;
+  }
+
   int decoded;
   int bytesConsumed =
-    avcodec_decode_audio4(mCodecContext, frame.get(), &decoded, &packet);
+    avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
 
   if (bytesConsumed < 0 || !decoded) {
     NS_WARNING("FFmpeg audio decoder error.");
@@ -92,11 +95,11 @@ FFmpegAACDecoder<LIBAV_VER>::DecodePacket(MP4Sample* aSample)
   uint32_t numChannels = mCodecContext->channels;
 
   nsAutoArrayPtr<AudioDataValue> audio(
-    CopyAndPackAudio(frame.get(), numChannels, frame->nb_samples));
+    CopyAndPackAudio(mFrame, numChannels, mFrame->nb_samples));
 
   nsAutoPtr<AudioData> data(
     new AudioData(packet.pos, aSample->composition_timestamp, aSample->duration,
-                  frame->nb_samples, audio.forget(), numChannels));
+                  mFrame->nb_samples, audio.forget(), numChannels));
 
   mCallback->Output(data.forget());
 
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
index 7af9590fac4..66f462c239b 100644
--- a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
@@ -21,7 +21,10 @@ bool FFmpegDataDecoder<LIBAV_VER>::sFFmpegInitDone = false;
 
 FFmpegDataDecoder<LIBAV_VER>::FFmpegDataDecoder(MediaTaskQueue* aTaskQueue,
                                                 AVCodecID aCodecID)
-  : mTaskQueue(aTaskQueue), mCodecContext(nullptr), mCodecID(aCodecID)
+  : mTaskQueue(aTaskQueue)
+  , mCodecContext(nullptr)
+  , mFrame(NULL)
+  , mCodecID(aCodecID)
 {
   MOZ_COUNT_CTOR(FFmpegDataDecoder);
 }
@@ -94,8 +97,7 @@ FFmpegDataDecoder<LIBAV_VER>::Init()
   }
   mCodecContext->extradata = mExtraData.begin();
 
-  AVDictionary* opts = nullptr;
-  if (avcodec_open2(mCodecContext, codec, &opts) < 0) {
+  if (avcodec_open2(mCodecContext, codec, nullptr) < 0) {
     NS_WARNING("Couldn't initialise ffmpeg decoder");
     return NS_ERROR_FAILURE;
   }
@@ -125,8 +127,39 @@ FFmpegDataDecoder<LIBAV_VER>::Shutdown()
   if (sFFmpegInitDone) {
     avcodec_close(mCodecContext);
     av_freep(&mCodecContext);
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+    av_frame_free(&mFrame);
+#elif LIBAVCODEC_VERSION_MAJOR == 54
+    avcodec_free_frame(&mFrame);
+#else
+    delete mFrame;
+    mFrame = nullptr;
+#endif
   }
   return NS_OK;
 }
 
+AVFrame*
+FFmpegDataDecoder<LIBAV_VER>::PrepareFrame()
+{
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+  if (mFrame) {
+    av_frame_unref(mFrame);
+  } else {
+    mFrame = av_frame_alloc();
+  }
+#elif LIBAVCODEC_VERSION_MAJOR == 54
+  if (mFrame) {
+    avcodec_get_frame_defaults(mFrame);
+  } else {
+    mFrame = avcodec_alloc_frame();
+  }
+#else
+  delete mFrame;
+  mFrame = new AVFrame;
+  avcodec_get_frame_defaults(mFrame);
+#endif
+  return mFrame;
+}
+
 } // namespace mozilla
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
index 9dda82e0f6e..947898e072c 100644
--- a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
+++ b/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
@@ -35,8 +35,11 @@ public:
   virtual nsresult Shutdown() MOZ_OVERRIDE;
 
 protected:
+  AVFrame*        PrepareFrame();
+
   MediaTaskQueue* mTaskQueue;
   AVCodecContext* mCodecContext;
+  AVFrame*        mFrame;
   Vector<uint8_t> mExtraData;
 
 private:
diff --git a/content/media/fmp4/ffmpeg/FFmpegFunctionList.h b/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
index c91fc037903..7185f34a522 100644
--- a/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
+++ b/content/media/fmp4/ffmpeg/FFmpegFunctionList.h
@@ -3,29 +3,41 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* libavformat */
-AV_FUNC(av_register_all)
+AV_FUNC(av_register_all, 0)
 
 /* libavcodec */
-AV_FUNC(avcodec_align_dimensions2)
-AV_FUNC(avcodec_alloc_frame)
-AV_FUNC(avcodec_close)
-AV_FUNC(avcodec_decode_audio4)
-AV_FUNC(avcodec_decode_video2)
-AV_FUNC(avcodec_default_get_buffer)
-AV_FUNC(avcodec_default_release_buffer)
-AV_FUNC(avcodec_find_decoder)
-AV_FUNC(avcodec_flush_buffers)
-AV_FUNC(avcodec_alloc_context3)
-AV_FUNC(avcodec_get_edge_width)
-AV_FUNC(avcodec_get_frame_defaults)
-AV_FUNC(avcodec_open2)
-AV_FUNC(av_init_packet)
-AV_FUNC(av_dict_get)
+AV_FUNC(avcodec_align_dimensions2, 0)
+AV_FUNC(avcodec_get_frame_defaults, 0)
+AV_FUNC(avcodec_close, 0)
+AV_FUNC(avcodec_decode_audio4, 0)
+AV_FUNC(avcodec_decode_video2, 0)
+AV_FUNC(avcodec_default_get_buffer, 0)
+AV_FUNC(avcodec_default_release_buffer, 0)
+AV_FUNC(avcodec_find_decoder, 0)
+AV_FUNC(avcodec_flush_buffers, 0)
+AV_FUNC(avcodec_alloc_context3, 0)
+AV_FUNC(avcodec_get_edge_width, 0)
+AV_FUNC(avcodec_open2, 0)
+AV_FUNC(av_init_packet, 0)
+AV_FUNC(av_dict_get, 0)
 
 /* libavutil */
-AV_FUNC(av_image_fill_linesizes)
-AV_FUNC(av_image_fill_pointers)
-AV_FUNC(av_log_set_level)
-AV_FUNC(av_malloc)
-AV_FUNC(av_freep)
+AV_FUNC(av_image_fill_linesizes, 0)
+AV_FUNC(av_image_fill_pointers, 0)
+AV_FUNC(av_log_set_level, 0)
+AV_FUNC(av_malloc, 0)
+AV_FUNC(av_freep, 0)
 
+#if defined(LIBAVCODEC_VERSION_MAJOR) || defined(LIBAVCODEC_ALLVERSION)
+#if LIBAVCODEC_VERSION_MAJOR == 54 || defined(LIBAVCODEC_ALLVERSION)
+/* libavutil v54 only */
+AV_FUNC(avcodec_alloc_frame, 54)
+AV_FUNC(avcodec_free_frame, 54)
+#endif
+#if LIBAVCODEC_VERSION_MAJOR >= 55 || defined(LIBAVCODEC_ALLVERSION)
+/* libavutil v55 only */
+AV_FUNC(av_frame_alloc, 55)
+AV_FUNC(av_frame_free, 55)
+AV_FUNC(av_frame_unref, 55)
+#endif
+#endif
diff --git a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp b/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
index 1a2cfdda791..fafe73a7d1c 100644
--- a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
@@ -60,12 +60,15 @@ FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(mp4_demuxer::MP4Sample* aSample)
   packet.flags = aSample->is_sync_point ? AV_PKT_FLAG_KEY : 0;
   packet.pos = aSample->byte_offset;
 
-  nsAutoPtr<AVFrame> frame(avcodec_alloc_frame());
-  avcodec_get_frame_defaults(frame);
+  if (!PrepareFrame()) {
+    NS_WARNING("FFmpeg h264 decoder failed to allocate frame.");
+    mCallback->Error();
+    return;
+  }
 
   int decoded;
   int bytesConsumed =
-    avcodec_decode_video2(mCodecContext, frame, &decoded, &packet);
+    avcodec_decode_video2(mCodecContext, mFrame, &decoded, &packet);
 
   if (bytesConsumed < 0) {
     NS_WARNING("FFmpeg video decoder error.");
@@ -83,8 +86,8 @@ FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(mp4_demuxer::MP4Sample* aSample)
     info.mHasVideo = true;
 
     data = VideoData::CreateFromImage(
-      info, mImageContainer, aSample->byte_offset, frame->pkt_pts,
-      aSample->duration, reinterpret_cast<Image*>(frame->opaque),
+      info, mImageContainer, aSample->byte_offset, mFrame->pkt_pts,
+      aSample->duration, static_cast<Image*>(mFrame->opaque),
       aSample->is_sync_point, -1,
       gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
 
@@ -124,7 +127,7 @@ FFmpegH264Decoder<LIBAV_VER>::AllocateBufferCb(AVCodecContext* aCodecContext,
   MOZ_ASSERT(aCodecContext->codec_type == AVMEDIA_TYPE_VIDEO);
 
   FFmpegH264Decoder* self =
-    reinterpret_cast<FFmpegH264Decoder*>(aCodecContext->opaque);
+    static_cast<FFmpegH264Decoder*>(aCodecContext->opaque);
 
   switch (aCodecContext->pix_fmt) {
   case PIX_FMT_YUV420P:
@@ -138,10 +141,17 @@ FFmpegH264Decoder<LIBAV_VER>::AllocateBufferCb(AVCodecContext* aCodecContext,
 FFmpegH264Decoder<LIBAV_VER>::ReleaseBufferCb(AVCodecContext* aCodecContext,
                                               AVFrame* aFrame)
 {
-  Image* image = reinterpret_cast<Image*>(aFrame->opaque);
-  avcodec_default_release_buffer(aCodecContext, aFrame);
-  if (image) {
-    image->Release();
+  switch (aCodecContext->pix_fmt) {
+    case PIX_FMT_YUV420P: {
+      Image* image = static_cast<Image*>(aFrame->opaque);
+      if (image) {
+        image->Release();
+      }
+      break;
+    }
+    default:
+      avcodec_default_release_buffer(aCodecContext, aFrame);
+      break;
   }
 }
 
@@ -174,8 +184,10 @@ FFmpegH264Decoder<LIBAV_VER>::AllocateYUV420PVideoBuffer(
 
   nsRefPtr<Image> image =
     mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR);
-  PlanarYCbCrImage* ycbcr = reinterpret_cast<PlanarYCbCrImage*>(image.get());
-  uint8_t* buffer = ycbcr->AllocateAndGetNewBuffer(allocSize);
+  PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image.get());
+  uint8_t* buffer = ycbcr->AllocateAndGetNewBuffer(allocSize + 64);
+  // FFmpeg requires a 16/32 bytes-aligned buffer, align it on 64 to be safe
+  buffer = reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(buffer) + 63) & ~63);
 
   if (!buffer) {
     NS_WARNING("Failed to allocate buffer for FFmpeg video decoding");
@@ -207,7 +219,7 @@ FFmpegH264Decoder<LIBAV_VER>::AllocateYUV420PVideoBuffer(
   PlanarYCbCrDataFromAVFrame(data, aFrame);
   ycbcr->SetDataNoCopy(data);
 
-  aFrame->opaque = reinterpret_cast<void*>(image.forget().take());
+  aFrame->opaque = static_cast<void*>(image.forget().take());
 
   return 0;
 }
diff --git a/content/media/fmp4/ffmpeg/FFmpegLibs.h b/content/media/fmp4/ffmpeg/FFmpegLibs.h
index 2f25d108726..22050d58860 100644
--- a/content/media/fmp4/ffmpeg/FFmpegLibs.h
+++ b/content/media/fmp4/ffmpeg/FFmpegLibs.h
@@ -25,7 +25,7 @@ enum { LIBAV_VER = LIBAVFORMAT_VERSION_MAJOR };
 
 namespace mozilla {
 
-#define AV_FUNC(func) extern typeof(func)* func;
+#define AV_FUNC(func, ver) extern typeof(func)* func;
 #include "FFmpegFunctionList.h"
 #undef AV_FUNC
 
diff --git a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
index daf0d6d08aa..fe322268c05 100644
--- a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -22,6 +22,7 @@ struct AvFormatLib
 {
   const char* Name;
   PlatformDecoderModule* (*Factory)();
+  uint32_t Version;
 };
 
 template <int V> class FFmpegDecoderModule
@@ -31,16 +32,18 @@ public:
 };
 
 static const AvFormatLib sLibs[] = {
-  { "libavformat.so.55", FFmpegDecoderModule<55>::Create },
-  { "libavformat.so.54", FFmpegDecoderModule<54>::Create },
-  { "libavformat.so.53", FFmpegDecoderModule<53>::Create },
+  { "libavformat.so.55", FFmpegDecoderModule<55>::Create, 55 },
+  { "libavformat.so.54", FFmpegDecoderModule<54>::Create, 54 },
+  { "libavformat.so.53", FFmpegDecoderModule<53>::Create, 53 },
 };
 
 void* FFmpegRuntimeLinker::sLinkedLib = nullptr;
 const AvFormatLib* FFmpegRuntimeLinker::sLib = nullptr;
 
-#define AV_FUNC(func) void (*func)();
+#define AV_FUNC(func, ver) void (*func)();
+#define LIBAVCODEC_ALLVERSION
 #include "FFmpegFunctionList.h"
+#undef LIBAVCODEC_ALLVERSION
 #undef AV_FUNC
 
 /* static */ bool
@@ -54,7 +57,7 @@ FFmpegRuntimeLinker::Link()
     const AvFormatLib* lib = &sLibs[i];
     sLinkedLib = dlopen(lib->Name, RTLD_NOW | RTLD_LOCAL);
     if (sLinkedLib) {
-      if (Bind(lib->Name)) {
+      if (Bind(lib->Name, lib->Version)) {
         sLib = lib;
         sLinkStatus = LinkStatus_SUCCEEDED;
         return true;
@@ -77,15 +80,19 @@ FFmpegRuntimeLinker::Link()
 }
 
 /* static */ bool
-FFmpegRuntimeLinker::Bind(const char* aLibName)
+FFmpegRuntimeLinker::Bind(const char* aLibName, uint32_t Version)
 {
-#define AV_FUNC(func)                                                          \
-  if (!(func = (typeof(func))dlsym(sLinkedLib, #func))) {                      \
-    FFMPEG_LOG("Couldn't load function " #func " from %s.", aLibName);         \
-    return false;                                                              \
+#define LIBAVCODEC_ALLVERSION
+#define AV_FUNC(func, ver)                                                     \
+  if (ver == 0 || ver == Version) {                                            \
+    if (!(func = (typeof(func))dlsym(sLinkedLib, #func))) {                    \
+      FFMPEG_LOG("Couldn't load function " #func " from %s.", aLibName);       \
+      return false;                                                            \
+    }                                                                          \
   }
 #include "FFmpegFunctionList.h"
 #undef AV_FUNC
+#undef LIBAVCODEC_ALLVERSION
   return true;
 }
 
diff --git a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
index 0c4762e45e4..12371258767 100644
--- a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
+++ b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
@@ -24,7 +24,7 @@ private:
   static void* sLinkedLib;
   static const AvFormatLib* sLib;
 
-  static bool Bind(const char* aLibName);
+  static bool Bind(const char* aLibName, uint32_t Version);
 
   static enum LinkStatus {
     LinkStatus_INIT = 0,

From fe2c056b8e8988c239427fb1bd8eb65edb6fcd66 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Mon, 28 Jul 2014 11:20:34 +1200
Subject: [PATCH 067/128] Bug 1042373 - Implement GMPDecryptor interface for
 use in GMPs. r=jesup

---
 content/media/gmp/GMPChild.cpp                |  31 ++
 content/media/gmp/GMPChild.h                  |   9 +-
 content/media/gmp/GMPDecryptorChild.cpp       | 328 ++++++++++++++++
 content/media/gmp/GMPDecryptorChild.h         | 127 +++++++
 content/media/gmp/GMPDecryptorParent.cpp      | 358 ++++++++++++++++++
 content/media/gmp/GMPDecryptorParent.h        | 113 ++++++
 content/media/gmp/GMPDecryptorProxy.h         |  89 +++++
 .../media/gmp/GMPEncryptedBufferDataImpl.cpp  |  84 ++++
 .../media/gmp/GMPEncryptedBufferDataImpl.h    |  68 ++++
 content/media/gmp/GMPMessageUtils.h           |  34 ++
 content/media/gmp/GMPParent.cpp               |  62 ++-
 content/media/gmp/GMPParent.h                 |  13 +
 content/media/gmp/GMPService.cpp              |  32 ++
 content/media/gmp/GMPTypes.ipdlh              |   8 +
 content/media/gmp/PGMP.ipdl                   |   3 +
 content/media/gmp/PGMPDecryptor.ipdl          |  85 +++++
 content/media/gmp/moz.build                   |   8 +
 .../media/gmp/mozIGeckoMediaPluginService.idl |  10 +-
 18 files changed, 1459 insertions(+), 3 deletions(-)
 create mode 100644 content/media/gmp/GMPDecryptorChild.cpp
 create mode 100644 content/media/gmp/GMPDecryptorChild.h
 create mode 100644 content/media/gmp/GMPDecryptorParent.cpp
 create mode 100644 content/media/gmp/GMPDecryptorParent.h
 create mode 100644 content/media/gmp/GMPDecryptorProxy.h
 create mode 100644 content/media/gmp/GMPEncryptedBufferDataImpl.cpp
 create mode 100644 content/media/gmp/GMPEncryptedBufferDataImpl.h
 create mode 100644 content/media/gmp/PGMPDecryptor.ipdl

diff --git a/content/media/gmp/GMPChild.cpp b/content/media/gmp/GMPChild.cpp
index 95a030a494c..b7f38664432 100644
--- a/content/media/gmp/GMPChild.cpp
+++ b/content/media/gmp/GMPChild.cpp
@@ -6,6 +6,7 @@
 #include "GMPChild.h"
 #include "GMPVideoDecoderChild.h"
 #include "GMPVideoEncoderChild.h"
+#include "GMPDecryptorChild.h"
 #include "GMPVideoHost.h"
 #include "nsIFile.h"
 #include "nsXULAppAPI.h"
@@ -189,6 +190,19 @@ GMPChild::DeallocPGMPVideoDecoderChild(PGMPVideoDecoderChild* aActor)
   return true;
 }
 
+PGMPDecryptorChild*
+GMPChild::AllocPGMPDecryptorChild()
+{
+  return new GMPDecryptorChild(this);
+}
+
+bool
+GMPChild::DeallocPGMPDecryptorChild(PGMPDecryptorChild* aActor)
+{
+  delete aActor;
+  return true;
+}
+
 PGMPVideoEncoderChild*
 GMPChild::AllocPGMPVideoEncoderChild()
 {
@@ -234,5 +248,22 @@ GMPChild::RecvPGMPVideoEncoderConstructor(PGMPVideoEncoderChild* aActor)
   return true;
 }
 
+bool
+GMPChild::RecvPGMPDecryptorConstructor(PGMPDecryptorChild* aActor)
+{
+  GMPDecryptorChild* child = static_cast<GMPDecryptorChild*>(aActor);
+  GMPDecryptorHost* host = static_cast<GMPDecryptorHost*>(child);
+
+  void* session = nullptr;
+  GMPErr err = mGetAPIFunc("eme-decrypt", host, &session);
+  if (err != GMPNoErr || !session) {
+    return false;
+  }
+
+  child->Init(static_cast<GMPDecryptor*>(session));
+
+  return true;
+}
+
 } // namespace gmp
 } // namespace mozilla
diff --git a/content/media/gmp/GMPChild.h b/content/media/gmp/GMPChild.h
index 508fac88de1..58f751f61e8 100644
--- a/content/media/gmp/GMPChild.h
+++ b/content/media/gmp/GMPChild.h
@@ -29,12 +29,19 @@ public:
 private:
   virtual PCrashReporterChild* AllocPCrashReporterChild(const NativeThreadId& aThread) MOZ_OVERRIDE;
   virtual bool DeallocPCrashReporterChild(PCrashReporterChild*) MOZ_OVERRIDE;
+
   virtual PGMPVideoDecoderChild* AllocPGMPVideoDecoderChild() MOZ_OVERRIDE;
   virtual bool DeallocPGMPVideoDecoderChild(PGMPVideoDecoderChild* aActor) MOZ_OVERRIDE;
+  virtual bool RecvPGMPVideoDecoderConstructor(PGMPVideoDecoderChild* aActor) MOZ_OVERRIDE;
+
   virtual PGMPVideoEncoderChild* AllocPGMPVideoEncoderChild() MOZ_OVERRIDE;
   virtual bool DeallocPGMPVideoEncoderChild(PGMPVideoEncoderChild* aActor) MOZ_OVERRIDE;
-  virtual bool RecvPGMPVideoDecoderConstructor(PGMPVideoDecoderChild* aActor) MOZ_OVERRIDE;
   virtual bool RecvPGMPVideoEncoderConstructor(PGMPVideoEncoderChild* aActor) MOZ_OVERRIDE;
+
+  virtual PGMPDecryptorChild* AllocPGMPDecryptorChild() MOZ_OVERRIDE;
+  virtual bool DeallocPGMPDecryptorChild(PGMPDecryptorChild* aActor) MOZ_OVERRIDE;
+  virtual bool RecvPGMPDecryptorConstructor(PGMPDecryptorChild* aActor) MOZ_OVERRIDE;
+
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
   virtual void ProcessingError(Result aWhat) MOZ_OVERRIDE;
 
diff --git a/content/media/gmp/GMPDecryptorChild.cpp b/content/media/gmp/GMPDecryptorChild.cpp
new file mode 100644
index 00000000000..3b0a50ffed6
--- /dev/null
+++ b/content/media/gmp/GMPDecryptorChild.cpp
@@ -0,0 +1,328 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GMPDecryptorChild.h"
+#include "GMPChild.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/unused.h"
+#include <ctime>
+
+namespace mozilla {
+namespace gmp {
+
+GMPDecryptorChild::GMPDecryptorChild(GMPChild* aPlugin)
+  : mPlugin(aPlugin)
+  , mSession(nullptr)
+{
+  MOZ_ASSERT(mPlugin);
+}
+
+GMPDecryptorChild::~GMPDecryptorChild()
+{
+}
+
+void
+GMPDecryptorChild::Init(GMPDecryptor* aSession)
+{
+  MOZ_ASSERT(aSession);
+  mSession = aSession;
+}
+
+void
+GMPDecryptorChild::ResolveNewSessionPromise(uint32_t aPromiseId,
+                                            const char* aSessionId,
+                                            uint32_t aSessionIdLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString id(aSessionId, aSessionIdLength);
+  SendResolveNewSessionPromise(aPromiseId, id);
+}
+
+void
+GMPDecryptorChild::ResolvePromise(uint32_t aPromiseId)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  SendResolvePromise(aPromiseId);
+}
+
+void
+GMPDecryptorChild::RejectPromise(uint32_t aPromiseId,
+                                 GMPDOMException aException,
+                                 const char* aMessage,
+                                 uint32_t aMessageLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString msg(aMessage, aMessageLength);
+  SendRejectPromise(aPromiseId, aException, msg);
+}
+
+void
+GMPDecryptorChild::SessionMessage(const char* aSessionId,
+                                  uint32_t aSessionIdLength,
+                                  const uint8_t* aMessage,
+                                  uint32_t aMessageLength,
+                                  const char* aDestinationURL,
+                                  uint32_t aDestinationURLLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString id(aSessionId, aSessionIdLength);
+  nsTArray<uint8_t> msg;
+  msg.AppendElements(aMessage, aMessageLength);
+  nsAutoCString url(aDestinationURL, aDestinationURLLength);
+  SendSessionMessage(id, msg, url);
+}
+
+void
+GMPDecryptorChild::ExpirationChange(const char* aSessionId,
+                                    uint32_t aSessionIdLength,
+                                    GMPTimestamp aExpiryTime)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString id(aSessionId, aSessionIdLength);
+  SendExpirationChange(id, aExpiryTime);
+}
+
+void
+GMPDecryptorChild::SessionClosed(const char* aSessionId,
+                                 uint32_t aSessionIdLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString id(aSessionId, aSessionIdLength);
+  SendSessionClosed(id);
+}
+
+void
+GMPDecryptorChild::SessionError(const char* aSessionId,
+                                uint32_t aSessionIdLength,
+                                GMPDOMException aException,
+                                uint32_t aSystemCode,
+                                const char* aMessage,
+                                uint32_t aMessageLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString id(aSessionId, aSessionIdLength);
+  nsAutoCString msg(aMessage, aMessageLength);
+  SendSessionError(id, aException, aSystemCode, msg);
+}
+
+void
+GMPDecryptorChild::KeyIdUsable(const char* aSessionId,
+                               uint32_t aSessionIdLength,
+                               const uint8_t* aKeyId,
+                               uint32_t aKeyIdLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString sid(aSessionId, aSessionIdLength);
+  nsAutoTArray<uint8_t, 16> kid;
+  kid.AppendElements(aKeyId, aKeyIdLength);
+  SendKeyIdUsable(sid, kid);
+}
+
+void
+GMPDecryptorChild::KeyIdNotUsable(const char* aSessionId,
+                                  uint32_t aSessionIdLength,
+                                  const uint8_t* aKeyId,
+                                  uint32_t aKeyIdLength)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  nsAutoCString sid(aSessionId, aSessionIdLength);
+  nsAutoTArray<uint8_t, 16> kid;
+  kid.AppendElements(aKeyId, aKeyIdLength);
+  SendKeyIdNotUsable(sid, kid);
+}
+
+void
+GMPDecryptorChild::Decrypted(GMPBuffer* aBuffer, GMPErr aResult)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  auto buffer = static_cast<GMPBufferImpl*>(aBuffer);
+  SendDecrypted(buffer->mId, aResult, buffer->mData);
+}
+
+void
+GMPDecryptorChild::SetCapabilities(uint64_t aCaps)
+{
+  MOZ_ASSERT(mPlugin->GMPMessageLoop() == MessageLoop::current());
+
+  SendSetCaps(aCaps);
+}
+
+void
+GMPDecryptorChild::GetNodeId(const char** aOutNodeId,
+                             uint32_t* aOutNodeIdLength)
+{
+  static const char* id = "placeholder_node_id";
+  *aOutNodeId = id;
+  *aOutNodeIdLength = strlen(id);
+}
+
+void
+GMPDecryptorChild::GetSandboxVoucher(const uint8_t** aVoucher,
+                                     uint8_t* aVoucherLength)
+{
+  const char* voucher = "placeholder_sandbox_voucher.";
+  *aVoucher = (uint8_t*)voucher;
+  *aVoucherLength = strlen(voucher);
+}
+
+void
+GMPDecryptorChild::GetPluginVoucher(const uint8_t** aVoucher,
+                                    uint8_t* aVoucherLength)
+{
+  const char* voucher = "placeholder_plugin_voucher.";
+  *aVoucher = (uint8_t*)voucher;
+  *aVoucherLength = strlen(voucher);
+}
+
+bool
+GMPDecryptorChild::RecvInit()
+{
+  if (!mSession) {
+    return false;
+  }
+  mSession->Init(this);
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvCreateSession(const uint32_t& aPromiseId,
+                                     const nsCString& aInitDataType,
+                                     const nsTArray<uint8_t>& aInitData,
+                                     const GMPSessionType& aSessionType)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->CreateSession(aPromiseId,
+                          aInitDataType.get(),
+                          aInitDataType.Length(),
+                          aInitData.Elements(),
+                          aInitData.Length(),
+                          aSessionType);
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvLoadSession(const uint32_t& aPromiseId,
+                                   const nsCString& aSessionId)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->LoadSession(aPromiseId,
+                        aSessionId.get(),
+                        aSessionId.Length());
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvUpdateSession(const uint32_t& aPromiseId,
+                                     const nsCString& aSessionId,
+                                     const nsTArray<uint8_t>& aResponse)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->UpdateSession(aPromiseId,
+                          aSessionId.get(),
+                          aSessionId.Length(),
+                          aResponse.Elements(),
+                          aResponse.Length());
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvCloseSession(const uint32_t& aPromiseId,
+                                    const nsCString& aSessionId)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->CloseSession(aPromiseId,
+                         aSessionId.get(),
+                         aSessionId.Length());
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvRemoveSession(const uint32_t& aPromiseId,
+                                     const nsCString& aSessionId)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->RemoveSession(aPromiseId,
+                          aSessionId.get(),
+                          aSessionId.Length());
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvSetServerCertificate(const uint32_t& aPromiseId,
+                                            const nsTArray<uint8_t>& aServerCert)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->SetServerCertificate(aPromiseId,
+                                 aServerCert.Elements(),
+                                 aServerCert.Length());
+
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvDecrypt(const uint32_t& aId,
+                               const nsTArray<uint8_t>& aBuffer,
+                               const GMPDecryptionData& aMetadata)
+{
+  if (!mSession) {
+    return false;
+  }
+
+  GMPEncryptedBufferDataImpl metadata(aMetadata);
+
+  mSession->Decrypt(new GMPBufferImpl(aId, aBuffer), &metadata);
+  return true;
+}
+
+bool
+GMPDecryptorChild::RecvDecryptingComplete()
+{
+  if (!mSession) {
+    return false;
+  }
+
+  mSession->DecryptingComplete();
+  mSession = nullptr;
+
+  unused << Send__delete__(this);
+
+  return true;
+}
+
+} // namespace gmp
+} // namespace mozilla
diff --git a/content/media/gmp/GMPDecryptorChild.h b/content/media/gmp/GMPDecryptorChild.h
new file mode 100644
index 00000000000..786518ed33f
--- /dev/null
+++ b/content/media/gmp/GMPDecryptorChild.h
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GMPDecryptorChild_h_
+#define GMPDecryptorChild_h_
+
+#include "mozilla/gmp/PGMPDecryptorChild.h"
+#include "gmp-decryption.h"
+#include "mozilla/gmp/GMPTypes.h"
+#include "GMPEncryptedBufferDataImpl.h"
+
+namespace mozilla {
+namespace gmp {
+
+class GMPChild;
+
+class GMPDecryptorChild : public GMPDecryptorCallback
+                        , public GMPDecryptorHost
+                        , public PGMPDecryptorChild
+{
+public:
+  GMPDecryptorChild(GMPChild* aPlugin);
+  ~GMPDecryptorChild();
+
+  void Init(GMPDecryptor* aSession);
+
+  // GMPDecryptorCallback
+  virtual void ResolveNewSessionPromise(uint32_t aPromiseId,
+                                        const char* aSessionId,
+                                        uint32_t aSessionIdLength) MOZ_OVERRIDE;
+  virtual void ResolvePromise(uint32_t aPromiseId) MOZ_OVERRIDE;
+
+  virtual void RejectPromise(uint32_t aPromiseId,
+                             GMPDOMException aException,
+                             const char* aMessage,
+                             uint32_t aMessageLength) MOZ_OVERRIDE;
+
+  virtual void SessionMessage(const char* aSessionId,
+                              uint32_t aSessionIdLength,
+                              const uint8_t* aMessage,
+                              uint32_t aMessageLength,
+                              const char* aDestinationURL,
+                              uint32_t aDestinationURLLength) MOZ_OVERRIDE;
+
+  virtual void ExpirationChange(const char* aSessionId,
+                                 uint32_t aSessionIdLength,
+                                 GMPTimestamp aExpiryTime) MOZ_OVERRIDE;
+
+   virtual void SessionClosed(const char* aSessionId,
+                             uint32_t aSessionIdLength) MOZ_OVERRIDE;
+
+  virtual void SessionError(const char* aSessionId,
+                            uint32_t aSessionIdLength,
+                            GMPDOMException aException,
+                            uint32_t aSystemCode,
+                            const char* aMessage,
+                            uint32_t aMessageLength) MOZ_OVERRIDE;
+
+  virtual void KeyIdUsable(const char* aSessionId,
+                           uint32_t aSessionIdLength,
+                           const uint8_t* aKeyId,
+                           uint32_t aKeyIdLength) MOZ_OVERRIDE;
+
+  virtual void KeyIdNotUsable(const char* aSessionId,
+                              uint32_t aSessionIdLength,
+                              const uint8_t* aKeyId,
+                              uint32_t aKeyIdLength) MOZ_OVERRIDE;
+
+  virtual void SetCapabilities(uint64_t aCaps) MOZ_OVERRIDE;
+
+  virtual void Decrypted(GMPBuffer* aBuffer, GMPErr aResult) MOZ_OVERRIDE;
+
+  // GMPDecryptorHost
+  virtual void GetNodeId(const char** aOutNodeId,
+                         uint32_t* aOutNodeIdLength) MOZ_OVERRIDE;
+
+  virtual void GetSandboxVoucher(const uint8_t** aVoucher,
+                                 uint8_t* aVoucherLength) MOZ_OVERRIDE;
+
+  virtual void GetPluginVoucher(const uint8_t** aVoucher,
+                                uint8_t* aVoucherLength) MOZ_OVERRIDE;
+private:
+
+  // GMPDecryptorChild
+  virtual bool RecvInit() MOZ_OVERRIDE;
+
+  virtual bool RecvCreateSession(const uint32_t& aPromiseId,
+                                 const nsCString& aInitDataType,
+                                 const nsTArray<uint8_t>& aInitData,
+                                 const GMPSessionType& aSessionType) MOZ_OVERRIDE;
+
+  virtual bool RecvLoadSession(const uint32_t& aPromiseId,
+                               const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual bool RecvUpdateSession(const uint32_t& aPromiseId,
+                                 const nsCString& aSessionId,
+                                 const nsTArray<uint8_t>& aResponse) MOZ_OVERRIDE;
+
+  virtual bool RecvCloseSession(const uint32_t& aPromiseId,
+                                const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual bool RecvRemoveSession(const uint32_t& aPromiseId,
+                                 const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual bool RecvDecrypt(const uint32_t& aId,
+                           const nsTArray<uint8_t>& aBuffer,
+                           const GMPDecryptionData& aMetadata);
+
+  // Resolve/reject promise on completion.
+  virtual bool RecvSetServerCertificate(const uint32_t& aPromiseId,
+                                        const nsTArray<uint8_t>& aServerCert) MOZ_OVERRIDE;
+
+  virtual bool RecvDecryptingComplete() MOZ_OVERRIDE;
+
+  GMPChild* mPlugin;
+
+  // GMP's GMPDecryptor implementation.
+  // Only call into this on the (GMP process) main thread.
+  GMPDecryptor* mSession;
+};
+
+} // namespace gmp
+} // namespace mozilla
+
+#endif // GMPDecryptorChild_h_
diff --git a/content/media/gmp/GMPDecryptorParent.cpp b/content/media/gmp/GMPDecryptorParent.cpp
new file mode 100644
index 00000000000..efec18cd313
--- /dev/null
+++ b/content/media/gmp/GMPDecryptorParent.cpp
@@ -0,0 +1,358 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GMPDecryptorParent.h"
+#include "GMPParent.h"
+#include "mp4_demuxer/DecoderData.h"
+#include "mozilla/unused.h"
+
+namespace mozilla {
+namespace gmp {
+
+GMPDecryptorParent::GMPDecryptorParent(GMPParent* aPlugin)
+  : mIsOpen(false)
+  , mPlugin(aPlugin)
+  , mCallback(nullptr)
+{
+  MOZ_ASSERT(mPlugin);
+}
+
+GMPDecryptorParent::~GMPDecryptorParent()
+{
+}
+
+nsresult
+GMPDecryptorParent::Init(GMPDecryptorProxyCallback* aCallback)
+{
+  if (mIsOpen) {
+    NS_WARNING("Trying to re-use an in-use GMP decrypter!");
+    return NS_ERROR_FAILURE;
+  }
+  mCallback = aCallback;
+  if (!SendInit()) {
+    return NS_ERROR_FAILURE;
+  }
+  mIsOpen = true;
+  return NS_OK;
+}
+
+void
+GMPDecryptorParent::CreateSession(uint32_t aPromiseId,
+                                  const nsCString& aInitDataType,
+                                  const nsTArray<uint8_t>& aInitData,
+                                  GMPSessionType aSessionType)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aInitDataType.IsEmpty() && !aInitData.IsEmpty());
+  unused << SendCreateSession(aPromiseId, aInitDataType, aInitData, aSessionType);
+}
+
+void
+GMPDecryptorParent::LoadSession(uint32_t aPromiseId,
+                                const nsCString& aSessionId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aSessionId.IsEmpty());
+  unused << SendLoadSession(aPromiseId, aSessionId);
+}
+
+void
+GMPDecryptorParent::UpdateSession(uint32_t aPromiseId,
+                                  const nsCString& aSessionId,
+                                  const nsTArray<uint8_t>& aResponse)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aSessionId.IsEmpty() && !aResponse.IsEmpty());
+  unused << SendUpdateSession(aPromiseId, aSessionId, aResponse);
+}
+
+void
+GMPDecryptorParent::CloseSession(uint32_t aPromiseId,
+                                 const nsCString& aSessionId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aSessionId.IsEmpty());
+  unused << SendCloseSession(aPromiseId, aSessionId);
+}
+
+void
+GMPDecryptorParent::RemoveSession(uint32_t aPromiseId,
+                                  const nsCString& aSessionId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aSessionId.IsEmpty());
+  unused << SendRemoveSession(aPromiseId, aSessionId);
+}
+
+void
+GMPDecryptorParent::SetServerCertificate(uint32_t aPromiseId,
+                                         const nsTArray<uint8_t>& aServerCert)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+  // Caller should ensure parameters passed in from JS are valid.
+  MOZ_ASSERT(!aServerCert.IsEmpty());
+  unused << SendSetServerCertificate(aPromiseId, aServerCert);
+}
+
+void
+GMPDecryptorParent::Decrypt(uint32_t aId,
+                            const mp4_demuxer::CryptoSample& aCrypto,
+                            const nsTArray<uint8_t>& aBuffer)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return;
+  }
+
+  // Caller should ensure parameters passed in are valid.
+  MOZ_ASSERT(!aBuffer.IsEmpty() && aCrypto.valid);
+
+  GMPDecryptionData data(aCrypto.key,
+                         aCrypto.iv,
+                         aCrypto.plain_sizes,
+                         aCrypto.encrypted_sizes);
+
+  unused << SendDecrypt(aId, aBuffer, data);
+}
+
+bool
+GMPDecryptorParent::RecvResolveNewSessionPromise(const uint32_t& aPromiseId,
+                                                 const nsCString& aSessionId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->ResolveNewSessionPromise(aPromiseId, aSessionId);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvResolvePromise(const uint32_t& aPromiseId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->ResolvePromise(aPromiseId);
+  return true;
+}
+
+nsresult
+GMPExToNsresult(GMPDOMException aDomException) {
+  switch (aDomException) {
+    case kGMPNoModificationAllowedError: return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
+    case kGMPNotFoundError: return NS_ERROR_DOM_NOT_FOUND_ERR;
+    case kGMPNotSupportedError: return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+    case kGMPInvalidStateError: return NS_ERROR_DOM_INVALID_STATE_ERR;
+    case kGMPSyntaxError: return NS_ERROR_DOM_SYNTAX_ERR;
+    case kGMPInvalidModificationError: return NS_ERROR_DOM_INVALID_MODIFICATION_ERR;
+    case kGMPInvalidAccessError: return NS_ERROR_DOM_INVALID_ACCESS_ERR;
+    case kGMPSecurityError: return NS_ERROR_DOM_SECURITY_ERR;
+    case kGMPAbortError: return NS_ERROR_DOM_ABORT_ERR;
+    case kGMPQuotaExceededError: return NS_ERROR_DOM_QUOTA_EXCEEDED_ERR;
+    case kGMPTimeoutError: return NS_ERROR_DOM_TIMEOUT_ERR;
+    default: return NS_ERROR_DOM_UNKNOWN_ERR;
+  }
+}
+
+bool
+GMPDecryptorParent::RecvRejectPromise(const uint32_t& aPromiseId,
+                                      const GMPDOMException& aException,
+                                      const nsCString& aMessage)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->RejectPromise(aPromiseId, GMPExToNsresult(aException), aMessage);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvSessionMessage(const nsCString& aSessionId,
+                                       const nsTArray<uint8_t>& aMessage,
+                                       const nsCString& aDestinationURL)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->SessionMessage(aSessionId, aMessage, aDestinationURL);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvExpirationChange(const nsCString& aSessionId,
+                                         const double& aExpiryTime)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->ExpirationChange(aSessionId, aExpiryTime);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvSessionClosed(const nsCString& aSessionId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->SessionClosed(aSessionId);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvSessionError(const nsCString& aSessionId,
+                                     const GMPDOMException& aException,
+                                     const uint32_t& aSystemCode,
+                                     const nsCString& aMessage)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->SessionError(aSessionId,
+                          GMPExToNsresult(aException),
+                          aSystemCode,
+                          aMessage);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvKeyIdUsable(const nsCString& aSessionId,
+                                    const nsTArray<uint8_t>& aKeyId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->KeyIdUsable(aSessionId, aKeyId);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvKeyIdNotUsable(const nsCString& aSessionId,
+                                       const nsTArray<uint8_t>& aKeyId)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->KeyIdNotUsable(aSessionId, aKeyId);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvSetCaps(const uint64_t& aCaps)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->SetCaps(aCaps);
+  return true;
+}
+
+bool
+GMPDecryptorParent::RecvDecrypted(const uint32_t& aId,
+                                  const GMPErr& aErr,
+                                  const nsTArray<uint8_t>& aBuffer)
+{
+  if (!mIsOpen) {
+    NS_WARNING("Trying to use a dead GMP decrypter!");
+    return false;
+  }
+  mCallback->Decrypted(aId, aErr, aBuffer);
+  return true;
+}
+
+// Note: may be called via Terminated()
+void
+GMPDecryptorParent::Close()
+{
+  MOZ_ASSERT(mPlugin->GMPThread() == NS_GetCurrentThread());
+  // Consumer is done with us; we can shut down.  No more callbacks should
+  // be made to mCallback. Note: do this before Shutdown()!
+  mCallback = nullptr;
+  // Let Shutdown mark us as dead so it knows if we had been alive
+
+  // In case this is the last reference
+  nsRefPtr<GMPDecryptorParent> kungfudeathgrip(this);
+  NS_RELEASE(kungfudeathgrip);
+  Shutdown();
+}
+
+void
+GMPDecryptorParent::Shutdown()
+{
+  MOZ_ASSERT(mPlugin->GMPThread() == NS_GetCurrentThread());
+
+  // Notify client we're gone!  Won't occur after Close()
+  if (mCallback) {
+    mCallback->Terminated();
+    mCallback = nullptr;
+  }
+
+  if (mIsOpen) {
+    mIsOpen = false;
+    unused << SendDecryptingComplete();
+  }
+}
+
+// Note: Keep this sync'd up with Shutdown
+void
+GMPDecryptorParent::ActorDestroy(ActorDestroyReason aWhy)
+{
+  mIsOpen = false;
+  if (mCallback) {
+    // May call Close() (and Shutdown()) immediately or with a delay
+    mCallback->Terminated();
+    mCallback = nullptr;
+  }
+  if (mPlugin) {
+    mPlugin->DecryptorDestroyed(this);
+    mPlugin = nullptr;
+  }
+}
+
+bool
+GMPDecryptorParent::Recv__delete__()
+{
+  if (mPlugin) {
+    mPlugin->DecryptorDestroyed(this);
+    mPlugin = nullptr;
+  }
+  return true;
+}
+
+} // namespace gmp
+} // namespace mozilla
diff --git a/content/media/gmp/GMPDecryptorParent.h b/content/media/gmp/GMPDecryptorParent.h
new file mode 100644
index 00000000000..7b17e326216
--- /dev/null
+++ b/content/media/gmp/GMPDecryptorParent.h
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GMPDecryptorParent_h_
+#define GMPDecryptorParent_h_
+
+#include "mozilla/gmp/PGMPDecryptorParent.h"
+#include "mozilla/RefPtr.h"
+#include "gmp-decryption.h"
+#include "GMPDecryptorProxy.h"
+namespace mp4_demuxer {
+class CryptoSample;
+}
+
+namespace mozilla {
+namespace gmp {
+
+class GMPParent;
+
+class GMPDecryptorParent MOZ_FINAL : public GMPDecryptorProxy
+                                   , public PGMPDecryptorParent
+{
+public:
+  NS_INLINE_DECL_REFCOUNTING(GMPDecryptorParent)
+
+  GMPDecryptorParent(GMPParent *aPlugin);
+
+  // GMPDecryptorProxy
+  virtual nsresult Init(GMPDecryptorProxyCallback* aCallback) MOZ_OVERRIDE;
+
+  virtual void CreateSession(uint32_t aPromiseId,
+                             const nsCString& aInitDataType,
+                             const nsTArray<uint8_t>& aInitData,
+                             GMPSessionType aSessionType) MOZ_OVERRIDE;
+
+  virtual void LoadSession(uint32_t aPromiseId,
+                           const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual void UpdateSession(uint32_t aPromiseId,
+                             const nsCString& aSessionId,
+                             const nsTArray<uint8_t>& aResponse) MOZ_OVERRIDE;
+
+  virtual void CloseSession(uint32_t aPromiseId,
+                            const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual void RemoveSession(uint32_t aPromiseId,
+                             const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual void SetServerCertificate(uint32_t aPromiseId,
+                                    const nsTArray<uint8_t>& aServerCert) MOZ_OVERRIDE;
+
+  virtual void Decrypt(uint32_t aId,
+                       const mp4_demuxer::CryptoSample& aCrypto,
+                       const nsTArray<uint8_t>& aBuffer) MOZ_OVERRIDE;
+
+  virtual void Close() MOZ_OVERRIDE;
+
+  void Shutdown();
+
+private:
+  ~GMPDecryptorParent();
+
+  // PGMPDecryptorParent
+
+  virtual bool RecvResolveNewSessionPromise(const uint32_t& aPromiseId,
+                                            const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual bool RecvResolvePromise(const uint32_t& aPromiseId) MOZ_OVERRIDE;
+
+  virtual bool RecvRejectPromise(const uint32_t& aPromiseId,
+                                 const GMPDOMException& aException,
+                                 const nsCString& aMessage) MOZ_OVERRIDE;
+
+  virtual bool RecvSessionMessage(const nsCString& aSessionId,
+                                  const nsTArray<uint8_t>& aMessage,
+                                  const nsCString& aDestinationURL) MOZ_OVERRIDE;
+
+  virtual bool RecvExpirationChange(const nsCString& aSessionId,
+                                    const double& aExpiryTime) MOZ_OVERRIDE;
+
+  virtual bool RecvSessionClosed(const nsCString& aSessionId) MOZ_OVERRIDE;
+
+  virtual bool RecvSessionError(const nsCString& aSessionId,
+                                const GMPDOMException& aException,
+                                const uint32_t& aSystemCode,
+                                const nsCString& aMessage) MOZ_OVERRIDE;
+
+  virtual bool RecvKeyIdUsable(const nsCString& aSessionId,
+                                const nsTArray<uint8_t>& aKeyId) MOZ_OVERRIDE;
+
+  virtual bool RecvKeyIdNotUsable(const nsCString& aSessionId,
+                                  const nsTArray<uint8_t>& aKeyId) MOZ_OVERRIDE;
+
+  virtual bool RecvDecrypted(const uint32_t& aId,
+                             const GMPErr& aErr,
+                             const nsTArray<uint8_t>& aBuffer) MOZ_OVERRIDE;
+
+  virtual bool RecvSetCaps(const uint64_t& aCaps) MOZ_OVERRIDE;
+
+  virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
+  virtual bool Recv__delete__() MOZ_OVERRIDE;
+
+  bool mIsOpen;
+  nsRefPtr<GMPParent> mPlugin;
+  GMPDecryptorProxyCallback* mCallback;
+};
+
+} // namespace gmp
+} // namespace mozilla
+
+#endif // GMPDecryptorChild_h_
diff --git a/content/media/gmp/GMPDecryptorProxy.h b/content/media/gmp/GMPDecryptorProxy.h
new file mode 100644
index 00000000000..5896964d7a3
--- /dev/null
+++ b/content/media/gmp/GMPDecryptorProxy.h
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GMPDecryptorProxy_h_
+#define GMPDecryptorProxy_h_
+
+#include "GMPCallbackBase.h"
+
+namespace mp4_demuxer {
+class CryptoSample;
+}
+
+class GMPDecryptorProxyCallback : public GMPCallbackBase {
+public:
+  ~GMPDecryptorProxyCallback() {}
+
+  virtual void ResolveNewSessionPromise(uint32_t aPromiseId,
+                                        const nsCString& aSessionId) = 0;
+
+  virtual void ResolvePromise(uint32_t aPromiseId) = 0;
+
+  virtual void RejectPromise(uint32_t aPromiseId,
+                             nsresult aException,
+                             const nsCString& aSessionId) = 0;
+
+  virtual void SessionMessage(const nsCString& aSessionId,
+                              const nsTArray<uint8_t>& aMessage,
+                              const nsCString& aDestinationURL) = 0;
+
+  virtual void ExpirationChange(const nsCString& aSessionId,
+                                GMPTimestamp aExpiryTime) = 0;
+
+  virtual void SessionClosed(const nsCString& aSessionId) = 0;
+
+  virtual void SessionError(const nsCString& aSessionId,
+                            nsresult aException,
+                            uint32_t aSystemCode,
+                            const nsCString& aMessage) = 0;
+
+  virtual void KeyIdUsable(const nsCString& aSessionId,
+                           const nsTArray<uint8_t>& aKeyId) = 0;
+
+  virtual void KeyIdNotUsable(const nsCString& aSessionId,
+                              const nsTArray<uint8_t>& aKeyId) = 0;
+
+  virtual void SetCaps(uint64_t aCaps) = 0;
+
+  virtual void Decrypted(uint32_t aId,
+                         GMPErr aResult,
+                         const nsTArray<uint8_t>& aDecryptedData) = 0;
+};
+
+class GMPDecryptorProxy {
+public:
+  ~GMPDecryptorProxy() {}
+
+  virtual nsresult Init(GMPDecryptorProxyCallback* aCallback) = 0;
+
+  virtual void CreateSession(uint32_t aPromiseId,
+                             const nsCString& aInitDataType,
+                             const nsTArray<uint8_t>& aInitData,
+                             GMPSessionType aSessionType) = 0;
+
+  virtual void LoadSession(uint32_t aPromiseId,
+                           const nsCString& aSessionId) = 0;
+
+  virtual void UpdateSession(uint32_t aPromiseId,
+                             const nsCString& aSessionId,
+                             const nsTArray<uint8_t>& aResponse) = 0;
+
+  virtual void CloseSession(uint32_t aPromiseId,
+                            const nsCString& aSessionId) = 0;
+
+  virtual void RemoveSession(uint32_t aPromiseId,
+                             const nsCString& aSessionId) = 0;
+
+  virtual void SetServerCertificate(uint32_t aPromiseId,
+                                    const nsTArray<uint8_t>& aServerCert) = 0;
+
+  virtual void Decrypt(uint32_t aId,
+                       const mp4_demuxer::CryptoSample& aCrypto,
+                       const nsTArray<uint8_t>& aBuffer) = 0;
+
+  virtual void Close() = 0;
+};
+
+#endif // GMPDecryptorProxy_h_
diff --git a/content/media/gmp/GMPEncryptedBufferDataImpl.cpp b/content/media/gmp/GMPEncryptedBufferDataImpl.cpp
new file mode 100644
index 00000000000..dffcd7b48ea
--- /dev/null
+++ b/content/media/gmp/GMPEncryptedBufferDataImpl.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GMPEncryptedBufferDataImpl.h"
+#include "mozilla/gmp/GMPTypes.h"
+
+namespace mozilla {
+namespace gmp {
+
+GMPEncryptedBufferDataImpl::GMPEncryptedBufferDataImpl(const CryptoSample& aCrypto)
+  : mKeyId(aCrypto.key)
+  , mIV(aCrypto.iv)
+  , mClearBytes(aCrypto.plain_sizes)
+  , mCipherBytes(aCrypto.encrypted_sizes)
+{
+}
+
+GMPEncryptedBufferDataImpl::GMPEncryptedBufferDataImpl(const GMPDecryptionData& aData)
+{
+  mKeyId = aData.mKeyId();
+  mIV = aData.mIV();
+  mClearBytes = aData.mClearBytes();
+  mCipherBytes = aData.mCipherBytes();
+  MOZ_ASSERT(mClearBytes.Length() == mCipherBytes.Length());
+}
+
+void
+GMPEncryptedBufferDataImpl::RelinquishData(GMPDecryptionData& aData)
+{
+  aData.mKeyId() = Move(mKeyId);
+  aData.mIV() = Move(mIV);
+  aData.mClearBytes() = Move(mClearBytes);
+  aData.mCipherBytes() = Move(mCipherBytes);
+}
+
+const uint8_t*
+GMPEncryptedBufferDataImpl::KeyId() const
+{
+  return mKeyId.Elements();
+}
+
+uint32_t
+GMPEncryptedBufferDataImpl::KeyIdSize() const
+{
+  return mKeyId.Length();
+}
+
+const uint8_t*
+GMPEncryptedBufferDataImpl::IV() const
+{
+  return mIV.Elements();
+}
+
+uint32_t
+GMPEncryptedBufferDataImpl::IVSize() const
+{
+  return mIV.Length();
+}
+
+const uint16_t*
+GMPEncryptedBufferDataImpl::ClearBytes() const
+{
+  return mClearBytes.Elements();
+}
+
+const uint32_t*
+GMPEncryptedBufferDataImpl::CipherBytes() const
+{
+  return mCipherBytes.Elements();
+}
+
+uint32_t
+GMPEncryptedBufferDataImpl::NumSubsamples() const
+{
+  MOZ_ASSERT(mClearBytes.Length() == mCipherBytes.Length());
+  // Return the min of the two, to ensure there's not chance of array index
+  // out-of-bounds shenanigans.
+  return std::min<uint32_t>(mClearBytes.Length(), mCipherBytes.Length());
+}
+
+} // namespace gmp
+} // namespace mozilla
diff --git a/content/media/gmp/GMPEncryptedBufferDataImpl.h b/content/media/gmp/GMPEncryptedBufferDataImpl.h
new file mode 100644
index 00000000000..e815381be7d
--- /dev/null
+++ b/content/media/gmp/GMPEncryptedBufferDataImpl.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GMPEncryptedBufferDataImpl_h_
+#define GMPEncryptedBufferDataImpl_h_
+
+#include "gmp-decryption.h"
+#include "mp4_demuxer/DecoderData.h"
+#include "nsTArray.h"
+#include "mozilla/gmp/GMPTypes.h"
+
+namespace mozilla {
+namespace gmp {
+
+class GMPEncryptedBufferDataImpl : public GMPEncryptedBufferMetadata {
+private:
+  typedef mp4_demuxer::CryptoSample CryptoSample;
+public:
+  GMPEncryptedBufferDataImpl(const CryptoSample& aCrypto);
+  GMPEncryptedBufferDataImpl(const GMPDecryptionData& aData);
+
+  void RelinquishData(GMPDecryptionData& aData);
+
+  virtual const uint8_t* KeyId() const MOZ_OVERRIDE;
+  virtual uint32_t KeyIdSize() const MOZ_OVERRIDE;
+  virtual const uint8_t* IV() const MOZ_OVERRIDE;
+  virtual uint32_t IVSize() const MOZ_OVERRIDE;
+  virtual uint32_t NumSubsamples() const MOZ_OVERRIDE;
+  virtual const uint16_t* ClearBytes() const MOZ_OVERRIDE;
+  virtual const uint32_t* CipherBytes() const MOZ_OVERRIDE;
+
+private:
+  nsTArray<uint8_t> mKeyId;
+  nsTArray<uint8_t> mIV;
+  nsTArray<uint16_t> mClearBytes;
+  nsTArray<uint32_t> mCipherBytes;
+};
+
+class GMPBufferImpl : public GMPBuffer {
+public:
+  GMPBufferImpl(uint32_t aId, const nsTArray<uint8_t>& aData)
+    : mId(aId)
+    , mData(aData)
+  {
+  }
+  virtual uint32_t Id() const {
+    return mId;
+  }
+  virtual uint8_t* Data() {
+    return mData.Elements();
+  }
+  virtual uint32_t Size() const {
+    return mData.Length();
+  }
+  virtual void Resize(uint32_t aSize) {
+    mData.SetLength(aSize);
+  }
+
+  uint32_t mId;
+  nsTArray<uint8_t> mData;
+};
+
+} // namespace gmp
+} // namespace mozilla
+
+#endif // GMPEncryptedBufferDataImpl_h_
diff --git a/content/media/gmp/GMPMessageUtils.h b/content/media/gmp/GMPMessageUtils.h
index faaedaecda4..cd154b36677 100644
--- a/content/media/gmp/GMPMessageUtils.h
+++ b/content/media/gmp/GMPMessageUtils.h
@@ -8,6 +8,7 @@
 
 #include "gmp-video-codec.h"
 #include "gmp-video-frame-encoded.h"
+#include "gmp-decryption.h"
 
 namespace IPC {
 
@@ -18,6 +19,27 @@ struct ParamTraits<GMPErr>
                                   GMPLastErr>
 {};
 
+struct GMPDomExceptionValidator {
+  static bool IsLegalValue(GMPDOMException aValue) {
+    switch (aValue) {
+      case kGMPNoModificationAllowedError:
+      case kGMPNotFoundError:
+      case kGMPNotSupportedError:
+      case kGMPInvalidStateError:
+      case kGMPSyntaxError:
+      case kGMPInvalidModificationError:
+      case kGMPInvalidAccessError:
+      case kGMPSecurityError:
+      case kGMPAbortError:
+      case kGMPQuotaExceededError:
+      case kGMPTimeoutError:
+        return true;
+      default:
+        return false;
+    }
+  }
+};
+
 template <>
 struct ParamTraits<GMPVideoFrameType>
 : public ContiguousEnumSerializer<GMPVideoFrameType,
@@ -25,6 +47,18 @@ struct ParamTraits<GMPVideoFrameType>
                                   kGMPSkipFrame>
 {};
 
+template<>
+struct ParamTraits<GMPDOMException>
+: public EnumSerializer<GMPDOMException, GMPDomExceptionValidator>
+{};
+
+template <>
+struct ParamTraits<GMPSessionType>
+: public ContiguousEnumSerializer<GMPSessionType,
+                                  kGMPTemporySession,
+                                  kGMPPersistentSession>
+{};
+
 template <>
 struct ParamTraits<GMPVideoCodecComplexity>
 : public ContiguousEnumSerializer<GMPVideoCodecComplexity,
diff --git a/content/media/gmp/GMPParent.cpp b/content/media/gmp/GMPParent.cpp
index 01627c351d0..94c75b79c18 100644
--- a/content/media/gmp/GMPParent.cpp
+++ b/content/media/gmp/GMPParent.cpp
@@ -127,7 +127,8 @@ GMPParent::CloseIfUnused()
        mState == GMPStateLoaded ||
        mState == GMPStateUnloading) &&
       mVideoDecoders.IsEmpty() &&
-      mVideoEncoders.IsEmpty()) {
+      mVideoEncoders.IsEmpty() &&
+      mDecryptors.IsEmpty()) {
     Shutdown();
   }
 }
@@ -153,6 +154,11 @@ GMPParent::CloseActive(bool aDieWhenUnloaded)
     mVideoEncoders[i - 1]->Shutdown();
   }
 
+  // Invalidate and remove any remaining API objects.
+  for (uint32_t i = mDecryptors.Length(); i > 0; i--) {
+    mDecryptors[i - 1]->Shutdown();
+  }
+
   // Note: the shutdown of the codecs is async!  don't kill
   // the plugin-container until they're all safely shut down via
   // CloseIfUnused();
@@ -225,6 +231,44 @@ GMPParent::VideoEncoderDestroyed(GMPVideoEncoderParent* aEncoder)
   }
 }
 
+void
+GMPParent::DecryptorDestroyed(GMPDecryptorParent* aSession)
+{
+  MOZ_ASSERT(GMPThread() == NS_GetCurrentThread());
+
+  MOZ_ALWAYS_TRUE(mDecryptors.RemoveElement(aSession));
+
+  // Recv__delete__ is on the stack, don't potentially destroy the top-level actor
+  // until after this has completed.
+  if (mDecryptors.IsEmpty()) {
+    nsCOMPtr<nsIRunnable> event = NS_NewRunnableMethod(this, &GMPParent::CloseIfUnused);
+    NS_DispatchToCurrentThread(event);
+  }
+}
+
+nsresult
+GMPParent::GetGMPDecryptor(GMPDecryptorParent** aGMPDP)
+{
+  MOZ_ASSERT(GMPThread() == NS_GetCurrentThread());
+
+  if (!EnsureProcessLoaded()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  PGMPDecryptorParent* pdp = SendPGMPDecryptorConstructor();
+  if (!pdp) {
+    return NS_ERROR_FAILURE;
+  }
+  GMPDecryptorParent* dp = static_cast<GMPDecryptorParent*>(pdp);
+  // This addref corresponds to the Proxy pointer the consumer is returned.
+  // It's dropped by calling Close() on the interface.
+  NS_ADDREF(dp);
+  mDecryptors.AppendElement(dp);
+  *aGMPDP = dp;
+
+  return NS_OK;
+}
+
 GMPState
 GMPParent::State() const
 {
@@ -461,6 +505,22 @@ GMPParent::DeallocPGMPVideoEncoderParent(PGMPVideoEncoderParent* aActor)
   return true;
 }
 
+PGMPDecryptorParent*
+GMPParent::AllocPGMPDecryptorParent()
+{
+  GMPDecryptorParent* ksp = new GMPDecryptorParent(this);
+  NS_ADDREF(ksp);
+  return ksp;
+}
+
+bool
+GMPParent::DeallocPGMPDecryptorParent(PGMPDecryptorParent* aActor)
+{
+  GMPDecryptorParent* ksp = static_cast<GMPDecryptorParent*>(aActor);
+  NS_RELEASE(ksp);
+  return true;
+}
+
 nsresult
 ParseNextRecord(nsILineInputStream* aLineInputStream,
                 const nsCString& aPrefix,
diff --git a/content/media/gmp/GMPParent.h b/content/media/gmp/GMPParent.h
index 8106629d8bf..4a169925aba 100644
--- a/content/media/gmp/GMPParent.h
+++ b/content/media/gmp/GMPParent.h
@@ -7,6 +7,7 @@
 #define GMPParent_h_
 
 #include "GMPProcessParent.h"
+#include "GMPDecryptorParent.h"
 #include "GMPVideoDecoderParent.h"
 #include "GMPVideoEncoderParent.h"
 #include "mozilla/gmp/PGMPParent.h"
@@ -73,10 +74,16 @@ public:
   void DeleteProcess();
 
   bool SupportsAPI(const nsCString& aAPI, const nsCString& aTag);
+
   nsresult GetGMPVideoDecoder(GMPVideoDecoderParent** aGMPVD);
   void VideoDecoderDestroyed(GMPVideoDecoderParent* aDecoder);
+
   nsresult GetGMPVideoEncoder(GMPVideoEncoderParent** aGMPVE);
   void VideoEncoderDestroyed(GMPVideoEncoderParent* aEncoder);
+
+  nsresult GetGMPDecryptor(GMPDecryptorParent** aGMPKS);
+  void DecryptorDestroyed(GMPDecryptorParent* aSession);
+
   GMPState State() const;
 #ifdef DEBUG
   nsIThread* GMPThread();
@@ -119,11 +126,16 @@ private:
 
   virtual PCrashReporterParent* AllocPCrashReporterParent(const NativeThreadId& aThread) MOZ_OVERRIDE;
   virtual bool DeallocPCrashReporterParent(PCrashReporterParent* aCrashReporter) MOZ_OVERRIDE;
+
   virtual PGMPVideoDecoderParent* AllocPGMPVideoDecoderParent() MOZ_OVERRIDE;
   virtual bool DeallocPGMPVideoDecoderParent(PGMPVideoDecoderParent* aActor) MOZ_OVERRIDE;
+  
   virtual PGMPVideoEncoderParent* AllocPGMPVideoEncoderParent() MOZ_OVERRIDE;
   virtual bool DeallocPGMPVideoEncoderParent(PGMPVideoEncoderParent* aActor) MOZ_OVERRIDE;
 
+  virtual PGMPDecryptorParent* AllocPGMPDecryptorParent() MOZ_OVERRIDE;
+  virtual bool DeallocPGMPDecryptorParent(PGMPDecryptorParent* aActor) MOZ_OVERRIDE;
+
   GMPState mState;
   nsCOMPtr<nsIFile> mDirectory; // plugin directory on disk
   nsString mName; // base name of plugin on disk, UTF-16 because used for paths
@@ -136,6 +148,7 @@ private:
 
   nsTArray<nsRefPtr<GMPVideoDecoderParent>> mVideoDecoders;
   nsTArray<nsRefPtr<GMPVideoEncoderParent>> mVideoEncoders;
+  nsTArray<nsRefPtr<GMPDecryptorParent>> mDecryptors;
 #ifdef DEBUG
   nsCOMPtr<nsIThread> mGMPThread;
 #endif
diff --git a/content/media/gmp/GMPService.cpp b/content/media/gmp/GMPService.cpp
index b79b685085d..e9992b743a2 100644
--- a/content/media/gmp/GMPService.cpp
+++ b/content/media/gmp/GMPService.cpp
@@ -16,6 +16,7 @@
 #include "nsNativeCharsetUtils.h"
 #include "nsIConsoleService.h"
 #include "mozilla/unused.h"
+#include "GMPDecryptorParent.h"
 
 namespace mozilla {
 
@@ -285,6 +286,37 @@ GeckoMediaPluginService::GetGMPVideoEncoder(nsTArray<nsCString>* aTags,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+GeckoMediaPluginService::GetGMPDecryptor(nsTArray<nsCString>* aTags,
+                                         const nsAString& aOrigin,
+                                         GMPDecryptorProxy** aDecryptor)
+{
+  MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread);
+  NS_ENSURE_ARG(aTags && aTags->Length() > 0);
+  NS_ENSURE_ARG(aDecryptor);
+
+  if (mShuttingDownOnGMPThread) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsRefPtr<GMPParent> gmp = SelectPluginForAPI(aOrigin,
+                                               NS_LITERAL_CSTRING("eme-decrypt"),
+                                               *aTags);
+  if (!gmp) {
+    return NS_ERROR_FAILURE;
+  }
+
+  GMPDecryptorParent* ksp;
+  nsresult rv = gmp->GetGMPDecryptor(&ksp);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  *aDecryptor = static_cast<GMPDecryptorProxy*>(ksp);
+
+  return NS_OK;
+}
+
 void
 GeckoMediaPluginService::UnloadPlugins()
 {
diff --git a/content/media/gmp/GMPTypes.ipdlh b/content/media/gmp/GMPTypes.ipdlh
index 17ee7c749ed..22908ac761b 100644
--- a/content/media/gmp/GMPTypes.ipdlh
+++ b/content/media/gmp/GMPTypes.ipdlh
@@ -8,6 +8,13 @@ using GMPBufferType from "gmp-video-codec.h";
 namespace mozilla {
 namespace gmp {
 
+struct GMPDecryptionData {
+  uint8_t[] mKeyId;
+  uint8_t[] mIV;
+  uint16_t[] mClearBytes;
+  uint32_t[] mCipherBytes;
+};
+
 struct GMPVideoEncodedFrameData
 {
   uint32_t mEncodedWidth;
@@ -19,6 +26,7 @@ struct GMPVideoEncodedFrameData
   GMPBufferType mBufferType;
   Shmem mBuffer;
   bool mCompleteFrame;
+  GMPDecryptionData mDecryptionData;
 };
 
 struct GMPPlaneData
diff --git a/content/media/gmp/PGMP.ipdl b/content/media/gmp/PGMP.ipdl
index fc9fefe9765..23036211326 100644
--- a/content/media/gmp/PGMP.ipdl
+++ b/content/media/gmp/PGMP.ipdl
@@ -6,6 +6,7 @@
 include protocol PGMPVideoDecoder;
 include protocol PGMPVideoEncoder;
 include protocol PCrashReporter;
+include protocol PGMPDecryptor;
 
 using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 
@@ -14,6 +15,7 @@ namespace gmp {
 
 intr protocol PGMP
 {
+  manages PGMPDecryptor;
   manages PGMPVideoDecoder;
   manages PGMPVideoEncoder;
   manages PCrashReporter;
@@ -22,6 +24,7 @@ parent:
   async PCrashReporter(NativeThreadId tid);
 
 child:
+  async PGMPDecryptor();
   async PGMPVideoDecoder();
   async PGMPVideoEncoder();
 };
diff --git a/content/media/gmp/PGMPDecryptor.ipdl b/content/media/gmp/PGMPDecryptor.ipdl
new file mode 100644
index 00000000000..bc1bdea49ab
--- /dev/null
+++ b/content/media/gmp/PGMPDecryptor.ipdl
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include protocol PGMP;
+include GMPTypes;
+
+using GMPSessionType from  "gmp-decryption.h";
+using GMPDOMException from "gmp-decryption.h";
+using GMPErr from "gmp-errors.h";
+
+namespace mozilla {
+namespace gmp {
+
+async protocol PGMPDecryptor
+{
+  manager PGMP;
+child:
+
+  Init();
+
+  CreateSession(uint32_t aPromiseId,
+                nsCString aInitDataType,
+                uint8_t[] aInitData,
+                GMPSessionType aSessionType);
+
+  LoadSession(uint32_t aPromiseId,
+              nsCString aSessionId);
+
+  UpdateSession(uint32_t aPromiseId,
+                nsCString aSessionId,
+                uint8_t[] aResponse);
+
+  CloseSession(uint32_t aPromiseId,
+               nsCString aSessionId);
+
+  RemoveSession(uint32_t aPromiseId,
+                nsCString aSessionId);
+
+  SetServerCertificate(uint32_t aPromiseId,
+                       uint8_t[] aServerCert);
+
+  Decrypt(uint32_t aId,
+          uint8_t[] aBuffer,
+          GMPDecryptionData aMetadata);
+
+  DecryptingComplete();
+
+parent:
+  __delete__();
+
+  ResolveNewSessionPromise(uint32_t aPromiseId,
+                           nsCString aSessionId);
+
+  ResolvePromise(uint32_t aPromiseId);
+
+  RejectPromise(uint32_t aPromiseId,
+                GMPDOMException aDOMExceptionCode,
+                nsCString aMessage);
+
+  SessionMessage(nsCString aSessionId,
+                 uint8_t[] aMessage,
+                 nsCString aDestinationURL);
+
+  ExpirationChange(nsCString aSessionId, double aExpiryTime);
+
+  SessionClosed(nsCString aSessionId);
+
+  SessionError(nsCString aSessionId,
+               GMPDOMException aDOMExceptionCode,
+               uint32_t aSystemCode,
+               nsCString aMessage);
+
+  KeyIdUsable(nsCString aSessionId, uint8_t[] aKey);
+
+  SetCaps(uint64_t aCaps);
+
+  KeyIdNotUsable(nsCString aSessionId,uint8_t[] aKey);
+
+  Decrypted(uint32_t aId, GMPErr aResult, uint8_t[] aBuffer);
+};
+
+} // namespace gmp
+} // namespace mozilla
diff --git a/content/media/gmp/moz.build b/content/media/gmp/moz.build
index 1beee3227d5..e639aa38d39 100644
--- a/content/media/gmp/moz.build
+++ b/content/media/gmp/moz.build
@@ -31,6 +31,10 @@ EXPORTS += [
     'gmp-api/gmp-video-plane.h',
     'GMPCallbackBase.h',
     'GMPChild.h',
+    'GMPDecryptorChild.h',
+    'GMPDecryptorParent.h',
+    'GMPDecryptorProxy.h',
+    'GMPEncryptedBufferDataImpl.h',
     'GMPMessageUtils.h',
     'GMPParent.h',
     'GMPPlatform.h',
@@ -52,6 +56,9 @@ EXPORTS += [
 
 UNIFIED_SOURCES += [
     'GMPChild.cpp',
+    'GMPDecryptorChild.cpp',
+    'GMPDecryptorParent.cpp',
+    'GMPEncryptedBufferDataImpl.cpp',
     'GMPParent.cpp',
     'GMPPlatform.cpp',
     'GMPProcessChild.cpp',
@@ -71,6 +78,7 @@ UNIFIED_SOURCES += [
 IPDL_SOURCES += [
   'GMPTypes.ipdlh',
   'PGMP.ipdl',
+  'PGMPDecryptor.ipdl',
   'PGMPVideoDecoder.ipdl',
   'PGMPVideoEncoder.ipdl',
 ]
diff --git a/content/media/gmp/mozIGeckoMediaPluginService.idl b/content/media/gmp/mozIGeckoMediaPluginService.idl
index 9285d14b760..a2ded13e7bb 100644
--- a/content/media/gmp/mozIGeckoMediaPluginService.idl
+++ b/content/media/gmp/mozIGeckoMediaPluginService.idl
@@ -10,6 +10,7 @@
 %{C++
 #include "nsTArray.h"
 #include "nsStringGlue.h"
+class GMPDecryptorProxy;
 class GMPVideoDecoderProxy;
 class GMPVideoEncoderProxy;
 class GMPVideoHost;
@@ -20,8 +21,9 @@ class GMPVideoHost;
 [ptr] native GMPVideoHost(GMPVideoHost);
 [ptr] native MessageLoop(MessageLoop);
 [ptr] native TagArray(nsTArray<nsCString>);
+[ptr] native GMPDecryptorProxy(GMPDecryptorProxy);
 
-[scriptable, uuid(a9b826da-725a-4b81-814f-b715445188f2)]
+[scriptable, uuid(b301ea8b-8a1e-4839-a13c-9dd32b2d684b)]
 interface mozIGeckoMediaPluginService : nsISupports
 {
   /**
@@ -60,6 +62,12 @@ interface mozIGeckoMediaPluginService : nsISupports
 		                                      [optional] in AString origin,
 		                                      out GMPVideoHost outVideoHost);
 
+  // Returns a decryption session manager that supports the specified tags.
+  // The array of tags should at least contain a key system tag, and optionally
+  // other tags.
+  // Callable only on GMP thread.
+  GMPDecryptorProxy getGMPDecryptor(in TagArray tags, in AString origin);
+
   /**
    * Add a directory to scan for gecko media plugins.
    * @note Main-thread API.

From a57c27ebee56f0064a5db1cad66ebc779a9a0348 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Mon, 28 Jul 2014 11:42:06 +1200
Subject: [PATCH 068/128] Bug 1042373 - Fix unused-in-opt-build WAE. r=burning.

---
 content/media/gmp/GMPDecryptorChild.cpp | 6 ++++--
 content/media/gmp/GMPDecryptorChild.h   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/content/media/gmp/GMPDecryptorChild.cpp b/content/media/gmp/GMPDecryptorChild.cpp
index 3b0a50ffed6..892f29b7751 100644
--- a/content/media/gmp/GMPDecryptorChild.cpp
+++ b/content/media/gmp/GMPDecryptorChild.cpp
@@ -13,8 +13,10 @@ namespace mozilla {
 namespace gmp {
 
 GMPDecryptorChild::GMPDecryptorChild(GMPChild* aPlugin)
-  : mPlugin(aPlugin)
-  , mSession(nullptr)
+  : mSession(nullptr)
+#ifdef DEBUG
+  , mPlugin(aPlugin)
+#endif
 {
   MOZ_ASSERT(mPlugin);
 }
diff --git a/content/media/gmp/GMPDecryptorChild.h b/content/media/gmp/GMPDecryptorChild.h
index 786518ed33f..ecc6229f50e 100644
--- a/content/media/gmp/GMPDecryptorChild.h
+++ b/content/media/gmp/GMPDecryptorChild.h
@@ -114,11 +114,13 @@ private:
 
   virtual bool RecvDecryptingComplete() MOZ_OVERRIDE;
 
-  GMPChild* mPlugin;
-
   // GMP's GMPDecryptor implementation.
   // Only call into this on the (GMP process) main thread.
   GMPDecryptor* mSession;
+
+#ifdef DEBUG
+  GMPChild* mPlugin;
+#endif           
 };
 
 } // namespace gmp

From c6fb74940fa2e2ba1d629c244494f04d144516d6 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Mon, 28 Jul 2014 11:48:16 +1200
Subject: [PATCH 069/128] Bug 1041950 - Fix build break; r=burning

---
 content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
index 12371258767..6fa634bf73d 100644
--- a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
+++ b/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
@@ -7,6 +7,8 @@
 #ifndef __FFmpegRuntimeLinker_h__
 #define __FFmpegRuntimeLinker_h__
 
+#include <stdint.h>
+
 namespace mozilla
 {
 

From 96722f8a26edff157aa3fea7f0255bc6d21b3af6 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sun, 27 Jul 2014 19:59:46 -0400
Subject: [PATCH 070/128] Bug 1043515: Add max-br and max-mbps H.264 SDP fmtp
 parameters; update supported h264 level r=ehugg

---
 .../signaling/src/media/VcmSIPCCBinding.cpp   | 64 ++++++++++++++-----
 .../src/sipcc/core/common/prot_configmgr.c    | 22 +++++++
 .../src/sipcc/core/common/prot_configmgr.h    |  2 +
 .../signaling/src/sipcc/core/gsm/gsm_sdp.c    | 16 ++++-
 .../webrtc/signaling/src/sipcc/include/vcm.h  |  6 +-
 modules/libpref/src/init/all.js               |  4 ++
 6 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
index 78b2630d282..82b4cef1e25 100644
--- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
+++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
@@ -2873,7 +2873,14 @@ uint32_t vcmGetVideoH264ProfileLevelID()
 {
   // constrained baseline level 1.2
   // XXX make variable based on openh264 and OMX support
+#ifdef MOZ_WEBRTC_OMX
+  // Max resolution CIF; we should include max-mbps
   return 0x42E00C;
+#else
+  // XXX See bug 1043515 - we may want to support a higher profile than
+  // 1.3, depending on hardware(?)
+  return 0x42E00D;
+#endif
 }
 
 /**
@@ -3368,11 +3375,11 @@ int vcmDisableRtcpComponent(const char *peerconnection, int level) {
   return ret;
 }
 
-static short vcmGetVideoMaxFs_m(uint16_t codec,
-                                int32_t *max_fs) {
+static short vcmGetVideoPref_m(uint16_t codec,
+                               const char *pref,
+                               int32_t *ret) {
   nsCOMPtr<nsIPrefBranch> branch = VcmSIPCCBinding::getPrefBranch();
-  if (branch && NS_SUCCEEDED(branch->GetIntPref("media.navigator.video.max_fs",
-                                                max_fs))) {
+  if (branch && NS_SUCCEEDED(branch->GetIntPref(pref, ret))) {
     return 0;
   }
   return VCM_ERROR;
@@ -3383,31 +3390,56 @@ short vcmGetVideoMaxFs(uint16_t codec,
   short ret;
 
   mozilla::SyncRunnable::DispatchToThread(VcmSIPCCBinding::getMainThread(),
-      WrapRunnableNMRet(&vcmGetVideoMaxFs_m,
+      WrapRunnableNMRet(&vcmGetVideoPref_m,
                         codec,
+                        "media.navigator.video.max_fs",
                         max_fs,
                         &ret));
   return ret;
 }
 
-static short vcmGetVideoMaxFr_m(uint16_t codec,
-                                int32_t *max_fr) {
-  nsCOMPtr<nsIPrefBranch> branch = VcmSIPCCBinding::getPrefBranch();
-  if (branch && NS_SUCCEEDED(branch->GetIntPref("media.navigator.video.max_fr",
-                                                max_fr))) {
-    return 0;
-  }
-  return VCM_ERROR;
-}
-
 short vcmGetVideoMaxFr(uint16_t codec,
                        int32_t *max_fr) {
   short ret;
 
   mozilla::SyncRunnable::DispatchToThread(VcmSIPCCBinding::getMainThread(),
-      WrapRunnableNMRet(&vcmGetVideoMaxFr_m,
+      WrapRunnableNMRet(&vcmGetVideoPref_m,
                         codec,
+                        "media.navigator.video.max_fr",
                         max_fr,
                         &ret));
   return ret;
 }
+
+short vcmGetVideoMaxBr(uint16_t codec,
+                       int32_t *max_br) {
+  short ret;
+
+  mozilla::SyncRunnable::DispatchToThread(VcmSIPCCBinding::getMainThread(),
+      WrapRunnableNMRet(&vcmGetVideoPref_m,
+                        codec,
+                        "media.navigator.video.h264.max_br",
+                        max_br,
+                        &ret));
+  return ret;
+}
+
+short vcmGetVideoMaxMbps(uint16_t codec,
+                       int32_t *max_mbps) {
+  short ret;
+
+  mozilla::SyncRunnable::DispatchToThread(VcmSIPCCBinding::getMainThread(),
+      WrapRunnableNMRet(&vcmGetVideoPref_m,
+                        codec,
+                        "media.navigator.video.h264.max_mbps",
+                        max_mbps,
+                        &ret));
+  if (ret == VCM_ERROR) {
+#ifdef MOZ_WEBRTC_OMX
+    // Level 1.2; but let's allow CIF@30 or QVGA@30+ by default
+    *max_mbps = 11880;
+    ret = 0;
+#endif
+  }
+  return ret;
+}
diff --git a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
index 8c0727756c7..cf3b2028382 100755
--- a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
+++ b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
@@ -593,6 +593,28 @@ config_get_video_max_fr(const rtp_ptype codec)
   return 0;
 }
 
+uint32_t
+config_get_video_max_mbps(const rtp_ptype codec)
+{
+  uint32_t max_mbps;
+
+  if(vcmGetVideoMaxMbps(codec, (int32_t *) &max_mbps) == 0) {
+    return max_mbps;
+  }
+  return 0;
+}
+
+uint32_t
+config_get_video_max_br(const rtp_ptype codec)
+{
+  uint32_t max_br;
+
+  if(vcmGetVideoMaxBr(codec, (int32_t *) &max_br) == 0) {
+    return max_br;
+  }
+  return 0;
+}
+
 uint16_t
 sip_config_video_add_codecs (rtp_ptype aSupportedCodecs[],
                              uint16_t supportedCodecsLen,
diff --git a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.h b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.h
index 0aa6dc3c742..dd4310e14fc 100755
--- a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.h
+++ b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.h
@@ -294,5 +294,7 @@ int sip_config_get_keepalive_expires();
 rtp_ptype sip_config_preferred_codec(void);
 uint32_t config_get_video_max_fs(const rtp_ptype codec);
 uint32_t config_get_video_max_fr(const rtp_ptype codec);
+uint32_t config_get_video_max_mbps(const rtp_ptype codec);
+uint32_t config_get_video_max_br(const rtp_ptype codec);
 
 #endif /* PROT_CONFIGMGR_H_ */
diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c b/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c
index 5c0015e7af7..77a01c4b353 100644
--- a/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c
+++ b/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c
@@ -1141,6 +1141,8 @@ gsmsdp_set_video_media_attributes (uint32_t media_type, void *cc_sdp_p, uint16_t
     void *sdp_p = ((cc_sdp_t*)cc_sdp_p)->src_sdp;
     int max_fs = 0;
     int max_fr = 0;
+    int max_br = 0;
+    int max_mbps = 0;
 
     switch (media_type) {
         case RTP_H263:
@@ -1211,11 +1213,14 @@ gsmsdp_set_video_media_attributes (uint32_t media_type, void *cc_sdp_p, uint16_t
         switch (media_type) {
         case RTP_H264_P0:
         case RTP_H264_P1:
+            max_br = config_get_video_max_br((rtp_ptype) media_type); // H264 only
+            max_mbps = config_get_video_max_mbps((rtp_ptype) media_type); // H264 only
+            // fall through
         case RTP_VP8:
             max_fs = config_get_video_max_fs((rtp_ptype) media_type);
             max_fr = config_get_video_max_fr((rtp_ptype) media_type);
 
-            if (max_fs || max_fr) {
+            if (max_fs || max_fr || max_br || max_mbps) {
                 if (!added_fmtp) {
                     if (sdp_add_new_attr(sdp_p, level, 0, SDP_ATTR_FMTP, &a_inst)
                         != SDP_SUCCESS) {
@@ -1232,11 +1237,18 @@ gsmsdp_set_video_media_attributes (uint32_t media_type, void *cc_sdp_p, uint16_t
                     (void) sdp_attr_set_fmtp_max_fs(sdp_p, level, 0, a_inst,
                                                     max_fs);
                 }
-
                 if (max_fr) {
                     (void) sdp_attr_set_fmtp_max_fr(sdp_p, level, 0, a_inst,
                                                     max_fr);
                 }
+                if (max_br) {
+                    (void) sdp_attr_set_fmtp_max_br(sdp_p, level, 0, a_inst,
+                                                    max_br);
+                }
+                if (max_mbps) {
+                    (void) sdp_attr_set_fmtp_max_mbps(sdp_p, level, 0, a_inst,
+                                                      max_mbps);
+                }
             }
             break;
         }
diff --git a/media/webrtc/signaling/src/sipcc/include/vcm.h b/media/webrtc/signaling/src/sipcc/include/vcm.h
index a499e13e585..ba63badb939 100755
--- a/media/webrtc/signaling/src/sipcc/include/vcm.h
+++ b/media/webrtc/signaling/src/sipcc/include/vcm.h
@@ -1085,7 +1085,11 @@ int vcmDisableRtcpComponent(const char *peerconnection, int level);
 
 short vcmGetVideoMaxFs(uint16_t codec, int32_t *max_fs);
 
-short vcmGetVideoMaxFr(uint16_t codec, int32_t *max_fs);
+short vcmGetVideoMaxFr(uint16_t codec, int32_t *max_fr);
+
+short vcmGetVideoMaxBr(uint16_t codec, int32_t *max_br);
+
+short vcmGetVideoMaxMbps(uint16_t codec, int32_t *max_mbps);
 
 //Using C++ for gips. This is the end of extern "C" above.
 #ifdef __cplusplus
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index cc1c526b898..909fa63fef6 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -295,6 +295,8 @@ pref("media.peerconnection.enabled", true);
 pref("media.peerconnection.video.enabled", true);
 pref("media.navigator.video.max_fs", 1200); // 640x480 == 1200mb
 pref("media.navigator.video.max_fr", 30);
+pref("media.navigator.video.h264.max_br", 700); // 8x10
+pref("media.navigator.video.h264.max_mbps", 11880); // CIF@30fps
 pref("media.peerconnection.video.h264_enabled", false);
 pref("media.getusermedia.aec", 4);
 #else
@@ -304,6 +306,8 @@ pref("media.peerconnection.enabled", true);
 pref("media.peerconnection.video.enabled", true);
 pref("media.navigator.video.max_fs", 0); // unrestricted
 pref("media.navigator.video.max_fr", 0); // unrestricted
+pref("media.navigator.video.h264.max_br", 0);
+pref("media.navigator.video.h264.max_mbps", 0);
 pref("media.peerconnection.video.h264_enabled", false);
 pref("media.getusermedia.aec", 1);
 #endif

From f18ff52494eca70b46cfb994e92b2de04ecbdeac Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sun, 27 Jul 2014 20:00:06 -0400
Subject: [PATCH 071/128] Bug 1043515: Ignore unknown fmtp values; partially
 fix unittests to handle H264_P0 disabled r=ehugg

---
 .../signaling/src/sipcc/core/sdp/sdp_attr.c   | 15 +++++++
 .../signaling/test/signaling_unittests.cpp    | 41 +++++++++++--------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c b/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c
index c3df8e7f2cb..b9589d9777d 100644
--- a/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c
+++ b/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c
@@ -1746,6 +1746,21 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
                 }
             } /* if (temp) */
             done = TRUE;
+        } else {
+          // XXX Note that DTMF fmtp will fall into here:
+          // a=fmtp:101 0-15 (or 0-15,NN,NN etc)
+
+          // unknown parameter - eat chars until ';'
+          CSFLogDebug(logTag, "%s Unknown fmtp type (%s) - ignoring", __FUNCTION__,
+                      tmp);
+          fmtp_ptr = sdp_getnextstrtok(fmtp_ptr, tmp, sizeof(tmp), "; \t",
+                                       &result1);
+          if (result1 != SDP_SUCCESS) {
+            fmtp_ptr = sdp_getnextstrtok(fmtp_ptr, tmp, sizeof(tmp), " \t", &result1);
+            if (result1 != SDP_SUCCESS) {
+              // hmmm, no ; or spaces or tabs; continue on
+            }
+          }
         }
         fmtp_ptr++;
       } else {
diff --git a/media/webrtc/signaling/test/signaling_unittests.cpp b/media/webrtc/signaling/test/signaling_unittests.cpp
index 912b0538f34..aba9e0b5b9b 100644
--- a/media/webrtc/signaling/test/signaling_unittests.cpp
+++ b/media/webrtc/signaling/test/signaling_unittests.cpp
@@ -3936,24 +3936,30 @@ TEST_F(SignalingTest, ValidateMultipleVideoCodecsInOffer)
   a1_->CreateOffer(options, OFFER_AV, SHOULD_SENDRECV_AV);
   std::string offer = a1_->offer();
 
+#ifdef H264_P0_SUPPORTED
   ASSERT_NE(offer.find("RTP/SAVPF 120 126 97"), std::string::npos);
+#else
+  ASSERT_NE(offer.find("RTP/SAVPF 120 126"), std::string::npos);
+#endif
   ASSERT_NE(offer.find("a=rtpmap:120 VP8/90000"), std::string::npos);
   ASSERT_NE(offer.find("a=rtpmap:126 H264/90000"), std::string::npos);
-  ASSERT_NE(offer.find("a=rtpmap:97 H264/90000"), std::string::npos);
   ASSERT_NE(offer.find("a=fmtp:126 profile-level-id="), std::string::npos);
-  ASSERT_NE(offer.find("a=fmtp:97 profile-level-id="), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:120 nack"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:120 nack pli"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:120 ccm fir"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:126 nack"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:126 nack pli"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:126 ccm fir"), std::string::npos);
+#ifdef H264_P0_SUPPORTED
+  ASSERT_NE(offer.find("a=rtpmap:97 H264/90000"), std::string::npos);
+  ASSERT_NE(offer.find("a=fmtp:97 profile-level-id="), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:97 nack"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:97 nack pli"), std::string::npos);
   ASSERT_NE(offer.find("a=rtcp-fb:97 ccm fir"), std::string::npos);
+#endif
 }
 
-// Remove VP8 from offer and check that answer negotiates H264 P1 correctly
+// Remove VP8 from offer and check that answer negotiates H264 P1 correctly and ignores unknown params
 TEST_F(SignalingTest, RemoveVP8FromOfferWithP1First)
 {
   EnsureInit();
@@ -3966,7 +3972,9 @@ TEST_F(SignalingTest, RemoveVP8FromOfferWithP1First)
   // Remove VP8 from offer
   std::string offer = a1_->offer();
   offer.replace(match = offer.find("RTP/SAVPF 120"),
-    strlen("RTP/SAVPF 126"), "RTP/SAVPF");
+    strlen("RTP/SAVPF 120"), "RTP/SAVPF");
+  offer.replace(match = offer.find("profile-level-id"),
+    strlen("profile-level-id"), "max-foo=1234;profile-level-id");
   ParsedSDP sdpWrapper(offer);
   sdpWrapper.DeleteAllLines("a=rtcp-fb:120");
   sdpWrapper.DeleteLine("a=rtpmap:120");
@@ -4009,33 +4017,28 @@ TEST_F(SignalingTest, OfferWithH264BeforeVP8)
 
   // Swap VP8 and P1 in offer
   std::string offer = a1_->offer();
+#ifdef H264_P0_SUPPORTED
   offer.replace(match = offer.find("RTP/SAVPF 120 126 97"),
     strlen("RTP/SAVPF 126 120 97"), "RTP/SAVPF 126 120 97");
+#else
+  offer.replace(match = offer.find("RTP/SAVPF 120 126"),
+    strlen("RTP/SAVPF 126 120"), "RTP/SAVPF 126 120");
+#endif
 
   offer.replace(match = offer.find("a=rtpmap:126 H264/90000"),
     strlen("a=rtpmap:120 VP8/90000"), "a=rtpmap:120 VP8/90000");
   offer.replace(match = offer.find("a=rtpmap:120 VP8/90000"),
     strlen("a=rtpmap:126 H264/90000"), "a=rtpmap:126 H264/90000");
 
-  offer.replace(match = offer.find("a=rtcp-fb:126 nack"),
-    strlen("a=rtcp-fb:120 nack"), "a=rtcp-fb:120 nack");
-  offer.replace(match = offer.find("a=rtcp-fb:126 nack pli"),
-    strlen("a=rtcp-fb:120 nack pli"), "a=rtcp-fb:120 nack pli");
-  offer.replace(match = offer.find("a=rtcp-fb:126 ccm fir"),
-    strlen("a=rtcp-fb:120 ccm fir"), "a=rtcp-fb:120 ccm fir");
-
-  offer.replace(match = offer.find("a=rtcp-fb:120 nack"),
-    strlen("a=rtcp-fb:126 nack"), "a=rtcp-fb:126 nack");
-  offer.replace(match = offer.find("a=rtcp-fb:120 nack pli"),
-    strlen("a=rtcp-fb:126 nack pli"), "a=rtcp-fb:126 nack pli");
-  offer.replace(match = offer.find("a=rtcp-fb:120 ccm fir"),
-    strlen("a=rtcp-fb:126 ccm fir"), "a=rtcp-fb:126 ccm fir");
-
   std::cout << "Modified SDP " << std::endl
             << indent(offer) << std::endl;
 
   // P1 should be offered first
+#ifdef H264_P0_SUPPORTED
   ASSERT_NE(offer.find("RTP/SAVPF 126 120 97"), std::string::npos);
+#else
+  ASSERT_NE(offer.find("RTP/SAVPF 126 120"), std::string::npos);
+#endif
 
   a1_->SetLocal(TestObserver::OFFER, offer);
   a2_->SetRemote(TestObserver::OFFER, offer, false);
@@ -4056,6 +4059,7 @@ TEST_F(SignalingTest, OfferWithH264BeforeVP8)
   ASSERT_EQ(answer.find("a=rtcp-fb:97"), std::string::npos);
 }
 
+#ifdef H264_P0_SUPPORTED
 // Remove H.264 P1 and VP8 from offer, check answer negotiates H.264 P0
 TEST_F(SignalingTest, OfferWithOnlyH264P0)
 {
@@ -4106,6 +4110,7 @@ TEST_F(SignalingTest, OfferWithOnlyH264P0)
   ASSERT_EQ(answer.find("a=rtcp-fb:120"), std::string::npos);
   ASSERT_EQ(answer.find("a=rtcp-fb:126"), std::string::npos);
 }
+#endif
 
 // Test negotiating an answer which has only H.264 P1
 // Which means replace VP8 with H.264 P1 in answer

From c1776499d81f91bd028949a70e8af9daa1c4cbbe Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sun, 27 Jul 2014 20:00:35 -0400
Subject: [PATCH 072/128] Bug 1043515: Add support for a preferred codec to be
 chosen/offered first always r=ehugg

---
 .../signaling/src/media/VcmSIPCCBinding.cpp   | 12 +++++++++
 .../src/sipcc/core/common/prot_configmgr.c    | 25 +++++++++++++++++++
 .../webrtc/signaling/src/sipcc/include/vcm.h  |  2 ++
 3 files changed, 39 insertions(+)

diff --git a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
index 82b4cef1e25..89ab5b4ea5b 100644
--- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
+++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
@@ -3443,3 +3443,15 @@ short vcmGetVideoMaxMbps(uint16_t codec,
   }
   return ret;
 }
+
+short vcmGetVideoPreferredCodec(int32_t *preferred_codec) {
+  short ret;
+
+  mozilla::SyncRunnable::DispatchToThread(VcmSIPCCBinding::getMainThread(),
+      WrapRunnableNMRet(&vcmGetVideoPref_m,
+                        (uint16_t)0,
+                        "media.navigator.video.preferred_codec",
+                        preferred_codec,
+                        &ret));
+  return ret;
+}
diff --git a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
index cf3b2028382..32ff6005c38 100755
--- a/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
+++ b/media/webrtc/signaling/src/sipcc/core/common/prot_configmgr.c
@@ -461,6 +461,13 @@ sip_config_get_display_name (line_t line, char *buffer, int buffer_len)
 rtp_ptype
 sip_config_preferred_codec (void)
 {
+#if 1
+  uint32_t codec;
+
+  if(vcmGetVideoPreferredCodec((int32_t *) &codec) == 0) {
+    return (rtp_ptype) codec;
+  }
+#else
     key_table_entry_t cfg_preferred_codec;
 
     config_get_value(CFGID_PREFERRED_CODEC, &cfg_preferred_codec,
@@ -470,6 +477,7 @@ sip_config_preferred_codec (void)
         /* The configuration has preferred codec configured */
         return (cfg_preferred_codec.value);
     }
+#endif
     /* No preferred codec configured */
     return (RTP_NONE);
 }
@@ -656,6 +664,7 @@ sip_config_video_supported_codecs_get (rtp_ptype aSupportedCodecs[],
                           uint16_t supportedCodecsLen, boolean isOffer)
 {
     uint16_t count = 0;
+    rtp_ptype pref_codec;
     int codec_mask;
     int hw_codec_mask = vcmGetVideoCodecList(VCM_DSP_FULLDUPLEX_HW);
     int gmp_codec_mask = vcmGetVideoCodecList(VCM_DSP_FULLDUPLEX_GMP);
@@ -680,6 +689,22 @@ sip_config_video_supported_codecs_get (rtp_ptype aSupportedCodecs[],
     count += sip_config_video_add_codecs(&aSupportedCodecs[count],
                                          supportedCodecsLen, gmp_codec_mask);
 
+    // Now promote the preferred codec if any
+    pref_codec = sip_config_preferred_codec();
+    if (pref_codec != RTP_NONE) {
+      int i,j;
+      for (i = 1; i < count; i++) {
+        if (aSupportedCodecs[i] == pref_codec) {
+          // bump it to the front; bump all the rest down
+          for (j = i; j > 0; j--) {
+            aSupportedCodecs[j] = aSupportedCodecs[j-1];
+          }
+          aSupportedCodecs[0] = pref_codec;
+          return count;
+        }
+      }
+      // preferred not found, oh well
+    }
     return count;
 }
 
diff --git a/media/webrtc/signaling/src/sipcc/include/vcm.h b/media/webrtc/signaling/src/sipcc/include/vcm.h
index ba63badb939..4b498e22a96 100755
--- a/media/webrtc/signaling/src/sipcc/include/vcm.h
+++ b/media/webrtc/signaling/src/sipcc/include/vcm.h
@@ -1091,6 +1091,8 @@ short vcmGetVideoMaxBr(uint16_t codec, int32_t *max_br);
 
 short vcmGetVideoMaxMbps(uint16_t codec, int32_t *max_mbps);
 
+short vcmGetVideoPreferredCodec(int32_t *preferred_codec);
+
 //Using C++ for gips. This is the end of extern "C" above.
 #ifdef __cplusplus
 }

From 3b2ebbc0020a75fff4aebbf4d4f9c587cfdc9875 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 24 Jul 2014 12:36:32 +1200
Subject: [PATCH 073/128] b=1043075 revert to no hostbz2 when --with-system-bz2
 r=glandium

--HG--
extra : rebase_source : 4d7c0bed8afe7c6edd5b39ca4f971667df35c139
---
 other-licenses/bsdiff/moz.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/other-licenses/bsdiff/moz.build b/other-licenses/bsdiff/moz.build
index c4a3e736b7e..3df2cfa0bdd 100644
--- a/other-licenses/bsdiff/moz.build
+++ b/other-licenses/bsdiff/moz.build
@@ -10,9 +10,10 @@ HOST_SOURCES += [
 
 HOST_PROGRAM = 'mbsdiff'
 
-HOST_USE_LIBS += [
-    'hostbz2',
-]
+if not CONFIG['MOZ_NATIVE_BZ2']:
+    HOST_USE_LIBS += [
+        'hostbz2',
+    ]
 
 LOCAL_INCLUDES += [
     '/toolkit/mozapps/update/updater',

From 220325656a1773eafb1ea009156380ff147dcb5d Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 24 Jul 2014 17:51:26 +1200
Subject: [PATCH 074/128] b=1043772 assert ScopedXErrorHandler is used only on
 main thread r=nical

--HG--
extra : rebase_source : 737a78cabe0cb9a44786cd562cc1e34bafd7a2a0
---
 gfx/src/X11Util.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/src/X11Util.cpp b/gfx/src/X11Util.cpp
index ac9c2595824..8cdf145e45b 100644
--- a/gfx/src/X11Util.cpp
+++ b/gfx/src/X11Util.cpp
@@ -7,6 +7,7 @@
 
 #include "X11Util.h"
 #include "nsDebug.h"                    // for NS_ASSERTION, etc
+#include "MainThreadUtils.h"            // for NS_IsMainThread
 
 namespace mozilla {
 
@@ -58,6 +59,7 @@ ScopedXErrorHandler::ErrorHandler(Display *, XErrorEvent *ev)
 
 ScopedXErrorHandler::ScopedXErrorHandler()
 {
+    MOZ_ASSERT(NS_IsMainThread());
     // let sXErrorPtr point to this object's mXError object, but don't reset this mXError object!
     // think of the case of nested ScopedXErrorHandler's.
     mOldXErrorPtr = sXErrorPtr;

From 21a2eb043217e16342f25d96cf67ad16fc60c403 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Mon, 28 Jul 2014 16:32:50 +1200
Subject: [PATCH 075/128] Bug 1044713 - Modify MP4 metadata parser to make it
 less sensitive to atom ordering; r=edwin

---
 .../media/libstagefright/MPEG4Extractor.cpp   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
index 00279ff6829..0ec1efecb00 100644
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -476,26 +476,27 @@ status_t MPEG4Extractor::readMetaData() {
     }
 
     off64_t offset = 0;
-    status_t err;
+    status_t err = OK;
     while (true) {
-        err = parseChunk(&offset, 0);
-        if (err == OK) {
-            continue;
-        }
-
         uint32_t hdr[2];
         if (mDataSource->readAt(offset, hdr, 8) < 8) {
             break;
         }
         uint32_t chunk_type = ntohl(hdr[1]);
-        if (chunk_type == FOURCC('s', 'i', 'd', 'x')) {
-            // parse the sidx box too
-            continue;
-        } else if (chunk_type == FOURCC('m', 'o', 'o', 'f')) {
+        if (chunk_type == FOURCC('m', 'd', 'a', 't')) {
+            break;
+        }
+        if (chunk_type == FOURCC('m', 'o', 'o', 'f')) {
             // store the offset of the first segment
             mMoofOffset = offset;
+            break;
+        }
+        err = parseChunk(&offset, 0);
+        if (err != OK &&
+                chunk_type != FOURCC('s', 'i', 'd', 'x') &&
+                chunk_type != FOURCC('m', 'o', 'o', 'v')) {
+            break;
         }
-        break;
     }
 
     if (mInitCheck == OK) {

From 09e7290a911f0a830a478231b5bcd32aac28eb33 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Mon, 28 Jul 2014 16:32:51 +1200
Subject: [PATCH 076/128] Bug 1044714 - Add MP4 parser 'trex' atom support;
 r=edwin

---
 .../media/libstagefright/MPEG4Extractor.cpp   | 50 ++++++++++++++++---
 .../libstagefright/include/MPEG4Extractor.h   | 22 ++++++++
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
index 0ec1efecb00..ef5f216e403 100644
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -48,7 +48,8 @@ public:
                 int32_t timeScale,
                 const sp<SampleTable> &sampleTable,
                 Vector<SidxEntry> &sidx,
-                off64_t firstMoofOffset);
+                off64_t firstMoofOffset,
+                MPEG4Extractor::TrackExtends &trackExtends);
 
     virtual status_t start(MetaData *params = NULL);
     virtual status_t stop();
@@ -142,6 +143,7 @@ private:
         Vector<uint32_t> encryptedsizes;
     };
     Vector<Sample> mCurrentSamples;
+    MPEG4Extractor::TrackExtends mTrackExtends;
 
     MPEG4Source(const MPEG4Source &);
     MPEG4Source &operator=(const MPEG4Source &);
@@ -1046,6 +1048,17 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
             break;
         }
 
+        case FOURCC('t', 'r', 'e', 'x'):
+        {
+            status_t err;
+            if ((err = parseTrackExtends(data_offset, chunk_data_size)) != OK) {
+                return err;
+            }
+
+            *offset += chunk_size;
+            break;
+        }
+
         case FOURCC('t', 'k', 'h', 'd'):
         {
             status_t err;
@@ -1908,7 +1921,26 @@ status_t MPEG4Extractor::parseSegmentIndex(off64_t offset, size_t size) {
     return OK;
 }
 
-
+status_t MPEG4Extractor::parseTrackExtends(
+    off64_t data_offset, off64_t data_size) {
+    if (data_size != 24) {
+        return ERROR_MALFORMED;
+    }
+    uint8_t buffer[24];
+    if (mDataSource->readAt(data_offset, buffer, 24) < 24) {
+        return ERROR_IO;
+    }
+    mTrackExtends.mVersion = buffer[0];
+    mTrackExtends.mFlags[0] = buffer[1];
+    mTrackExtends.mFlags[1] = buffer[2];
+    mTrackExtends.mFlags[2] = buffer[3];
+    mTrackExtends.mTrackId = U32_AT(&buffer[4]);
+    mTrackExtends.mDefaultSampleDescriptionIndex = U32_AT(&buffer[8]);
+    mTrackExtends.mDefaultSampleDuration = U32_AT(&buffer[12]);
+    mTrackExtends.mDefaultSampleSize = U32_AT(&buffer[16]);
+    mTrackExtends.mDefaultSampleFlags = U32_AT(&buffer[20]);
+    return OK;
+}
 
 status_t MPEG4Extractor::parseTrackHeader(
         off64_t data_offset, off64_t data_size) {
@@ -2210,7 +2242,7 @@ sp<MediaSource> MPEG4Extractor::getTrack(size_t index) {
 
     return new MPEG4Source(
             track->meta, mDataSource, track->timescale, track->sampleTable,
-            mSidxEntries, mMoofOffset);
+            mSidxEntries, mMoofOffset, mTrackExtends);
 }
 
 // static
@@ -2372,7 +2404,8 @@ MPEG4Source::MPEG4Source(
         int32_t timeScale,
         const sp<SampleTable> &sampleTable,
         Vector<SidxEntry> &sidx,
-        off64_t firstMoofOffset)
+        off64_t firstMoofOffset,
+        MPEG4Extractor::TrackExtends &trackExtends)
     : mFormat(format),
       mDataSource(dataSource),
       mTimescale(timeScale),
@@ -2392,7 +2425,8 @@ MPEG4Source::MPEG4Source(
       mStarted(false),
       mBuffer(NULL),
       mWantsNALFragments(false),
-      mSrcBuffer(NULL) {
+      mSrcBuffer(NULL),
+      mTrackExtends(trackExtends) {
 
     mFormat->findInt32(kKeyCryptoMode, &mCryptoMode);
     mDefaultIVSize = 0;
@@ -2937,7 +2971,7 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) {
             & TrackFragmentHeaderInfo::kDefaultSampleDurationPresent) {
         sampleDuration = mTrackFragmentHeaderInfo.mDefaultSampleDuration;
     } else {
-        sampleDuration = mTrackFragmentHeaderInfo.mDefaultSampleDuration;
+        sampleDuration = mTrackExtends.mDefaultSampleDuration;
     }
 
     if (flags & kSampleSizePresent) {
@@ -2946,7 +2980,7 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) {
             & TrackFragmentHeaderInfo::kDefaultSampleSizePresent) {
         sampleSize = mTrackFragmentHeaderInfo.mDefaultSampleSize;
     } else {
-        sampleSize = mTrackFragmentHeaderInfo.mDefaultSampleSize;
+        sampleSize = mTrackExtends.mDefaultSampleSize;
     }
 
     if (flags & kSampleFlagsPresent) {
@@ -2955,7 +2989,7 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) {
             & TrackFragmentHeaderInfo::kDefaultSampleFlagsPresent) {
         sampleFlags = mTrackFragmentHeaderInfo.mDefaultSampleFlags;
     } else {
-        sampleFlags = mTrackFragmentHeaderInfo.mDefaultSampleFlags;
+        sampleFlags = mTrackExtends.mDefaultSampleFlags;
     }
 
     if (flags & kSampleCompositionTimeOffsetPresent) {
diff --git a/media/libstagefright/frameworks/av/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/frameworks/av/media/libstagefright/include/MPEG4Extractor.h
index 98818b8953e..0e20fa94fb6 100644
--- a/media/libstagefright/frameworks/av/media/libstagefright/include/MPEG4Extractor.h
+++ b/media/libstagefright/frameworks/av/media/libstagefright/include/MPEG4Extractor.h
@@ -54,6 +54,24 @@ public:
     // for DRM
     virtual char* getDrmTrackInfo(size_t trackID, int *len);
 
+    struct TrackExtends {
+        TrackExtends(): mVersion(0), mTrackId(0),
+                mDefaultSampleDescriptionIndex(0), mDefaultSampleDuration(0),
+                mDefaultSampleSize(0), mDefaultSampleFlags(0)
+        {
+            mFlags[0] = 0;
+            mFlags[1] = 0;
+            mFlags[2] = 0;
+        }
+        uint8_t mVersion;
+        uint8_t mFlags[3];
+        uint32_t mTrackId;
+        uint32_t mDefaultSampleDescriptionIndex;
+        uint32_t mDefaultSampleDuration;
+        uint32_t mDefaultSampleSize;
+        uint32_t mDefaultSampleFlags;
+    };
+
 protected:
     virtual ~MPEG4Extractor();
 
@@ -113,8 +131,12 @@ private:
     SINF *mFirstSINF;
 
     bool mIsDrm;
+    TrackExtends mTrackExtends;
+
     status_t parseDrmSINF(off64_t *offset, off64_t data_offset);
 
+    status_t parseTrackExtends(off64_t data_offset, off64_t data_size);
+
     status_t parseTrackHeader(off64_t data_offset, off64_t data_size);
 
     status_t parseSegmentIndex(off64_t data_offset, size_t data_size);

From 3fe3b33cdf653f87d35c0b5123619961d92b246a Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Mon, 28 Jul 2014 08:09:21 +0200
Subject: [PATCH 077/128] Bug 1015932 - Shareable OpenSLES engine between cubeb
 and WebRTC. r=jesup

---
 content/media/moz.build                       |   1 +
 .../media/systemservices/OpenSLESProvider.cpp | 163 ++++++++++++++++++
 .../media/systemservices/OpenSLESProvider.h   |  62 +++++++
 content/media/systemservices/moz.build        |  17 ++
 4 files changed, 243 insertions(+)
 create mode 100644 content/media/systemservices/OpenSLESProvider.cpp
 create mode 100644 content/media/systemservices/OpenSLESProvider.h
 create mode 100644 content/media/systemservices/moz.build

diff --git a/content/media/moz.build b/content/media/moz.build
index 3f3b14dc4f3..bbe40b77f2a 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -9,6 +9,7 @@ PARALLEL_DIRS += [
   'gmp',
   'mediasource',
   'ogg',
+  'systemservices',
   'webaudio',
   'webvtt'
 ]
diff --git a/content/media/systemservices/OpenSLESProvider.cpp b/content/media/systemservices/OpenSLESProvider.cpp
new file mode 100644
index 00000000000..bfdc5e2b2ac
--- /dev/null
+++ b/content/media/systemservices/OpenSLESProvider.cpp
@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 50; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "OpenSLESProvider.h"
+#include "prlog.h"
+#include "nsDebug.h"
+#include "mozilla/NullPtr.h"
+
+#include <dlfcn.h>
+#include <SLES/OpenSLES_Android.h>
+#include <SLES/OpenSLES_AndroidConfiguration.h>
+
+// NSPR_LOG_MODULES=OpenSLESProvider:5
+#undef LOG
+#undef LOG_ENABLED
+#if defined(PR_LOGGING)
+PRLogModuleInfo *gOpenSLESProviderLog;
+#define LOG(args) PR_LOG(gOpenSLESProviderLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gLoadManagerLog, 5)
+#else
+#define LOG(args)
+#define LOG_ENABLED() (false)
+#endif
+
+namespace mozilla {
+
+OpenSLESProvider::OpenSLESProvider()
+  : mLock("OpenSLESProvider.mLock"),
+    mSLEngine(nullptr),
+    mSLEngineUsers(0),
+    mOpenSLESLib(nullptr)
+{
+#if defined(PR_LOGGING)
+  if (!gOpenSLESProviderLog)
+    gOpenSLESProviderLog = PR_NewLogModule("OpenSLESProvider");
+  LOG(("OpenSLESProvider being initialized"));
+#endif
+}
+
+OpenSLESProvider::~OpenSLESProvider()
+{
+  if (mOpenSLESLib) {
+    LOG(("OpenSLES Engine was not properly Destroyed"));
+    (void)dlclose(mOpenSLESLib);
+  }
+}
+
+/* static */
+OpenSLESProvider& OpenSLESProvider::getInstance()
+{
+  // This doesn't need a Mutex in C++11 or GCC 4.3+, see N2660 and
+  // https://gcc.gnu.org/projects/cxx0x.html
+  static OpenSLESProvider instance;
+  return instance;
+}
+
+/* static */
+int OpenSLESProvider::Get(SLObjectItf * aObjectm,
+                          SLuint32 aOptionCount,
+                          const SLEngineOption *aOptions)
+{
+  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
+  return provider.GetEngine(aObjectm, aOptionCount, aOptions);
+}
+
+int OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
+                                SLuint32 aOptionCount,
+                                const SLEngineOption *aOptions)
+{
+  MutexAutoLock lock(mLock);
+  LOG(("Getting OpenSLES engine"));
+  // Bug 1042051: Validate options are the same
+  if (mSLEngine != nullptr) {
+    *aObjectm = mSLEngine;
+    mSLEngineUsers++;
+    LOG(("Returning existing engine, %d users", mSLEngineUsers));
+    return SL_RESULT_SUCCESS;
+  } else {
+    int res = ConstructEngine(aObjectm, aOptionCount, aOptions);
+    if (res == SL_RESULT_SUCCESS) {
+      // Bug 1042051: Store engine options
+      mSLEngine = *aObjectm;
+      mSLEngineUsers++;
+      LOG(("Returning new engine"));
+    } else {
+      LOG(("Error getting engine: %d", res));
+    }
+    return res;
+  }
+}
+
+int OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
+                                      SLuint32 aOptionCount,
+                                      const SLEngineOption *aOptions)
+{
+  mLock.AssertCurrentThreadOwns();
+
+  if (!mOpenSLESLib) {
+    mOpenSLESLib = dlopen("libOpenSLES.so", RTLD_LAZY);
+    if (!mOpenSLESLib) {
+      LOG(("Failed to dlopen OpenSLES library"));
+      return SL_RESULT_MEMORY_FAILURE;
+    }
+  }
+
+  typedef SLresult (*slCreateEngine_t)(SLObjectItf *,
+                                       SLuint32,
+                                       const SLEngineOption *,
+                                       SLuint32,
+                                       const SLInterfaceID *,
+                                       const SLboolean *);
+
+  slCreateEngine_t f_slCreateEngine =
+    (slCreateEngine_t)dlsym(mOpenSLESLib, "slCreateEngine");
+  int result = f_slCreateEngine(aObjectm, aOptionCount, aOptions, 0, NULL, NULL);
+  return result;
+}
+
+/* static */
+void OpenSLESProvider::Destroy(SLObjectItf * aObjectm)
+{
+  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
+  provider.DestroyEngine(aObjectm);
+}
+
+void OpenSLESProvider::DestroyEngine(SLObjectItf * aObjectm)
+{
+  MutexAutoLock lock(mLock);
+  NS_ASSERTION(mOpenSLESLib, "OpenSLES destroy called but library is not open");
+
+  mSLEngineUsers--;
+  LOG(("Freeing engine, %d users left", mSLEngineUsers));
+  if (mSLEngineUsers) {
+    return;
+  }
+
+  (*(*aObjectm))->Destroy(*aObjectm);
+  // This assumes SLObjectItf is a pointer, but given the previous line,
+  // that's a given.
+  *aObjectm = nullptr;
+
+  (void)dlclose(mOpenSLESLib);
+  mOpenSLESLib = nullptr;
+}
+
+} // namespace mozilla
+
+extern "C" {
+int mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                            SLuint32 aOptionCount,
+                            const SLEngineOption *aOptions)
+{
+  return mozilla::OpenSLESProvider::Get(aObjectm, aOptionCount, aOptions);
+}
+
+void mozilla_destroy_sles_engine(SLObjectItf * aObjectm)
+{
+  return mozilla::OpenSLESProvider::Destroy(aObjectm);
+}
+
+}
diff --git a/content/media/systemservices/OpenSLESProvider.h b/content/media/systemservices/OpenSLESProvider.h
new file mode 100644
index 00000000000..43cb93ce731
--- /dev/null
+++ b/content/media/systemservices/OpenSLESProvider.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 50; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef _OPENSLESPROVIDER_H_
+#define _OPENSLESPROVIDER_H_
+
+#include <SLES/OpenSLES.h>
+#include <mozilla/Types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern MOZ_EXPORT
+int mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                            SLuint32 aOptionCount,
+                            const SLEngineOption *aOptions);
+extern MOZ_EXPORT
+void mozilla_destroy_sles_engine(SLObjectItf * aObjectm);
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+#include "mozilla/Mutex.h"
+
+extern PRLogModuleInfo *gOpenSLESProviderLog;
+
+namespace mozilla {
+
+class OpenSLESProvider {
+public:
+    static int Get(SLObjectItf * aObjectm,
+                   SLuint32 aOptionCount,
+                   const SLEngineOption *aOptions);
+    static void Destroy(SLObjectItf * aObjectm);
+private:
+    OpenSLESProvider();
+    ~OpenSLESProvider();
+    OpenSLESProvider(OpenSLESProvider const&); // NO IMPLEMENTATION
+    void operator=(OpenSLESProvider const&);   // NO IMPLEMENTATION
+    static OpenSLESProvider& getInstance();
+    int GetEngine(SLObjectItf * aObjectm,
+                  SLuint32 aOptionCount,
+                  const SLEngineOption *aOptions);
+    int ConstructEngine(SLObjectItf * aObjectm,
+                        SLuint32 aOptionCount,
+                        const SLEngineOption *aOptions);
+    void DestroyEngine(SLObjectItf * aObjectm);
+
+    // Protect all our internal variables
+    mozilla::Mutex mLock;
+    SLObjectItf mSLEngine;
+    int mSLEngineUsers;
+    void *mOpenSLESLib;
+};
+
+} //namespace
+#endif // cplusplus
+
+#endif /* _OPENSLESPROVIDER_H_ */
diff --git a/content/media/systemservices/moz.build b/content/media/systemservices/moz.build
new file mode 100644
index 00000000000..00aec7757c3
--- /dev/null
+++ b/content/media/systemservices/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
+    EXPORTS += [
+        'OpenSLESProvider.h'
+    ]
+    UNIFIED_SOURCES += [
+        'OpenSLESProvider.cpp',
+    ]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LIBRARY_NAME = 'gklayout'

From b42bf79aca00511b13a2f5924ff3cf75c66614e5 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Mon, 28 Jul 2014 08:09:34 +0200
Subject: [PATCH 078/128] Bug 1015932 - Add systemservices subdir to
 content/media. r=jesup

--HG--
rename : content/media/webrtc/LoadManager.cpp => content/media/systemservices/LoadManager.cpp
rename : content/media/webrtc/LoadManager.h => content/media/systemservices/LoadManager.h
rename : content/media/webrtc/LoadManagerFactory.cpp => content/media/systemservices/LoadManagerFactory.cpp
rename : content/media/webrtc/LoadManagerFactory.h => content/media/systemservices/LoadManagerFactory.h
rename : content/media/webrtc/LoadMonitor.cpp => content/media/systemservices/LoadMonitor.cpp
rename : content/media/webrtc/LoadMonitor.h => content/media/systemservices/LoadMonitor.h
---
 .../{webrtc => systemservices}/LoadManager.cpp   |  0
 .../{webrtc => systemservices}/LoadManager.h     |  0
 .../LoadManagerFactory.cpp                       |  0
 .../LoadManagerFactory.h                         |  0
 .../{webrtc => systemservices}/LoadMonitor.cpp   |  0
 .../{webrtc => systemservices}/LoadMonitor.h     |  0
 content/media/systemservices/moz.build           | 16 +++++++++++++++-
 content/media/webrtc/moz.build                   |  6 ------
 8 files changed, 15 insertions(+), 7 deletions(-)
 rename content/media/{webrtc => systemservices}/LoadManager.cpp (100%)
 rename content/media/{webrtc => systemservices}/LoadManager.h (100%)
 rename content/media/{webrtc => systemservices}/LoadManagerFactory.cpp (100%)
 rename content/media/{webrtc => systemservices}/LoadManagerFactory.h (100%)
 rename content/media/{webrtc => systemservices}/LoadMonitor.cpp (100%)
 rename content/media/{webrtc => systemservices}/LoadMonitor.h (100%)

diff --git a/content/media/webrtc/LoadManager.cpp b/content/media/systemservices/LoadManager.cpp
similarity index 100%
rename from content/media/webrtc/LoadManager.cpp
rename to content/media/systemservices/LoadManager.cpp
diff --git a/content/media/webrtc/LoadManager.h b/content/media/systemservices/LoadManager.h
similarity index 100%
rename from content/media/webrtc/LoadManager.h
rename to content/media/systemservices/LoadManager.h
diff --git a/content/media/webrtc/LoadManagerFactory.cpp b/content/media/systemservices/LoadManagerFactory.cpp
similarity index 100%
rename from content/media/webrtc/LoadManagerFactory.cpp
rename to content/media/systemservices/LoadManagerFactory.cpp
diff --git a/content/media/webrtc/LoadManagerFactory.h b/content/media/systemservices/LoadManagerFactory.h
similarity index 100%
rename from content/media/webrtc/LoadManagerFactory.h
rename to content/media/systemservices/LoadManagerFactory.h
diff --git a/content/media/webrtc/LoadMonitor.cpp b/content/media/systemservices/LoadMonitor.cpp
similarity index 100%
rename from content/media/webrtc/LoadMonitor.cpp
rename to content/media/systemservices/LoadMonitor.cpp
diff --git a/content/media/webrtc/LoadMonitor.h b/content/media/systemservices/LoadMonitor.h
similarity index 100%
rename from content/media/webrtc/LoadMonitor.h
rename to content/media/systemservices/LoadMonitor.h
diff --git a/content/media/systemservices/moz.build b/content/media/systemservices/moz.build
index 00aec7757c3..4906c482bbc 100644
--- a/content/media/systemservices/moz.build
+++ b/content/media/systemservices/moz.build
@@ -4,6 +4,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+if CONFIG['MOZ_WEBRTC']:
+    EXPORTS += ['LoadManager.h',
+                'LoadManagerFactory.h',
+                'LoadMonitor.h',
+    ]
+    UNIFIED_SOURCES += [
+        'LoadManager.cpp',
+        'LoadManagerFactory.cpp',
+        'LoadMonitor.cpp',
+    ]
+    LOCAL_INCLUDES += [
+        '/media/webrtc/trunk',
+   ]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS += [
         'OpenSLESProvider.h'
@@ -14,4 +28,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-LIBRARY_NAME = 'gklayout'
+FINAL_LIBRARY = 'gklayout'
diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
index 91607d937a5..d37fd10e163 100644
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -14,14 +14,8 @@ EXPORTS += [
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['AudioOutputObserver.h',
-                'LoadManager.h',
-                'LoadManagerFactory.h',
-                'LoadMonitor.h',
                 'MediaEngineWebRTC.h']
     UNIFIED_SOURCES += [
-        'LoadManager.cpp',
-        'LoadManagerFactory.cpp',
-        'LoadMonitor.cpp',
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',

From 53dfe1167acc0a539cd4354e5a059ef1e31559e9 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Mon, 28 Jul 2014 08:09:48 +0200
Subject: [PATCH 079/128] Bug 1015932 - Make WebRTC and libcubeb use the
 OpenSLES engine broker. r=padenot

---
 media/libcubeb/src/cubeb-sles.h               | 20 +++++++++++++++++++
 media/libcubeb/src/cubeb_opensl.c             |  6 ++++--
 .../audio_device/android/opensles_input.cc    |  9 +++++++++
 .../audio_device/android/opensles_output.cc   |  9 +++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 media/libcubeb/src/cubeb-sles.h

diff --git a/media/libcubeb/src/cubeb-sles.h b/media/libcubeb/src/cubeb-sles.h
new file mode 100644
index 00000000000..f93b0a1e73e
--- /dev/null
+++ b/media/libcubeb/src/cubeb-sles.h
@@ -0,0 +1,20 @@
+#ifndef _CUBEB_SLES_H_
+#define _CUBEB_SLES_H_
+#include <OpenSLESProvider.h>
+#include <SLES/OpenSLES.h>
+
+static SLresult cubeb_get_sles_engine(
+  SLObjectItf             *pEngine,
+  SLuint32                numOptions,
+  const SLEngineOption    *pEngineOptions,
+  SLuint32                numInterfaces,
+  const SLInterfaceID     *pInterfaceIds,
+  const SLboolean         * pInterfaceRequired) {
+  return mozilla_get_sles_engine(pEngine, numOptions, pEngineOptions);
+}
+
+static void cubeb_destroy_sles_engine(SLObjectItf *self) {
+ mozilla_destroy_sles_engine(self);
+}
+
+#endif
diff --git a/media/libcubeb/src/cubeb_opensl.c b/media/libcubeb/src/cubeb_opensl.c
index e859e0c7384..56e8890204d 100644
--- a/media/libcubeb/src/cubeb_opensl.c
+++ b/media/libcubeb/src/cubeb_opensl.c
@@ -21,6 +21,7 @@
 #include "cubeb/cubeb.h"
 #include "cubeb-internal.h"
 #include "cubeb_resampler.h"
+#include "cubeb-sles.h"
 
 static struct cubeb_ops const opensl_ops;
 
@@ -263,7 +264,8 @@ opensl_init(cubeb ** context, char const * context_name)
   const SLEngineOption opt[] = {{SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE}};
 
   SLresult res;
-  res = f_slCreateEngine(&ctx->engObj, 1, opt, 0, NULL, NULL);
+  res = cubeb_get_sles_engine(&ctx->engObj, 1, opt, 0, NULL, NULL);
+
   if (res != SL_RESULT_SUCCESS) {
     opensl_destroy(ctx);
     return CUBEB_ERROR;
@@ -442,7 +444,7 @@ opensl_destroy(cubeb * ctx)
   if (ctx->outmixObj)
     (*ctx->outmixObj)->Destroy(ctx->outmixObj);
   if (ctx->engObj)
-    (*ctx->engObj)->Destroy(ctx->engObj);
+    cubeb_destroy_sles_engine(&ctx->engObj);
   dlclose(ctx->lib);
   dlclose(ctx->libmedia);
   free(ctx);
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
index 1fc6ca630c0..00afecd71b1 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
@@ -13,6 +13,7 @@
 #include <assert.h>
 #include <dlfcn.h>
 
+#include "OpenSLESProvider.h"
 #include "webrtc/modules/audio_device/android/audio_common.h"
 #include "webrtc/modules/audio_device/android/opensles_common.h"
 #include "webrtc/modules/audio_device/android/single_rw_fifo.h"
@@ -116,9 +117,13 @@ int32_t OpenSlesInput::Init() {
   }
 
   // Set up OpenSL engine.
+#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE(f_slCreateEngine(&sles_engine_, 1, kOption, 0,
                                             NULL, NULL),
                            -1);
+#else
+  OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
+#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
@@ -138,7 +143,11 @@ int32_t OpenSlesInput::Init() {
 int32_t OpenSlesInput::Terminate() {
   // It is assumed that the caller has stopped recording before terminating.
   assert(!recording_);
+#ifndef MOZILLA_INTERNAL_API
   (*sles_engine_)->Destroy(sles_engine_);
+#else
+  mozilla_destroy_sles_engine(&sles_engine_);
+#endif
   initialized_ = false;
   mic_initialized_ = false;
   rec_initialized_ = false;
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
index 10fca7c0b8d..c9407733a4c 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <dlfcn.h>
 
+#include "OpenSLESProvider.h"
 #include "webrtc/modules/audio_device/android/opensles_common.h"
 #include "webrtc/modules/audio_device/android/fine_audio_buffer.h"
 #include "webrtc/modules/audio_device/android/single_rw_fifo.h"
@@ -116,9 +117,13 @@ int32_t OpenSlesOutput::Init() {
   }
 
   // Set up OpenSl engine.
+#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE(f_slCreateEngine(&sles_engine_, 1, kOption, 0,
                                             NULL, NULL),
                            -1);
+#else
+  OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
+#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
@@ -151,7 +156,11 @@ int32_t OpenSlesOutput::Terminate() {
   // It is assumed that the caller has stopped recording before terminating.
   assert(!playing_);
   (*sles_output_mixer_)->Destroy(sles_output_mixer_);
+#ifndef MOZILLA_INTERNAL_API
   (*sles_engine_)->Destroy(sles_engine_);
+#else
+  mozilla_destroy_sles_engine(&sles_engine_);
+#endif
   initialized_ = false;
   speaker_initialized_ = false;
   play_initialized_ = false;

From ae88e7b948c0f3af5f75fadef905815f2cc5d38c Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Mon, 28 Jul 2014 08:10:21 +0200
Subject: [PATCH 080/128] Bug 1015932 - Move OpenSLES Realize into the engine
 broker. r=padenot

---
 .../media/systemservices/OpenSLESProvider.cpp | 62 +++++++++++++++----
 .../media/systemservices/OpenSLESProvider.h   | 26 +++++---
 media/libcubeb/src/cubeb-sles.h               |  8 ++-
 media/libcubeb/src/cubeb_opensl.c             |  2 +-
 .../audio_device/android/opensles_input.cc    |  4 ++
 .../audio_device/android/opensles_output.cc   |  4 ++
 6 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/content/media/systemservices/OpenSLESProvider.cpp b/content/media/systemservices/OpenSLESProvider.cpp
index bfdc5e2b2ac..bf8fc3dde03 100644
--- a/content/media/systemservices/OpenSLESProvider.cpp
+++ b/content/media/systemservices/OpenSLESProvider.cpp
@@ -30,6 +30,7 @@ OpenSLESProvider::OpenSLESProvider()
   : mLock("OpenSLESProvider.mLock"),
     mSLEngine(nullptr),
     mSLEngineUsers(0),
+    mIsRealized(false),
     mOpenSLESLib(nullptr)
 {
 #if defined(PR_LOGGING)
@@ -57,17 +58,17 @@ OpenSLESProvider& OpenSLESProvider::getInstance()
 }
 
 /* static */
-int OpenSLESProvider::Get(SLObjectItf * aObjectm,
-                          SLuint32 aOptionCount,
-                          const SLEngineOption *aOptions)
+SLresult OpenSLESProvider::Get(SLObjectItf * aObjectm,
+                               SLuint32 aOptionCount,
+                               const SLEngineOption *aOptions)
 {
   OpenSLESProvider& provider = OpenSLESProvider::getInstance();
   return provider.GetEngine(aObjectm, aOptionCount, aOptions);
 }
 
-int OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
-                                SLuint32 aOptionCount,
-                                const SLEngineOption *aOptions)
+SLresult OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
+                                     SLuint32 aOptionCount,
+                                     const SLEngineOption *aOptions)
 {
   MutexAutoLock lock(mLock);
   LOG(("Getting OpenSLES engine"));
@@ -91,9 +92,9 @@ int OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
   }
 }
 
-int OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
-                                      SLuint32 aOptionCount,
-                                      const SLEngineOption *aOptions)
+SLresult OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
+                                           SLuint32 aOptionCount,
+                                           const SLEngineOption *aOptions)
 {
   mLock.AssertCurrentThreadOwns();
 
@@ -143,21 +144,56 @@ void OpenSLESProvider::DestroyEngine(SLObjectItf * aObjectm)
 
   (void)dlclose(mOpenSLESLib);
   mOpenSLESLib = nullptr;
+  mIsRealized = false;
+}
+
+/* static */
+SLresult OpenSLESProvider::Realize(SLObjectItf aObjectm)
+{
+  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
+  return provider.RealizeEngine(aObjectm);
+}
+
+SLresult OpenSLESProvider::RealizeEngine(SLObjectItf aObjectm)
+{
+  MutexAutoLock lock(mLock);
+  NS_ASSERTION(mOpenSLESLib, "OpenSLES realize called but library is not open");
+  NS_ASSERTION(aObjectm != nullptr, "OpenSLES realize engine with empty ObjectItf");
+
+  if (mIsRealized) {
+    LOG(("Not realizing already realized engine"));
+    return SL_RESULT_SUCCESS;
+  } else {
+    SLresult res = (*aObjectm)->Realize(aObjectm, SL_BOOLEAN_FALSE);
+    if (res != SL_RESULT_SUCCESS) {
+      LOG(("Error realizing OpenSLES engine: %d", res));
+    } else {
+      LOG(("Realized OpenSLES engine"));
+      mIsRealized = true;
+    }
+    return res;
+  }
 }
 
 } // namespace mozilla
 
 extern "C" {
-int mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                            SLuint32 aOptionCount,
-                            const SLEngineOption *aOptions)
+SLresult mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                                 SLuint32 aOptionCount,
+                                 const SLEngineOption *aOptions)
 {
   return mozilla::OpenSLESProvider::Get(aObjectm, aOptionCount, aOptions);
 }
 
 void mozilla_destroy_sles_engine(SLObjectItf * aObjectm)
 {
-  return mozilla::OpenSLESProvider::Destroy(aObjectm);
+  mozilla::OpenSLESProvider::Destroy(aObjectm);
+}
+
+SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm)
+{
+  return mozilla::OpenSLESProvider::Realize(aObjectm);
 }
 
 }
+
diff --git a/content/media/systemservices/OpenSLESProvider.h b/content/media/systemservices/OpenSLESProvider.h
index 43cb93ce731..2316dd86213 100644
--- a/content/media/systemservices/OpenSLESProvider.h
+++ b/content/media/systemservices/OpenSLESProvider.h
@@ -13,11 +13,14 @@
 extern "C" {
 #endif
 extern MOZ_EXPORT
-int mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                            SLuint32 aOptionCount,
-                            const SLEngineOption *aOptions);
+SLresult mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                                 SLuint32 aOptionCount,
+                                 const SLEngineOption *aOptions);
 extern MOZ_EXPORT
 void mozilla_destroy_sles_engine(SLObjectItf * aObjectm);
+/* Realize is always in synchronous mode. */
+extern MOZ_EXPORT
+SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm);
 #ifdef __cplusplus
 }
 #endif
@@ -31,28 +34,31 @@ namespace mozilla {
 
 class OpenSLESProvider {
 public:
-    static int Get(SLObjectItf * aObjectm,
+    static SLresult Get(SLObjectItf * aObjectm,
                    SLuint32 aOptionCount,
                    const SLEngineOption *aOptions);
     static void Destroy(SLObjectItf * aObjectm);
+    static SLresult Realize(SLObjectItf aObjectm);
 private:
     OpenSLESProvider();
     ~OpenSLESProvider();
     OpenSLESProvider(OpenSLESProvider const&); // NO IMPLEMENTATION
     void operator=(OpenSLESProvider const&);   // NO IMPLEMENTATION
     static OpenSLESProvider& getInstance();
-    int GetEngine(SLObjectItf * aObjectm,
-                  SLuint32 aOptionCount,
-                  const SLEngineOption *aOptions);
-    int ConstructEngine(SLObjectItf * aObjectm,
-                        SLuint32 aOptionCount,
-                        const SLEngineOption *aOptions);
+    SLresult GetEngine(SLObjectItf * aObjectm,
+                       SLuint32 aOptionCount,
+                       const SLEngineOption *aOptions);
+    SLresult ConstructEngine(SLObjectItf * aObjectm,
+                             SLuint32 aOptionCount,
+                             const SLEngineOption *aOptions);
+    SLresult RealizeEngine(SLObjectItf aObjectm);
     void DestroyEngine(SLObjectItf * aObjectm);
 
     // Protect all our internal variables
     mozilla::Mutex mLock;
     SLObjectItf mSLEngine;
     int mSLEngineUsers;
+    bool mIsRealized;
     void *mOpenSLESLib;
 };
 
diff --git a/media/libcubeb/src/cubeb-sles.h b/media/libcubeb/src/cubeb-sles.h
index f93b0a1e73e..07255235286 100644
--- a/media/libcubeb/src/cubeb-sles.h
+++ b/media/libcubeb/src/cubeb-sles.h
@@ -14,7 +14,13 @@ static SLresult cubeb_get_sles_engine(
 }
 
 static void cubeb_destroy_sles_engine(SLObjectItf *self) {
- mozilla_destroy_sles_engine(self);
+  mozilla_destroy_sles_engine(self);
+}
+
+/* Only synchronous operation is supported, as if the second
+   parameter was FALSE. */
+static SLresult cubeb_realize_sles_engine(SLObjectItf self) {
+  return mozilla_realize_sles_engine(self);
 }
 
 #endif
diff --git a/media/libcubeb/src/cubeb_opensl.c b/media/libcubeb/src/cubeb_opensl.c
index 56e8890204d..220717e49ac 100644
--- a/media/libcubeb/src/cubeb_opensl.c
+++ b/media/libcubeb/src/cubeb_opensl.c
@@ -271,7 +271,7 @@ opensl_init(cubeb ** context, char const * context_name)
     return CUBEB_ERROR;
   }
 
-  res = (*ctx->engObj)->Realize(ctx->engObj, SL_BOOLEAN_FALSE);
+  res = cubeb_realize_sles_engine(ctx->engObj);
   if (res != SL_RESULT_SUCCESS) {
     opensl_destroy(ctx);
     return CUBEB_ERROR;
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
index 00afecd71b1..96dc89937c1 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
@@ -124,9 +124,13 @@ int32_t OpenSlesInput::Init() {
 #else
   OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
 #endif
+#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
+#else
+  OPENSL_RETURN_ON_FAILURE(mozilla_realize_sles_engine(sles_engine_), -1);
+#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->GetInterface(sles_engine_,
                                                          SL_IID_ENGINE_,
                                                          &sles_engine_itf_),
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
index c9407733a4c..e32883f12b2 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
@@ -124,9 +124,13 @@ int32_t OpenSlesOutput::Init() {
 #else
   OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
 #endif
+#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
+#else
+  OPENSL_RETURN_ON_FAILURE(mozilla_realize_sles_engine(sles_engine_), -1);
+#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->GetInterface(sles_engine_,
                                                          SL_IID_ENGINE_,
                                                          &sles_engine_itf_),

From 739fa1ca5d94d937a5d27d88c74256ef3794c6f8 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 28 Jul 2014 08:21:16 +0200
Subject: [PATCH 081/128] Backed out changeset 689b75c98f2f (bug 1015932)

---
 .../media/systemservices/OpenSLESProvider.cpp | 62 ++++---------------
 .../media/systemservices/OpenSLESProvider.h   | 26 +++-----
 media/libcubeb/src/cubeb-sles.h               |  8 +--
 media/libcubeb/src/cubeb_opensl.c             |  2 +-
 .../audio_device/android/opensles_input.cc    |  4 --
 .../audio_device/android/opensles_output.cc   |  4 --
 6 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/content/media/systemservices/OpenSLESProvider.cpp b/content/media/systemservices/OpenSLESProvider.cpp
index bf8fc3dde03..bfdc5e2b2ac 100644
--- a/content/media/systemservices/OpenSLESProvider.cpp
+++ b/content/media/systemservices/OpenSLESProvider.cpp
@@ -30,7 +30,6 @@ OpenSLESProvider::OpenSLESProvider()
   : mLock("OpenSLESProvider.mLock"),
     mSLEngine(nullptr),
     mSLEngineUsers(0),
-    mIsRealized(false),
     mOpenSLESLib(nullptr)
 {
 #if defined(PR_LOGGING)
@@ -58,17 +57,17 @@ OpenSLESProvider& OpenSLESProvider::getInstance()
 }
 
 /* static */
-SLresult OpenSLESProvider::Get(SLObjectItf * aObjectm,
-                               SLuint32 aOptionCount,
-                               const SLEngineOption *aOptions)
+int OpenSLESProvider::Get(SLObjectItf * aObjectm,
+                          SLuint32 aOptionCount,
+                          const SLEngineOption *aOptions)
 {
   OpenSLESProvider& provider = OpenSLESProvider::getInstance();
   return provider.GetEngine(aObjectm, aOptionCount, aOptions);
 }
 
-SLresult OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
-                                     SLuint32 aOptionCount,
-                                     const SLEngineOption *aOptions)
+int OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
+                                SLuint32 aOptionCount,
+                                const SLEngineOption *aOptions)
 {
   MutexAutoLock lock(mLock);
   LOG(("Getting OpenSLES engine"));
@@ -92,9 +91,9 @@ SLresult OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
   }
 }
 
-SLresult OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
-                                           SLuint32 aOptionCount,
-                                           const SLEngineOption *aOptions)
+int OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
+                                      SLuint32 aOptionCount,
+                                      const SLEngineOption *aOptions)
 {
   mLock.AssertCurrentThreadOwns();
 
@@ -144,56 +143,21 @@ void OpenSLESProvider::DestroyEngine(SLObjectItf * aObjectm)
 
   (void)dlclose(mOpenSLESLib);
   mOpenSLESLib = nullptr;
-  mIsRealized = false;
-}
-
-/* static */
-SLresult OpenSLESProvider::Realize(SLObjectItf aObjectm)
-{
-  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
-  return provider.RealizeEngine(aObjectm);
-}
-
-SLresult OpenSLESProvider::RealizeEngine(SLObjectItf aObjectm)
-{
-  MutexAutoLock lock(mLock);
-  NS_ASSERTION(mOpenSLESLib, "OpenSLES realize called but library is not open");
-  NS_ASSERTION(aObjectm != nullptr, "OpenSLES realize engine with empty ObjectItf");
-
-  if (mIsRealized) {
-    LOG(("Not realizing already realized engine"));
-    return SL_RESULT_SUCCESS;
-  } else {
-    SLresult res = (*aObjectm)->Realize(aObjectm, SL_BOOLEAN_FALSE);
-    if (res != SL_RESULT_SUCCESS) {
-      LOG(("Error realizing OpenSLES engine: %d", res));
-    } else {
-      LOG(("Realized OpenSLES engine"));
-      mIsRealized = true;
-    }
-    return res;
-  }
 }
 
 } // namespace mozilla
 
 extern "C" {
-SLresult mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                                 SLuint32 aOptionCount,
-                                 const SLEngineOption *aOptions)
+int mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                            SLuint32 aOptionCount,
+                            const SLEngineOption *aOptions)
 {
   return mozilla::OpenSLESProvider::Get(aObjectm, aOptionCount, aOptions);
 }
 
 void mozilla_destroy_sles_engine(SLObjectItf * aObjectm)
 {
-  mozilla::OpenSLESProvider::Destroy(aObjectm);
-}
-
-SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm)
-{
-  return mozilla::OpenSLESProvider::Realize(aObjectm);
+  return mozilla::OpenSLESProvider::Destroy(aObjectm);
 }
 
 }
-
diff --git a/content/media/systemservices/OpenSLESProvider.h b/content/media/systemservices/OpenSLESProvider.h
index 2316dd86213..43cb93ce731 100644
--- a/content/media/systemservices/OpenSLESProvider.h
+++ b/content/media/systemservices/OpenSLESProvider.h
@@ -13,14 +13,11 @@
 extern "C" {
 #endif
 extern MOZ_EXPORT
-SLresult mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                                 SLuint32 aOptionCount,
-                                 const SLEngineOption *aOptions);
+int mozilla_get_sles_engine(SLObjectItf * aObjectm,
+                            SLuint32 aOptionCount,
+                            const SLEngineOption *aOptions);
 extern MOZ_EXPORT
 void mozilla_destroy_sles_engine(SLObjectItf * aObjectm);
-/* Realize is always in synchronous mode. */
-extern MOZ_EXPORT
-SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm);
 #ifdef __cplusplus
 }
 #endif
@@ -34,31 +31,28 @@ namespace mozilla {
 
 class OpenSLESProvider {
 public:
-    static SLresult Get(SLObjectItf * aObjectm,
+    static int Get(SLObjectItf * aObjectm,
                    SLuint32 aOptionCount,
                    const SLEngineOption *aOptions);
     static void Destroy(SLObjectItf * aObjectm);
-    static SLresult Realize(SLObjectItf aObjectm);
 private:
     OpenSLESProvider();
     ~OpenSLESProvider();
     OpenSLESProvider(OpenSLESProvider const&); // NO IMPLEMENTATION
     void operator=(OpenSLESProvider const&);   // NO IMPLEMENTATION
     static OpenSLESProvider& getInstance();
-    SLresult GetEngine(SLObjectItf * aObjectm,
-                       SLuint32 aOptionCount,
-                       const SLEngineOption *aOptions);
-    SLresult ConstructEngine(SLObjectItf * aObjectm,
-                             SLuint32 aOptionCount,
-                             const SLEngineOption *aOptions);
-    SLresult RealizeEngine(SLObjectItf aObjectm);
+    int GetEngine(SLObjectItf * aObjectm,
+                  SLuint32 aOptionCount,
+                  const SLEngineOption *aOptions);
+    int ConstructEngine(SLObjectItf * aObjectm,
+                        SLuint32 aOptionCount,
+                        const SLEngineOption *aOptions);
     void DestroyEngine(SLObjectItf * aObjectm);
 
     // Protect all our internal variables
     mozilla::Mutex mLock;
     SLObjectItf mSLEngine;
     int mSLEngineUsers;
-    bool mIsRealized;
     void *mOpenSLESLib;
 };
 
diff --git a/media/libcubeb/src/cubeb-sles.h b/media/libcubeb/src/cubeb-sles.h
index 07255235286..f93b0a1e73e 100644
--- a/media/libcubeb/src/cubeb-sles.h
+++ b/media/libcubeb/src/cubeb-sles.h
@@ -14,13 +14,7 @@ static SLresult cubeb_get_sles_engine(
 }
 
 static void cubeb_destroy_sles_engine(SLObjectItf *self) {
-  mozilla_destroy_sles_engine(self);
-}
-
-/* Only synchronous operation is supported, as if the second
-   parameter was FALSE. */
-static SLresult cubeb_realize_sles_engine(SLObjectItf self) {
-  return mozilla_realize_sles_engine(self);
+ mozilla_destroy_sles_engine(self);
 }
 
 #endif
diff --git a/media/libcubeb/src/cubeb_opensl.c b/media/libcubeb/src/cubeb_opensl.c
index 220717e49ac..56e8890204d 100644
--- a/media/libcubeb/src/cubeb_opensl.c
+++ b/media/libcubeb/src/cubeb_opensl.c
@@ -271,7 +271,7 @@ opensl_init(cubeb ** context, char const * context_name)
     return CUBEB_ERROR;
   }
 
-  res = cubeb_realize_sles_engine(ctx->engObj);
+  res = (*ctx->engObj)->Realize(ctx->engObj, SL_BOOLEAN_FALSE);
   if (res != SL_RESULT_SUCCESS) {
     opensl_destroy(ctx);
     return CUBEB_ERROR;
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
index 96dc89937c1..00afecd71b1 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
@@ -124,13 +124,9 @@ int32_t OpenSlesInput::Init() {
 #else
   OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
 #endif
-#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
-#else
-  OPENSL_RETURN_ON_FAILURE(mozilla_realize_sles_engine(sles_engine_), -1);
-#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->GetInterface(sles_engine_,
                                                          SL_IID_ENGINE_,
                                                          &sles_engine_itf_),
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
index e32883f12b2..c9407733a4c 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
@@ -124,13 +124,9 @@ int32_t OpenSlesOutput::Init() {
 #else
   OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
 #endif
-#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
-#else
-  OPENSL_RETURN_ON_FAILURE(mozilla_realize_sles_engine(sles_engine_), -1);
-#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->GetInterface(sles_engine_,
                                                          SL_IID_ENGINE_,
                                                          &sles_engine_itf_),

From 32b3ef21f18f63ae58929f69e3ecda7df862e810 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 28 Jul 2014 08:21:19 +0200
Subject: [PATCH 082/128] Backed out changeset b652396e9fd7 (bug 1015932)

---
 media/libcubeb/src/cubeb-sles.h               | 20 -------------------
 media/libcubeb/src/cubeb_opensl.c             |  6 ++----
 .../audio_device/android/opensles_input.cc    |  9 ---------
 .../audio_device/android/opensles_output.cc   |  9 ---------
 4 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 media/libcubeb/src/cubeb-sles.h

diff --git a/media/libcubeb/src/cubeb-sles.h b/media/libcubeb/src/cubeb-sles.h
deleted file mode 100644
index f93b0a1e73e..00000000000
--- a/media/libcubeb/src/cubeb-sles.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _CUBEB_SLES_H_
-#define _CUBEB_SLES_H_
-#include <OpenSLESProvider.h>
-#include <SLES/OpenSLES.h>
-
-static SLresult cubeb_get_sles_engine(
-  SLObjectItf             *pEngine,
-  SLuint32                numOptions,
-  const SLEngineOption    *pEngineOptions,
-  SLuint32                numInterfaces,
-  const SLInterfaceID     *pInterfaceIds,
-  const SLboolean         * pInterfaceRequired) {
-  return mozilla_get_sles_engine(pEngine, numOptions, pEngineOptions);
-}
-
-static void cubeb_destroy_sles_engine(SLObjectItf *self) {
- mozilla_destroy_sles_engine(self);
-}
-
-#endif
diff --git a/media/libcubeb/src/cubeb_opensl.c b/media/libcubeb/src/cubeb_opensl.c
index 56e8890204d..e859e0c7384 100644
--- a/media/libcubeb/src/cubeb_opensl.c
+++ b/media/libcubeb/src/cubeb_opensl.c
@@ -21,7 +21,6 @@
 #include "cubeb/cubeb.h"
 #include "cubeb-internal.h"
 #include "cubeb_resampler.h"
-#include "cubeb-sles.h"
 
 static struct cubeb_ops const opensl_ops;
 
@@ -264,8 +263,7 @@ opensl_init(cubeb ** context, char const * context_name)
   const SLEngineOption opt[] = {{SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE}};
 
   SLresult res;
-  res = cubeb_get_sles_engine(&ctx->engObj, 1, opt, 0, NULL, NULL);
-
+  res = f_slCreateEngine(&ctx->engObj, 1, opt, 0, NULL, NULL);
   if (res != SL_RESULT_SUCCESS) {
     opensl_destroy(ctx);
     return CUBEB_ERROR;
@@ -444,7 +442,7 @@ opensl_destroy(cubeb * ctx)
   if (ctx->outmixObj)
     (*ctx->outmixObj)->Destroy(ctx->outmixObj);
   if (ctx->engObj)
-    cubeb_destroy_sles_engine(&ctx->engObj);
+    (*ctx->engObj)->Destroy(ctx->engObj);
   dlclose(ctx->lib);
   dlclose(ctx->libmedia);
   free(ctx);
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
index 00afecd71b1..1fc6ca630c0 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
@@ -13,7 +13,6 @@
 #include <assert.h>
 #include <dlfcn.h>
 
-#include "OpenSLESProvider.h"
 #include "webrtc/modules/audio_device/android/audio_common.h"
 #include "webrtc/modules/audio_device/android/opensles_common.h"
 #include "webrtc/modules/audio_device/android/single_rw_fifo.h"
@@ -117,13 +116,9 @@ int32_t OpenSlesInput::Init() {
   }
 
   // Set up OpenSL engine.
-#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE(f_slCreateEngine(&sles_engine_, 1, kOption, 0,
                                             NULL, NULL),
                            -1);
-#else
-  OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
-#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
@@ -143,11 +138,7 @@ int32_t OpenSlesInput::Init() {
 int32_t OpenSlesInput::Terminate() {
   // It is assumed that the caller has stopped recording before terminating.
   assert(!recording_);
-#ifndef MOZILLA_INTERNAL_API
   (*sles_engine_)->Destroy(sles_engine_);
-#else
-  mozilla_destroy_sles_engine(&sles_engine_);
-#endif
   initialized_ = false;
   mic_initialized_ = false;
   rec_initialized_ = false;
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
index c9407733a4c..10fca7c0b8d 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_output.cc
@@ -15,7 +15,6 @@
 #include <assert.h>
 #include <dlfcn.h>
 
-#include "OpenSLESProvider.h"
 #include "webrtc/modules/audio_device/android/opensles_common.h"
 #include "webrtc/modules/audio_device/android/fine_audio_buffer.h"
 #include "webrtc/modules/audio_device/android/single_rw_fifo.h"
@@ -117,13 +116,9 @@ int32_t OpenSlesOutput::Init() {
   }
 
   // Set up OpenSl engine.
-#ifndef MOZILLA_INTERNAL_API
   OPENSL_RETURN_ON_FAILURE(f_slCreateEngine(&sles_engine_, 1, kOption, 0,
                                             NULL, NULL),
                            -1);
-#else
-  OPENSL_RETURN_ON_FAILURE(mozilla_get_sles_engine(&sles_engine_, 1, kOption), -1);
-#endif
   OPENSL_RETURN_ON_FAILURE((*sles_engine_)->Realize(sles_engine_,
                                                     SL_BOOLEAN_FALSE),
                            -1);
@@ -156,11 +151,7 @@ int32_t OpenSlesOutput::Terminate() {
   // It is assumed that the caller has stopped recording before terminating.
   assert(!playing_);
   (*sles_output_mixer_)->Destroy(sles_output_mixer_);
-#ifndef MOZILLA_INTERNAL_API
   (*sles_engine_)->Destroy(sles_engine_);
-#else
-  mozilla_destroy_sles_engine(&sles_engine_);
-#endif
   initialized_ = false;
   speaker_initialized_ = false;
   play_initialized_ = false;

From 31687dfd7f66bc7fcd9d1f988357d2c3eb3b443f Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 28 Jul 2014 08:21:21 +0200
Subject: [PATCH 083/128] Backed out changeset 3af17bad947f (bug 1015932)

--HG--
rename : content/media/systemservices/LoadManager.cpp => content/media/webrtc/LoadManager.cpp
rename : content/media/systemservices/LoadManager.h => content/media/webrtc/LoadManager.h
rename : content/media/systemservices/LoadManagerFactory.cpp => content/media/webrtc/LoadManagerFactory.cpp
rename : content/media/systemservices/LoadManagerFactory.h => content/media/webrtc/LoadManagerFactory.h
rename : content/media/systemservices/LoadMonitor.cpp => content/media/webrtc/LoadMonitor.cpp
rename : content/media/systemservices/LoadMonitor.h => content/media/webrtc/LoadMonitor.h
---
 content/media/systemservices/moz.build           | 16 +---------------
 .../{systemservices => webrtc}/LoadManager.cpp   |  0
 .../{systemservices => webrtc}/LoadManager.h     |  0
 .../LoadManagerFactory.cpp                       |  0
 .../LoadManagerFactory.h                         |  0
 .../{systemservices => webrtc}/LoadMonitor.cpp   |  0
 .../{systemservices => webrtc}/LoadMonitor.h     |  0
 content/media/webrtc/moz.build                   |  6 ++++++
 8 files changed, 7 insertions(+), 15 deletions(-)
 rename content/media/{systemservices => webrtc}/LoadManager.cpp (100%)
 rename content/media/{systemservices => webrtc}/LoadManager.h (100%)
 rename content/media/{systemservices => webrtc}/LoadManagerFactory.cpp (100%)
 rename content/media/{systemservices => webrtc}/LoadManagerFactory.h (100%)
 rename content/media/{systemservices => webrtc}/LoadMonitor.cpp (100%)
 rename content/media/{systemservices => webrtc}/LoadMonitor.h (100%)

diff --git a/content/media/systemservices/moz.build b/content/media/systemservices/moz.build
index 4906c482bbc..00aec7757c3 100644
--- a/content/media/systemservices/moz.build
+++ b/content/media/systemservices/moz.build
@@ -4,20 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MOZ_WEBRTC']:
-    EXPORTS += ['LoadManager.h',
-                'LoadManagerFactory.h',
-                'LoadMonitor.h',
-    ]
-    UNIFIED_SOURCES += [
-        'LoadManager.cpp',
-        'LoadManagerFactory.cpp',
-        'LoadMonitor.cpp',
-    ]
-    LOCAL_INCLUDES += [
-        '/media/webrtc/trunk',
-   ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS += [
         'OpenSLESProvider.h'
@@ -28,4 +14,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-FINAL_LIBRARY = 'gklayout'
+LIBRARY_NAME = 'gklayout'
diff --git a/content/media/systemservices/LoadManager.cpp b/content/media/webrtc/LoadManager.cpp
similarity index 100%
rename from content/media/systemservices/LoadManager.cpp
rename to content/media/webrtc/LoadManager.cpp
diff --git a/content/media/systemservices/LoadManager.h b/content/media/webrtc/LoadManager.h
similarity index 100%
rename from content/media/systemservices/LoadManager.h
rename to content/media/webrtc/LoadManager.h
diff --git a/content/media/systemservices/LoadManagerFactory.cpp b/content/media/webrtc/LoadManagerFactory.cpp
similarity index 100%
rename from content/media/systemservices/LoadManagerFactory.cpp
rename to content/media/webrtc/LoadManagerFactory.cpp
diff --git a/content/media/systemservices/LoadManagerFactory.h b/content/media/webrtc/LoadManagerFactory.h
similarity index 100%
rename from content/media/systemservices/LoadManagerFactory.h
rename to content/media/webrtc/LoadManagerFactory.h
diff --git a/content/media/systemservices/LoadMonitor.cpp b/content/media/webrtc/LoadMonitor.cpp
similarity index 100%
rename from content/media/systemservices/LoadMonitor.cpp
rename to content/media/webrtc/LoadMonitor.cpp
diff --git a/content/media/systemservices/LoadMonitor.h b/content/media/webrtc/LoadMonitor.h
similarity index 100%
rename from content/media/systemservices/LoadMonitor.h
rename to content/media/webrtc/LoadMonitor.h
diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
index d37fd10e163..91607d937a5 100644
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -14,8 +14,14 @@ EXPORTS += [
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['AudioOutputObserver.h',
+                'LoadManager.h',
+                'LoadManagerFactory.h',
+                'LoadMonitor.h',
                 'MediaEngineWebRTC.h']
     UNIFIED_SOURCES += [
+        'LoadManager.cpp',
+        'LoadManagerFactory.cpp',
+        'LoadMonitor.cpp',
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',

From 3792fc3fa6a08539e259ae4e3193ef070ba4eea0 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 28 Jul 2014 08:21:45 +0200
Subject: [PATCH 084/128] Backed out changeset c7024109e9ae (bug 1015932) for
 bustage on a CLOSED TREE

---
 content/media/moz.build                       |   1 -
 .../media/systemservices/OpenSLESProvider.cpp | 163 ------------------
 .../media/systemservices/OpenSLESProvider.h   |  62 -------
 content/media/systemservices/moz.build        |  17 --
 4 files changed, 243 deletions(-)
 delete mode 100644 content/media/systemservices/OpenSLESProvider.cpp
 delete mode 100644 content/media/systemservices/OpenSLESProvider.h
 delete mode 100644 content/media/systemservices/moz.build

diff --git a/content/media/moz.build b/content/media/moz.build
index bbe40b77f2a..3f3b14dc4f3 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -9,7 +9,6 @@ PARALLEL_DIRS += [
   'gmp',
   'mediasource',
   'ogg',
-  'systemservices',
   'webaudio',
   'webvtt'
 ]
diff --git a/content/media/systemservices/OpenSLESProvider.cpp b/content/media/systemservices/OpenSLESProvider.cpp
deleted file mode 100644
index bfdc5e2b2ac..00000000000
--- a/content/media/systemservices/OpenSLESProvider.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 50; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "OpenSLESProvider.h"
-#include "prlog.h"
-#include "nsDebug.h"
-#include "mozilla/NullPtr.h"
-
-#include <dlfcn.h>
-#include <SLES/OpenSLES_Android.h>
-#include <SLES/OpenSLES_AndroidConfiguration.h>
-
-// NSPR_LOG_MODULES=OpenSLESProvider:5
-#undef LOG
-#undef LOG_ENABLED
-#if defined(PR_LOGGING)
-PRLogModuleInfo *gOpenSLESProviderLog;
-#define LOG(args) PR_LOG(gOpenSLESProviderLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gLoadManagerLog, 5)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
-
-namespace mozilla {
-
-OpenSLESProvider::OpenSLESProvider()
-  : mLock("OpenSLESProvider.mLock"),
-    mSLEngine(nullptr),
-    mSLEngineUsers(0),
-    mOpenSLESLib(nullptr)
-{
-#if defined(PR_LOGGING)
-  if (!gOpenSLESProviderLog)
-    gOpenSLESProviderLog = PR_NewLogModule("OpenSLESProvider");
-  LOG(("OpenSLESProvider being initialized"));
-#endif
-}
-
-OpenSLESProvider::~OpenSLESProvider()
-{
-  if (mOpenSLESLib) {
-    LOG(("OpenSLES Engine was not properly Destroyed"));
-    (void)dlclose(mOpenSLESLib);
-  }
-}
-
-/* static */
-OpenSLESProvider& OpenSLESProvider::getInstance()
-{
-  // This doesn't need a Mutex in C++11 or GCC 4.3+, see N2660 and
-  // https://gcc.gnu.org/projects/cxx0x.html
-  static OpenSLESProvider instance;
-  return instance;
-}
-
-/* static */
-int OpenSLESProvider::Get(SLObjectItf * aObjectm,
-                          SLuint32 aOptionCount,
-                          const SLEngineOption *aOptions)
-{
-  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
-  return provider.GetEngine(aObjectm, aOptionCount, aOptions);
-}
-
-int OpenSLESProvider::GetEngine(SLObjectItf * aObjectm,
-                                SLuint32 aOptionCount,
-                                const SLEngineOption *aOptions)
-{
-  MutexAutoLock lock(mLock);
-  LOG(("Getting OpenSLES engine"));
-  // Bug 1042051: Validate options are the same
-  if (mSLEngine != nullptr) {
-    *aObjectm = mSLEngine;
-    mSLEngineUsers++;
-    LOG(("Returning existing engine, %d users", mSLEngineUsers));
-    return SL_RESULT_SUCCESS;
-  } else {
-    int res = ConstructEngine(aObjectm, aOptionCount, aOptions);
-    if (res == SL_RESULT_SUCCESS) {
-      // Bug 1042051: Store engine options
-      mSLEngine = *aObjectm;
-      mSLEngineUsers++;
-      LOG(("Returning new engine"));
-    } else {
-      LOG(("Error getting engine: %d", res));
-    }
-    return res;
-  }
-}
-
-int OpenSLESProvider::ConstructEngine(SLObjectItf * aObjectm,
-                                      SLuint32 aOptionCount,
-                                      const SLEngineOption *aOptions)
-{
-  mLock.AssertCurrentThreadOwns();
-
-  if (!mOpenSLESLib) {
-    mOpenSLESLib = dlopen("libOpenSLES.so", RTLD_LAZY);
-    if (!mOpenSLESLib) {
-      LOG(("Failed to dlopen OpenSLES library"));
-      return SL_RESULT_MEMORY_FAILURE;
-    }
-  }
-
-  typedef SLresult (*slCreateEngine_t)(SLObjectItf *,
-                                       SLuint32,
-                                       const SLEngineOption *,
-                                       SLuint32,
-                                       const SLInterfaceID *,
-                                       const SLboolean *);
-
-  slCreateEngine_t f_slCreateEngine =
-    (slCreateEngine_t)dlsym(mOpenSLESLib, "slCreateEngine");
-  int result = f_slCreateEngine(aObjectm, aOptionCount, aOptions, 0, NULL, NULL);
-  return result;
-}
-
-/* static */
-void OpenSLESProvider::Destroy(SLObjectItf * aObjectm)
-{
-  OpenSLESProvider& provider = OpenSLESProvider::getInstance();
-  provider.DestroyEngine(aObjectm);
-}
-
-void OpenSLESProvider::DestroyEngine(SLObjectItf * aObjectm)
-{
-  MutexAutoLock lock(mLock);
-  NS_ASSERTION(mOpenSLESLib, "OpenSLES destroy called but library is not open");
-
-  mSLEngineUsers--;
-  LOG(("Freeing engine, %d users left", mSLEngineUsers));
-  if (mSLEngineUsers) {
-    return;
-  }
-
-  (*(*aObjectm))->Destroy(*aObjectm);
-  // This assumes SLObjectItf is a pointer, but given the previous line,
-  // that's a given.
-  *aObjectm = nullptr;
-
-  (void)dlclose(mOpenSLESLib);
-  mOpenSLESLib = nullptr;
-}
-
-} // namespace mozilla
-
-extern "C" {
-int mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                            SLuint32 aOptionCount,
-                            const SLEngineOption *aOptions)
-{
-  return mozilla::OpenSLESProvider::Get(aObjectm, aOptionCount, aOptions);
-}
-
-void mozilla_destroy_sles_engine(SLObjectItf * aObjectm)
-{
-  return mozilla::OpenSLESProvider::Destroy(aObjectm);
-}
-
-}
diff --git a/content/media/systemservices/OpenSLESProvider.h b/content/media/systemservices/OpenSLESProvider.h
deleted file mode 100644
index 43cb93ce731..00000000000
--- a/content/media/systemservices/OpenSLESProvider.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 50; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _OPENSLESPROVIDER_H_
-#define _OPENSLESPROVIDER_H_
-
-#include <SLES/OpenSLES.h>
-#include <mozilla/Types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern MOZ_EXPORT
-int mozilla_get_sles_engine(SLObjectItf * aObjectm,
-                            SLuint32 aOptionCount,
-                            const SLEngineOption *aOptions);
-extern MOZ_EXPORT
-void mozilla_destroy_sles_engine(SLObjectItf * aObjectm);
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#include "mozilla/Mutex.h"
-
-extern PRLogModuleInfo *gOpenSLESProviderLog;
-
-namespace mozilla {
-
-class OpenSLESProvider {
-public:
-    static int Get(SLObjectItf * aObjectm,
-                   SLuint32 aOptionCount,
-                   const SLEngineOption *aOptions);
-    static void Destroy(SLObjectItf * aObjectm);
-private:
-    OpenSLESProvider();
-    ~OpenSLESProvider();
-    OpenSLESProvider(OpenSLESProvider const&); // NO IMPLEMENTATION
-    void operator=(OpenSLESProvider const&);   // NO IMPLEMENTATION
-    static OpenSLESProvider& getInstance();
-    int GetEngine(SLObjectItf * aObjectm,
-                  SLuint32 aOptionCount,
-                  const SLEngineOption *aOptions);
-    int ConstructEngine(SLObjectItf * aObjectm,
-                        SLuint32 aOptionCount,
-                        const SLEngineOption *aOptions);
-    void DestroyEngine(SLObjectItf * aObjectm);
-
-    // Protect all our internal variables
-    mozilla::Mutex mLock;
-    SLObjectItf mSLEngine;
-    int mSLEngineUsers;
-    void *mOpenSLESLib;
-};
-
-} //namespace
-#endif // cplusplus
-
-#endif /* _OPENSLESPROVIDER_H_ */
diff --git a/content/media/systemservices/moz.build b/content/media/systemservices/moz.build
deleted file mode 100644
index 00aec7757c3..00000000000
--- a/content/media/systemservices/moz.build
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
-    EXPORTS += [
-        'OpenSLESProvider.h'
-    ]
-    UNIFIED_SOURCES += [
-        'OpenSLESProvider.cpp',
-    ]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-LIBRARY_NAME = 'gklayout'

From 39bb2899dd601a8402c00a5ad42fb65084b78016 Mon Sep 17 00:00:00 2001
From: Giovanni Sferro <agi.novanta@gmail.com>
Date: Thu, 24 Jul 2014 16:55:00 +0200
Subject: [PATCH 085/128] Bug 1020697 - Implement @autocomplete for <select>.
 r=smaug

---
 .../html/content/src/HTMLSelectElement.cpp    | 23 ++++++++++--
 content/html/content/src/HTMLSelectElement.h  |  7 ++++
 .../test/forms/test_input_autocomplete.html   | 35 ++++++++++---------
 dom/webidl/HTMLSelectElement.webidl           |  2 ++
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/content/html/content/src/HTMLSelectElement.cpp b/content/html/content/src/HTMLSelectElement.cpp
index a10b9bd5ef1..83527a5496f 100644
--- a/content/html/content/src/HTMLSelectElement.cpp
+++ b/content/html/content/src/HTMLSelectElement.cpp
@@ -104,6 +104,7 @@ HTMLSelectElement::HTMLSelectElement(already_AddRefed<mozilla::dom::NodeInfo>& a
                                      FromParser aFromParser)
   : nsGenericHTMLFormElementWithState(aNodeInfo),
     mOptions(new HTMLOptionsCollection(MOZ_THIS_IN_INITIALIZER_LIST())),
+    mAutocompleteAttrState(nsContentUtils::eAutocompleteAttrState_Unknown),
     mIsDoneAddingChildren(!aFromParser),
     mDisabledChanged(false),
     mMutating(false),
@@ -177,6 +178,16 @@ HTMLSelectElement::SetCustomValidity(const nsAString& aError)
   return NS_OK;
 }
 
+void
+HTMLSelectElement::GetAutocomplete(DOMString& aValue)
+{
+  const nsAttrValue* attributeVal = GetParsedAttr(nsGkAtoms::autocomplete);
+
+  mAutocompleteAttrState =
+    nsContentUtils::SerializeAutocompleteAttribute(attributeVal, aValue,
+                                                   mAutocompleteAttrState);
+}
+
 NS_IMETHODIMP
 HTMLSelectElement::GetForm(nsIDOMHTMLFormElement** aForm)
 {
@@ -1333,6 +1344,9 @@ HTMLSelectElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
       UpdateBarredFromConstraintValidation();
     } else if (aName == nsGkAtoms::required) {
       UpdateValueMissingValidityState();
+    } else if (aName == nsGkAtoms::autocomplete) {
+      // Clear the cached @autocomplete attribute state
+      mAutocompleteAttrState = nsContentUtils::eAutocompleteAttrState_Unknown;
     }
 
     UpdateState(aNotify);
@@ -1420,8 +1434,13 @@ HTMLSelectElement::ParseAttribute(int32_t aNamespaceID,
                                   const nsAString& aValue,
                                   nsAttrValue& aResult)
 {
-  if (aAttribute == nsGkAtoms::size && kNameSpaceID_None == aNamespaceID) {
-    return aResult.ParsePositiveIntValue(aValue);
+  if (kNameSpaceID_None == aNamespaceID) {
+    if (aAttribute == nsGkAtoms::size) {
+      return aResult.ParsePositiveIntValue(aValue);
+    } else if (aAttribute == nsGkAtoms::autocomplete) {
+      aResult.ParseAtomArray(aValue);
+      return true;
+    }
   }
   return nsGenericHTMLElement::ParseAttribute(aNamespaceID, aAttribute, aValue,
                                               aResult);
diff --git a/content/html/content/src/HTMLSelectElement.h b/content/html/content/src/HTMLSelectElement.h
index 4c8488a77f5..c13dda5b5b9 100644
--- a/content/html/content/src/HTMLSelectElement.h
+++ b/content/html/content/src/HTMLSelectElement.h
@@ -17,6 +17,7 @@
 #include "nsCOMPtr.h"
 #include "nsError.h"
 #include "mozilla/dom/HTMLFormElement.h"
+#include "nsContentUtils.h"
 
 class nsContentList;
 class nsIDOMHTMLOptionElement;
@@ -158,6 +159,11 @@ public:
   {
     SetHTMLBoolAttr(nsGkAtoms::autofocus, aVal, aRv);
   }
+  void GetAutocomplete(DOMString& aValue);
+  void SetAutocomplete(const nsAString& aValue, ErrorResult& aRv)
+  {
+    SetHTMLAttr(nsGkAtoms::autocomplete, aValue, aRv);
+  }
   bool Disabled() const
   {
     return GetBoolAttr(nsGkAtoms::disabled);
@@ -606,6 +612,7 @@ protected:
 
   /** The options[] array */
   nsRefPtr<HTMLOptionsCollection> mOptions;
+  nsContentUtils::AutocompleteAttrState mAutocompleteAttrState;
   /** false if the parser is in the middle of adding children. */
   bool            mIsDoneAddingChildren;
   /** true if our disabled state has changed from the default **/
diff --git a/content/html/content/test/forms/test_input_autocomplete.html b/content/html/content/test/forms/test_input_autocomplete.html
index 63a2811cfc1..72cf21a2305 100644
--- a/content/html/content/test/forms/test_input_autocomplete.html
+++ b/content/html/content/test/forms/test_input_autocomplete.html
@@ -7,16 +7,6 @@ Test @autocomplete on <input>
   <title>Test for &lt;input autocomplete='…'&gt;</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
-</head>
-
-<body>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <form>
-    <input id="field" />
-  </form>
-</div>
-<pre id="test">
 <script>
 "use strict";
 
@@ -69,9 +59,8 @@ var values = [
 ];
 
 var types = [undefined, "hidden", "text", "search"]; // Valid types for all non-multiline hints.
-var field = document.getElementById("field");
 
-function checkAutocompleteValues(type) {
+function checkAutocompleteValues(field, type) {
   for (var test of values) {
     if (typeof(test[0]) === "undefined")
       field.removeAttribute("autocomplete");
@@ -83,21 +72,35 @@ function checkAutocompleteValues(type) {
 }
 
 function start() {
+  var inputField = document.getElementById("input-field");
   for (var type of types) {
     // Switch the input type
     if (typeof(type) === "undefined")
-      field.removeAttribute("type");
+      inputField.removeAttribute("type");
     else
-      field.type = type;
-    checkAutocompleteValues(type || "");
+      inputField.type = type;
+    checkAutocompleteValues(inputField, type || "");
   }
+
+  var selectField = document.getElementById("select-field");
+  checkAutocompleteValues(selectField, "select");
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPrefEnv({"set": [["dom.forms.autocomplete.experimental", true]]}, start);
-
 </script>
+</head>
+
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <form>
+    <input id="input-field" />
+    <select id="select-field" />
+  </form>
+</div>
+<pre id="test">
 </pre>
 </body>
 </html>
diff --git a/dom/webidl/HTMLSelectElement.webidl b/dom/webidl/HTMLSelectElement.webidl
index 06876160140..d1794cda116 100644
--- a/dom/webidl/HTMLSelectElement.webidl
+++ b/dom/webidl/HTMLSelectElement.webidl
@@ -10,6 +10,8 @@
 interface HTMLSelectElement : HTMLElement {
   [SetterThrows, Pure]
            attribute boolean autofocus;
+  [Pref="dom.forms.autocomplete.experimental", SetterThrows, Pure]
+           attribute DOMString autocomplete;
   [SetterThrows, Pure]
            attribute boolean disabled;
   [Pure]

From 36a1bd87376f241b7880af259cc2b26fa2ad8463 Mon Sep 17 00:00:00 2001
From: Susanna Bowen <sgbowen8@gmail.com>
Date: Fri, 25 Jul 2014 15:53:00 +0200
Subject: [PATCH 086/128] Bug 1043706 - Wrap ruby-specific rules in ua.css in a
 "@supports" clause (to avoid spamming parse errors when ruby is disabled).
 r=dholbert

---
 layout/style/ua.css | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/layout/style/ua.css b/layout/style/ua.css
index b10ce70e459..0c3606752df 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -73,20 +73,22 @@
 }
 
 /* Ruby */
-*|*::-moz-ruby {
-  display: ruby;
-}
-*|*::-moz-ruby-base {
-  display: ruby-base;
-}
-*|*::-moz-ruby-text {
-  display: ruby-text;
-}
-*|*::-moz-ruby-base-container {
-  display: ruby-base-container;
-}
-*|*::-moz-ruby-text-container {
-  display: ruby-text-container;
+@supports(display:ruby) {
+  *|*::-moz-ruby {
+    display: ruby;
+  }
+  *|*::-moz-ruby-base {
+    display: ruby-base;
+  }
+  *|*::-moz-ruby-text {
+    display: ruby-text;
+  }
+  *|*::-moz-ruby-base-container {
+    display: ruby-base-container;
+  }
+  *|*::-moz-ruby-text-container {
+    display: ruby-text-container;
+  }
 }
 
 /* Lists */

From 84f7155ca0067692b6e669e6855e4eafb5fa2699 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 24 Jul 2014 22:47:46 +0300
Subject: [PATCH 087/128] Bug 1039548 - implicit form submission should be
 disabled when there isn't a text or number field. r=bz

---
 content/html/content/src/HTMLFormElement.cpp  |  2 +-
 content/html/content/test/forms/mochitest.ini |  1 +
 .../content/test/forms/test_bug1039548.html   | 55 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 content/html/content/test/forms/test_bug1039548.html

diff --git a/content/html/content/src/HTMLFormElement.cpp b/content/html/content/src/HTMLFormElement.cpp
index 603cdcaa999..a689a4323a4 100644
--- a/content/html/content/src/HTMLFormElement.cpp
+++ b/content/html/content/src/HTMLFormElement.cpp
@@ -1709,7 +1709,7 @@ HTMLFormElement::ImplicitSubmissionIsDisabled() const
       numDisablingControlsFound++;
     }
   }
-  return numDisablingControlsFound > 1;
+  return numDisablingControlsFound != 1;
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/test/forms/mochitest.ini b/content/html/content/test/forms/mochitest.ini
index 37bcd0dd511..f542918e148 100644
--- a/content/html/content/test/forms/mochitest.ini
+++ b/content/html/content/test/forms/mochitest.ini
@@ -4,6 +4,7 @@ support-files =
   submit_invalid_file.sjs
   test_input_number_data.js
 
+[test_bug1039548.html]
 [test_button_attributes_reflection.html]
 [test_input_radio_radiogroup.html]
 [test_change_event.html]
diff --git a/content/html/content/test/forms/test_bug1039548.html b/content/html/content/test/forms/test_bug1039548.html
new file mode 100644
index 00000000000..0405d54829a
--- /dev/null
+++ b/content/html/content/test/forms/test_bug1039548.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1039548
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1039548</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 1039548 **/
+
+  SimpleTest.waitForExplicitFinish();
+
+  SimpleTest.waitForFocus(test);
+
+  var didTryToSubmit;
+  function test() {
+    var r = document.getElementById("radio");
+    r.focus();
+    didTryToSubmit = false;
+    sendKey("return");
+    ok(!didTryToSubmit, "Shouldn't have tried to submit!");
+
+    var t = document.getElementById("text");
+    t.focus();
+    didTryToSubmit = false;
+    sendKey("return");
+    ok(didTryToSubmit, "Should have tried to submit!");
+    SimpleTest.finish();
+  }
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1039548">Mozilla Bug 1039548</a>
+<p id="display"></p>
+<div id="content">
+
+  <form onsubmit="didTryToSubmit = true; event.preventDefault();">
+    <input type="radio" id="radio">
+  </form>
+
+  <form onsubmit="didTryToSubmit = true; event.preventDefault();">
+    <input type="text" id="text">
+  </form>
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>

From b4027b31bef6487fd32db42080cfe704bb28e4d7 Mon Sep 17 00:00:00 2001
From: Vaibhav Agrawal <vaibhavmagarwal@gmail.com>
Date: Wed, 23 Jul 2014 10:23:00 +0200
Subject: [PATCH 088/128] Bug 1038813 - Make the job bisection bleedthrough log
 output parsable by TBPL & Treeherder. r=edmorley

---
 testing/mochitest/bisection.py | 2 +-
 testing/mochitest/runtests.py  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/testing/mochitest/bisection.py b/testing/mochitest/bisection.py
index 0130bc586f2..460d7408034 100644
--- a/testing/mochitest/bisection.py
+++ b/testing/mochitest/bisection.py
@@ -230,7 +230,7 @@ class Bisect(object):
                 numberOfTests = len(self.contents['testsToRun'])
                 if numberOfTests < 3:
                     # This means that only 2 tests are run. Since the last test is the failing test itself therefore the bleedthrough test is the first test
-                    self.summary.append("TEST-BLEEDTHROUGH - found failure, %s" % self.contents['testsToRun'][0])
+                    self.summary.append("TEST-UNEXPECTED-FAIL | %s | Bleedthrough detected, this test is the root cause for many of the above failures" % self.contents['testsToRun'][0])
                     status = -1
             else:
                 self.summary.append("\t\t%s failed with different error." % self.contents['testsToRun'][-1])
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 888b98d6bf0..4de42670bc7 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1564,9 +1564,14 @@ class Mochitest(MochitestUtilsMixin):
     bisect = bisection.Bisect(self)
     finished = False
     status = 0
+    bisection_log = 0
     while not finished:
       if options.bisectChunk:
         testsToRun = bisect.pre_test(options, testsToRun, status)
+        # To inform that we are in the process of bisection, and to look for bleedthrough
+        if options.bisectChunk != "default" and not bisection_log:
+            log.info("TEST-UNEXPECTED-FAIL | Bisection | Please ignore repeats and look for 'Bleedthrough' (if any) at the end of the failure list")
+            bisection_log = 1
 
       result = self.doTests(options, onLaunch, testsToRun)
       if options.bisectChunk:
@@ -1634,7 +1639,7 @@ class Mochitest(MochitestUtilsMixin):
 
     return result
 
-  def doTests(self, options, onLaunch=None, testsToFilter = None):
+  def doTests(self, options, onLaunch=None, testsToFilter=None):
     # A call to initializeLooping method is required in case of --run-by-dir or --bisect-chunk
     # since we need to initialize variables for each loop.
     if options.bisectChunk or options.runByDir:

From b5809ae650515c63b1d18e906d55d6e9b0ebe6ce Mon Sep 17 00:00:00 2001
From: Ahmed Kachkach <ahmed.kachkach@gmail.com>
Date: Thu, 24 Jul 2014 08:49:00 +0200
Subject: [PATCH 089/128] Bug 1043420 - Use actual log level in mochitest logs
 instead of always INFO. r=ted

---
 testing/mochitest/runtests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 4de42670bc7..db71ccc809b 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -70,7 +70,8 @@ class MochitestFormatter(TbplFormatter):
 
     def __call__(self, data):
         tbpl_output = super(MochitestFormatter, self).__call__(data)
-        output = '%d INFO %s' % (MochitestFormatter.log_num, tbpl_output)
+        log_level = data.get('level', 'info').upper()
+        output = '%d %s %s' % (MochitestFormatter.log_num, log_level, tbpl_output)
         MochitestFormatter.log_num += 1
         return output
 

From c796d02676e12fbf3b4c8e7785bc0d740cb3e954 Mon Sep 17 00:00:00 2001
From: Ahmed Kachkach <ahmed.kachkach@gmail.com>
Date: Fri, 25 Jul 2014 11:26:00 +0200
Subject: [PATCH 090/128] Bug 1043485 - Save last Android robocop test name
 when logs are unstructured. r=edmorley

---
 testing/mochitest/runtests.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index db71ccc809b..cd2d1f64c36 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1947,6 +1947,8 @@ class Mochitest(MochitestUtilsMixin):
       """record last test on harness"""
       if message['action'] == 'test_start':
         self.harness.lastTestSeen = message['test']
+      elif message['action'] == 'log' and 'TEST-START' in message['message'] and '|' in message['message']:
+        self.harness.lastTestSeen = message['message'].split("|")[1].strip()
       return message
 
     def dumpScreenOnTimeout(self, message):
@@ -1956,11 +1958,19 @@ class Mochitest(MochitestUtilsMixin):
           and 'message' in message
           and "Test timed out" in message['message']):
         self.harness.dumpScreen(self.utilityPath)
+      elif (not self.dump_screen_on_fail
+            and self.dump_screen_on_timeout
+            and message['action'] == 'log'
+            and 'TEST-UNEXPECTED-FAIL' in message['message']
+            and 'Test timed out' in message['message']):
+        self.harness.dumpScreen(self.utilityPath)
       return message
 
     def dumpScreenOnFail(self, message):
       if self.dump_screen_on_fail and 'expected' in message and message['status'] == 'FAIL':
         self.harness.dumpScreen(self.utilityPath)
+      elif self.dump_screen_on_fail and message['action'] == 'log' and 'TEST-UNEXPECTED-FAIL' in message['message']:
+        self.harness.dumpScreen(self.utilityPath)
       return message
 
     def trackLSANLeaks(self, message):

From 11f00b9a282ad50b01837d921199896f1c3f7fe8 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@mozilla.com>
Date: Fri, 25 Jul 2014 09:03:00 +0200
Subject: [PATCH 091/128] Bug 1044004 - Provide API documentation for
 Marionette.delete_session. r=dhunt

---
 testing/marionette/client/docs/index.rst           |  2 +-
 testing/marionette/client/marionette/marionette.py | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/testing/marionette/client/docs/index.rst b/testing/marionette/client/docs/index.rst
index 23e051e1f59..092070e6b64 100644
--- a/testing/marionette/client/docs/index.rst
+++ b/testing/marionette/client/docs/index.rst
@@ -102,6 +102,7 @@ Marionette Objects
 Session Management
 ``````````````````
 .. automethod:: Marionette.start_session
+.. automethod:: Marionette.delete_session
 .. autoattribute:: Marionette.session_capabilities
 .. automethod:: Marionette.get_cookie
 .. automethod:: Marionette.get_cookies
@@ -202,4 +203,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py
index f1d75289127..e91d301ebcf 100644
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -807,11 +807,7 @@ class Marionette(object):
         :params desired_capabilities: An optional dict of desired
             capabilities.  This is currently ignored.
 
-        :returns: A dict of the capabilities offered.
-
-        """
-
-        # We are ignoring desired_capabilities, at least for now.
+        :returns: A dict of the capabilities offered."""
         self.session = self._send_message('newSession', 'value')
         self.b2g = 'b2g' in self.session
         return self.session
@@ -826,9 +822,7 @@ class Marionette(object):
             self._test_name = test_name
 
     def delete_session(self):
-        """
-        Close the current session and disconnect from the server.
-        """
+        """Close the current session and disconnect from the server."""
         response = self._send_message('deleteSession', 'ok')
         self.session = None
         self.window = None

From a362305425bd0691777d1ef043b02eb216066404 Mon Sep 17 00:00:00 2001
From: Anup Kumar <allamsetty.anup@gmail.com>
Date: Fri, 25 Jul 2014 13:37:00 +0200
Subject: [PATCH 092/128] Bug 854925 - Remove SetCharsetForURI and
 GetCharsetForURI from nsINavHistoryService. r=mak

---
 .../places/nsINavHistoryService.idl           | 21 +-----
 toolkit/components/places/nsNavHistory.cpp    | 65 -------------------
 2 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/toolkit/components/places/nsINavHistoryService.idl b/toolkit/components/places/nsINavHistoryService.idl
index 7e375114b94..e80a9010e6f 100644
--- a/toolkit/components/places/nsINavHistoryService.idl
+++ b/toolkit/components/places/nsINavHistoryService.idl
@@ -1188,7 +1188,7 @@ interface nsINavHistoryQueryOptions : nsISupports
   nsINavHistoryQueryOptions clone();
 };
 
-[scriptable, uuid(baebc597-9daf-4103-a325-e41ef9e7608a)]
+[scriptable, uuid(4b6963bf-763a-4f39-9fec-25670d354dd9)]
 interface nsINavHistoryService : nsISupports
 {
   /**
@@ -1315,25 +1315,6 @@ interface nsINavHistoryService : nsISupports
    */
   void markPageAsFollowedLink(in nsIURI aURI);
 
-  /**
-   * Gets the stored character-set for an URI.
-   *
-   * @param aURI
-   *        URI to retrieve character-set for
-   * @return character-set, empty string if not found
-   */
-  AString getCharsetForURI(in nsIURI aURI);
-
-  /**
-   * Sets the character-set for an URI.
-   *
-   * @param aURI
-   *        URI to set the character-set for
-   * @param aCharset
-   *        character-set to be set
-   */
-  void setCharsetForURI(in nsIURI aURI, in AString aCharset);
-
   /**
    * Returns true if this URI would be added to the history. You don't have to
    * worry about calling this, adding a visit will always check before
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index 32d5f8b728d..9ada7409dcf 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -2854,71 +2854,6 @@ nsNavHistory::MarkPageAsFollowedLink(nsIURI *aURI)
 }
 
 
-// nsNavHistory::SetCharsetForURI
-//
-// Sets the character-set for a URI.
-// If aCharset is empty remove character-set annotation for aURI.
-
-NS_IMETHODIMP
-nsNavHistory::SetCharsetForURI(nsIURI* aURI,
-                               const nsAString& aCharset)
-{
-  PLACES_WARN_DEPRECATED();
-
-  NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
-  NS_ENSURE_ARG(aURI);
-
-  nsAnnotationService* annosvc = nsAnnotationService::GetAnnotationService();
-  NS_ENSURE_TRUE(annosvc, NS_ERROR_OUT_OF_MEMORY);
-
-  if (aCharset.IsEmpty()) {
-    // remove the current page character-set annotation
-    nsresult rv = annosvc->RemovePageAnnotation(aURI, CHARSET_ANNO);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else {
-    // Set page character-set annotation, silently overwrite if already exists
-    nsresult rv = annosvc->SetPageAnnotationString(aURI, CHARSET_ANNO,
-                                                   aCharset, 0,
-                                                   nsAnnotationService::EXPIRE_NEVER);
-    if (rv == NS_ERROR_INVALID_ARG) {
-      // We don't have this page.  Silently fail.
-      return NS_OK;
-    }
-    else if (NS_FAILED(rv))
-      return rv;
-  }
-
-  return NS_OK;
-}
-
-
-// nsNavHistory::GetCharsetForURI
-//
-// Get the last saved character-set for a URI.
-
-NS_IMETHODIMP
-nsNavHistory::GetCharsetForURI(nsIURI* aURI, 
-                               nsAString& aCharset)
-{
-  PLACES_WARN_DEPRECATED();
-
-  NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
-  NS_ENSURE_ARG(aURI);
-
-  nsAnnotationService* annosvc = nsAnnotationService::GetAnnotationService();
-  NS_ENSURE_TRUE(annosvc, NS_ERROR_OUT_OF_MEMORY);
-
-  nsAutoString charset;
-  nsresult rv = annosvc->GetPageAnnotationString(aURI, CHARSET_ANNO, aCharset);
-  if (NS_FAILED(rv)) {
-    // be sure to return an empty string if character-set is not found
-    aCharset.Truncate();
-  }
-  return NS_OK;
-}
-
-
 NS_IMETHODIMP
 nsNavHistory::GetPageTitle(nsIURI* aURI, nsAString& aTitle)
 {

From c2a74c1dc3578fcc5c7dccbbeb45b9b9ffbc384e Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 25 Jul 2014 15:07:44 -0400
Subject: [PATCH 093/128] Bug 974270 - Re-enable the majority of datastore
 tests on b2g; r=khuey

I have no idea what has fixed these tests, but the try server says
they are fixed.  We always suspected that this is caused by a bug
in the mozapps code, and there has been some development there, and
elsewhere.

--HG--
extra : rebase_source : 2122a1016c3505b833d11b49cf63f79f117792e5
---
 dom/datastore/tests/mochitest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/datastore/tests/mochitest.ini b/dom/datastore/tests/mochitest.ini
index b9448f09147..d9418ecb777 100644
--- a/dom/datastore/tests/mochitest.ini
+++ b/dom/datastore/tests/mochitest.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = toolkit=='gonk' || e10s #b2g(bug 974270, frequent failures) b2g-debug(bug 974270, frequent failures)
+skip-if = e10s
 support-files =
   file_app_install.html
   file_readonly.html

From 8523fd8ce8e09fef52aed9702c5e9c26e032d41b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 13:45:24 -0700
Subject: [PATCH 094/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/7dd5b4f4e635
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #22121 from Cwiiis/bug-1041383-swipe-notifications

Bug 1041383 - Allow notifications to be dismissed with a leftward swipe. r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/646b18f0ff57
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1041383 - Allow notifications to be dismissed with a leftward swipe. r=mhenretty
---
 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 8cb2bacce60..80d6e2384c7 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "3762f6bf4b014e34e62162e84c6acf7deebbbcfa", 
+    "revision": "7dd5b4f4e6351f70c4eceb87374fff1d521644b8", 
     "repo_path": "/integration/gaia-central"
 }

From a3196ed9abed66462be07b7374d3500227f4da2f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 13:51:40 -0700
Subject: [PATCH 095/128] 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 445e6e882a2..280b3265da0 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 3faa434827e..d15ac18961b 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b8d2cda6cb1..aa0575c7d4a 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 445e6e882a2..280b3265da0 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5cd2c79f105..a43be7a2e36 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 65924565f08..d0c6ed12e35 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 476fd421519..302e8abfe2e 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 b6f994e0859..5565a57b211 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index e53732d5466..5be1a619fc1 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="dd42afb7d6d66a6c2bd999692fec6b6d553d23de"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 5887478cfa4a52c04021e390aef1eec290b25fe2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 14:15:28 -0700
Subject: [PATCH 096/128] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/77dca2916f12
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1044231 - Xfail test_everything_me_launch_link.py a=testonly r=me
---
 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 80d6e2384c7..0ed635be5b0 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "7dd5b4f4e6351f70c4eceb87374fff1d521644b8", 
+    "revision": "77dca2916f12424370e603c2ec1046c52cc0f037", 
     "repo_path": "/integration/gaia-central"
 }

From eb9c54cd622bf1cec1d2ba241b4869c943625ab8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 14:21:13 -0700
Subject: [PATCH 097/128] 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 280b3265da0..7ce4ce92d57 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 d15ac18961b..23f0e770ce4 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index aa0575c7d4a..821116958f4 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 280b3265da0..7ce4ce92d57 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 a43be7a2e36..bd54e8a6695 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d0c6ed12e35..3ab3a4009a4 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 302e8abfe2e..2e3a04af05a 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5565a57b211..dda61120c0c 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5be1a619fc1..3491f657c2c 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="58242f4d34493a412907663513d935c1ddf19fd5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 969252ce918803472f5a65f5d9e26df5c97245bf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 15:10:23 -0700
Subject: [PATCH 098/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e7358d464390
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #21712 from eeejay/bug-1030340

Bug 1030340 - Make add image button and section accessible. r=sergi

========

https://hg.mozilla.org/integration/gaia-central/rev/65a9df24955e
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1030340 - Make add image button and section accessible.
---
 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 0ed635be5b0..30634d28698 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "77dca2916f12424370e603c2ec1046c52cc0f037", 
+    "revision": "e7358d46439030f882ec06c7fb2073acfba8f545", 
     "repo_path": "/integration/gaia-central"
 }

From 9d0cd86aa2cc24d1d14000dcd73e5db238261ea8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 15:16:52 -0700
Subject: [PATCH 099/128] 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 7ce4ce92d57..6edc4d509c6 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 23f0e770ce4..ad61d28b18b 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 821116958f4..34107f3aa24 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 7ce4ce92d57..6edc4d509c6 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 bd54e8a6695..7789b8046bf 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 3ab3a4009a4..b34629e68f6 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 2e3a04af05a..79ed3841374 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 dda61120c0c..5cba15c44fd 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 3491f657c2c..9d2841e4aa7 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="e95ac19a89b858528031a90d688bf39ff7dcf0a3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 806cd6e2836db2a9fc3728607e2c814c79011156 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 16:33:59 -0700
Subject: [PATCH 100/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/108aa83333d8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #22184 from dmarcos/bug1036259master

Bug 1036259 - [dolphin] unable to take video after removing and insert S...

========

https://hg.mozilla.org/integration/gaia-central/rev/3bff4cdf7fff
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 1036259 - [dolphin] unable to take video after removing and insert SD card again
---
 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 30634d28698..74ded476187 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "e7358d46439030f882ec06c7fb2073acfba8f545", 
+    "revision": "108aa83333d832154990ca7ac6da0bff33300442", 
     "repo_path": "/integration/gaia-central"
 }

From 4bd6c35e3f49cedd22e36f0ed822473f42443cc8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 16:34:10 -0700
Subject: [PATCH 101/128] 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 6edc4d509c6..74fe6448c9a 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 ad61d28b18b..f6886670d19 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 34107f3aa24..64c5ae4c035 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6edc4d509c6..74fe6448c9a 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 7789b8046bf..8a318ea1abc 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b34629e68f6..7c704043e8e 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 79ed3841374..59de6533796 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5cba15c44fd..807aa5aa49d 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 9d2841e4aa7..d75ddd56c6e 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="fb4ee85188cc9926b82fba11aaabc7452ebbad1d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 9b93fa1a3d8233cf8b6ed247b7e118df952088c2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 18:05:23 -0700
Subject: [PATCH 102/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e9042d372811
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22182 from daleharvey/1044227

Bug 1044227 - Check for icons key in places object. r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/fdffd135ad24
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1044227 - Check for icons key in places object. r=mhenretty
---
 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 74ded476187..83a76ee8fb1 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "108aa83333d832154990ca7ac6da0bff33300442", 
+    "revision": "e9042d3728117e95c11523ce156160d4582ee4b7", 
     "repo_path": "/integration/gaia-central"
 }

From db3108478044ea7f958f3efd8356f37485ccde9d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 18:06:43 -0700
Subject: [PATCH 103/128] 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 74fe6448c9a..e2a12074a51 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 f6886670d19..3776a1df913 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 64c5ae4c035..0ba1066fd4a 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 74fe6448c9a..e2a12074a51 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 8a318ea1abc..d7ae067db05 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 7c704043e8e..9a4f3feb784 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 59de6533796..52c6c8c21cd 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 807aa5aa49d..8451cd16fa8 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d75ddd56c6e..f03dc47507b 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="5b9936f9c1531dbfedbef8fda4eb5d968f98270c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 49c13268e7475edf0dd39386163c9e778e1647a0 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 21:00:24 -0700
Subject: [PATCH 104/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/310f72876978
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #22185 from dmarcos/bug1039629

Bug 1039629 - [B2G] [Camera] Placeholder warning text is shown when Came...

========

https://hg.mozilla.org/integration/gaia-central/rev/d0ce4589cd57
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 1039629 - [B2G] [Camera] Placeholder warning text is shown when Camera is launched with low battery
---
 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 83a76ee8fb1..696154be25f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "e9042d3728117e95c11523ce156160d4582ee4b7", 
+    "revision": "310f728769787566d9de91fda6d3d74f831f959d", 
     "repo_path": "/integration/gaia-central"
 }

From 070fe8803a9ca0ece0fe2a9e734cb40de35083ea Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 25 Jul 2014 21:06:38 -0700
Subject: [PATCH 105/128] 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 e2a12074a51..0589f9800db 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 3776a1df913..c3594325737 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 0ba1066fd4a..8332cedbaa2 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index e2a12074a51..0589f9800db 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 d7ae067db05..7a9cf686cd3 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 9a4f3feb784..7321542f4bb 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 52c6c8c21cd..aef57ee2d08 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 8451cd16fa8..76e60d81403 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f03dc47507b..da291e1a741 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="55f572eb4db14d9d1cc026f7f218c595535d0752"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 9685bb86f27844b6c48d8e90594b6df052c3bb8f Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Sat, 26 Jul 2014 03:16:43 -0700
Subject: [PATCH 106/128] No bug, Automated HSTS preload list update from host
 b-linux64-ix-0010 - a=hsts-update

---
 security/manager/boot/src/nsSTSPreloadList.errors | 7 +++----
 security/manager/boot/src/nsSTSPreloadList.inc    | 8 ++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors
index a5c8e685662..ffbc6b55267 100644
--- a/security/manager/boot/src/nsSTSPreloadList.errors
+++ b/security/manager/boot/src/nsSTSPreloadList.errors
@@ -12,7 +12,6 @@ bassh.net: did not receive HSTS header
 bccx.com: could not connect to host
 betnet.fr: could not connect to host
 bigshinylock.minazo.net: could not connect to host
-blacklane.com: did not receive HSTS header
 braintreegateway.com: did not receive HSTS header
 braintreepayments.com: did not receive HSTS header
 browserid.org: did not receive HSTS header
@@ -61,7 +60,7 @@ history.google.com: did not receive HSTS header (error ignored - included regard
 hostedtalkgadget.google.com: did not receive HSTS header (error ignored - included regardless)
 in.xero.com: max-age too low: 3600
 intercom.io: did not receive HSTS header
-iop.intuit.com: max-age too low: 86400
+iop.intuit.com: did not receive HSTS header
 irccloud.com: did not receive HSTS header
 jitsi.org: did not receive HSTS header
 jottit.com: could not connect to host
@@ -125,7 +124,7 @@ wallet.google.com: did not receive HSTS header (error ignored - included regardl
 webmail.mayfirst.org: did not receive HSTS header
 whonix.org: did not receive HSTS header
 www.calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124"  data: no]
-www.cueup.com: did not receive HSTS header
+www.cueup.com: could not connect to host
 www.developer.mydigipass.com: could not connect to host
 www.dropbox.com: max-age too low: 2592000
 www.elanex.biz: did not receive HSTS header
@@ -139,7 +138,7 @@ www.ledgerscope.net: did not receive HSTS header
 www.logentries.com: did not receive HSTS header
 www.moneybookers.com: did not receive HSTS header
 www.neonisi.com: could not connect to host
-www.paycheckrecords.com: max-age too low: 86400
+www.paycheckrecords.com: did not receive HSTS header
 www.paypal.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124"  data: no]
 www.roddis.net: did not receive HSTS header
 www.sandbox.mydigipass.com: could not connect to host
diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc
index 63313666234..1143e4e6b18 100644
--- a/security/manager/boot/src/nsSTSPreloadList.inc
+++ b/security/manager/boot/src/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1416651005379000);
+const PRTime gPreloadListExpirationTime = INT64_C(1417255584916000);
 
 class nsSTSPreload
 {
@@ -40,6 +40,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { "bccx.com", true },
   { "bcrook.com", false },
   { "bitbucket.org", false },
+  { "blacklane.com", true },
   { "blog.cyveillance.com", true },
   { "blog.linode.com", false },
   { "blog.lookout.com", false },
@@ -112,13 +113,14 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { "grc.com", false },
   { "grepular.com", true },
   { "groups.google.com", true },
+  { "hackerone.com", true },
   { "harvestapp.com", true },
   { "haste.ch", true },
   { "heha.co", true },
   { "history.google.com", true },
   { "hostedtalkgadget.google.com", true },
   { "howrandom.org", true },
-  { "id.atlassian.com", true },
+  { "id.atlassian.com", false },
   { "id.mayfirst.org", false },
   { "imouto.my", false },
   { "inertianetworks.com", true },
@@ -197,6 +199,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { "pypi.python.org", true },
   { "python.org", false },
   { "reviews.anime.my", true },
+  { "rme.li", false },
   { "roddis.net", false },
   { "romab.com", true },
   { "roundcube.mayfirst.org", false },
@@ -285,6 +288,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { "www.noisebridge.net", false },
   { "www.opsmate.com", true },
   { "www.python.org", true },
+  { "www.rme.li", false },
   { "www.simbolo.co.uk", false },
   { "www.simple.com", false },
   { "www.therapynotes.com", false },

From b908246ee0802f4d1d1f1aec20f64422699cc97d Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Sat, 26 Jul 2014 03:16:45 -0700
Subject: [PATCH 107/128] No bug, Automated HPKP preload list update from host
 b-linux64-ix-0010 - a=hpkp-update

---
 security/manager/boot/src/StaticHPKPins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/manager/boot/src/StaticHPKPins.h b/security/manager/boot/src/StaticHPKPins.h
index bd012cc782b..b9be6d531d6 100644
--- a/security/manager/boot/src/StaticHPKPins.h
+++ b/security/manager/boot/src/StaticHPKPins.h
@@ -1067,4 +1067,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1414526265402000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1414836387591000);

From 9c2fa6722a587a186e9d4bca6b987795742cd72a Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Sat, 26 Jul 2014 03:16:48 -0700
Subject: [PATCH 108/128] No bug, Automated blocklist update from host
 b-linux64-ix-0010 - a=blocklist-update

---
 browser/app/blocklist.xml | 42 ++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index ea097e3aa1b..5308769bde6 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1405723700000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1406149943000">
   <emItems>
       <emItem  blockID="i454" id="sqlmoz@facebook.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
@@ -38,6 +38,12 @@
                     </versionRange>
                                                     <prefs>
               </prefs>
+    </emItem>
+      <emItem  blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}">
+                        <versionRange  minVersion="178.7.0" maxVersion="178.7.0" severity="3">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
     </emItem>
       <emItem  blockID="i107" os="WINNT" id="{ABDE892B-13A8-4d1b-88E6-365A6E755758}">
                         <versionRange  minVersion="0" maxVersion="15.0.5" severity="1">
@@ -123,8 +129,8 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i660" id="youplayer@addons.mozilla.org">
-                        <versionRange  minVersion="79.9.8" maxVersion="208.0.1" severity="3">
+      <emItem  blockID="i674" id="crossriderapp12555@crossrider.com">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                                                     <prefs>
               </prefs>
@@ -457,6 +463,12 @@
                     </versionRange>
                                                     <prefs>
               </prefs>
+    </emItem>
+      <emItem  blockID="i672" id="/^(saamazon@mybrowserbar\.com)|(saebay@mybrowserbar\.com)$/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
     </emItem>
       <emItem  blockID="i543" id="{badea1ae-72ed-4f6a-8c37-4db9a4ac7bc9}">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
@@ -739,8 +751,8 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}">
-                        <versionRange  minVersion="40.10.1" maxVersion="44.10.1" severity="3">
+      <emItem  blockID="i660" id="youplayer@addons.mozilla.org">
+                        <versionRange  minVersion="79.9.8" maxVersion="208.0.1" severity="3">
                     </versionRange>
                                                     <prefs>
               </prefs>
@@ -757,8 +769,8 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}">
-                        <versionRange  minVersion="178.7.0" maxVersion="178.7.0" severity="3">
+      <emItem  blockID="i678" id="{C4A4F5A0-4B89-4392-AFAC-D58010E349AF}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                                                     <prefs>
               </prefs>
@@ -1245,8 +1257,8 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/">
-                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+      <emItem  blockID="i676" id="SpecialSavings@SpecialSavings.com">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                                                     <prefs>
               </prefs>
@@ -1426,6 +1438,12 @@
                     </versionRange>
                                                     <prefs>
               </prefs>
+    </emItem>
+      <emItem  blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}">
+                        <versionRange  minVersion="40.10.1" maxVersion="44.10.1" severity="3">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
     </emItem>
       <emItem  blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
@@ -1844,6 +1862,12 @@
                     </versionRange>
                                                     <prefs>
               </prefs>
+    </emItem>
+      <emItem  blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
     </emItem>
       <emItem  blockID="i455" id="7d51fb17-b199-4d8f-894e-decaff4fc36a@a298838b-7f50-4c7c-9277-df6abbd42a0c.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">

From a1b0213eb902827e557dd9f0302797fda25ec262 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 06:00:24 -0700
Subject: [PATCH 109/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c9a05c8f8071
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #22176 from julienw/1011274-increase-timeout

Bug 1011274 - increase mocha timeout when loading blobs r=azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/79a6f1d6f46a
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1011274 - increase mocha timeout when loading blobs r=azasypkin
---
 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 696154be25f..6391ccfc8ce 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "310f728769787566d9de91fda6d3d74f831f959d", 
+    "revision": "c9a05c8f807152ff930b5c872f040fea6a159809", 
     "repo_path": "/integration/gaia-central"
 }

From 04566e4e0866c09aa1d38dc72beaf4a50007f28f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 06:06:39 -0700
Subject: [PATCH 110/128] 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 0589f9800db..0e3b58c1d53 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 c3594325737..680c0af6c21 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 8332cedbaa2..6a098e9fa78 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 0589f9800db..0e3b58c1d53 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 7a9cf686cd3..48d7106a97a 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 7321542f4bb..eb9c0efe601 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 aef57ee2d08..cabdec78fda 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 76e60d81403..274606febc1 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index da291e1a741..9e110eb6a52 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="f708ba15ad903d487f0b0feea2a36aeb899ff6ad"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From cab13431c9275ff0db968b1b8ba22a40780f542d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 10:35:24 -0700
Subject: [PATCH 111/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8008bdf9a104
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21189 from KevinGrandon/bug_1032261_wc_gaia_menu_properties

Bug 1032261 - [GaiaMenu] Use locale strings inside of component folder

========

https://hg.mozilla.org/integration/gaia-central/rev/870625ed2479
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1032261 - [GaiaMenu] Use locale strings inside of component folder. r=gandalf r=yurenju
---
 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 6391ccfc8ce..6738a2b0f02 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "c9a05c8f807152ff930b5c872f040fea6a159809", 
+    "revision": "8008bdf9a104f7f9ddd6d173729d2a97366be82a", 
     "repo_path": "/integration/gaia-central"
 }

From b119ecb96551ff4e7867275259f57aac1946dee5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 10:36:42 -0700
Subject: [PATCH 112/128] 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 0e3b58c1d53..bbf1d848ab0 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 680c0af6c21..861a60c5fa1 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6a098e9fa78..c46d8d3d10e 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 0e3b58c1d53..bbf1d848ab0 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 48d7106a97a..b8875cc21ba 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index eb9c0efe601..bae93510d90 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 cabdec78fda..5de4512b9cd 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 274606febc1..a2bdafd719a 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 9e110eb6a52..5921a32d400 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="c584f1136f17c63f9bc341d9c12be3dee7c2c933"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 2c13439c55c09b9cd806ac15a437ea47828ce50a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 11:20:24 -0700
Subject: [PATCH 113/128] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/593d1d8fb040
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1044231 - Xfail test_everything_me_launch_link.py a=testonly r=me"

This reverts commit e95ac19a89b858528031a90d688bf39ff7dcf0a3.
---
 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 6738a2b0f02..77df63cdfae 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "8008bdf9a104f7f9ddd6d173729d2a97366be82a", 
+    "revision": "593d1d8fb0403288bad6fa0f46041ad6e42bb93d", 
     "repo_path": "/integration/gaia-central"
 }

From c09bcbf3343dc60f4487b2b9c66128057806d385 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sat, 26 Jul 2014 11:26:39 -0700
Subject: [PATCH 114/128] 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 bbf1d848ab0..36ad7efe55a 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 861a60c5fa1..de8440167d5 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index c46d8d3d10e..922f2fcc5de 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index bbf1d848ab0..36ad7efe55a 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 b8875cc21ba..3886662ac80 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index bae93510d90..2665a86f640 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5de4512b9cd..3669e40bcc9 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 a2bdafd719a..ce02e61dabe 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5921a32d400..5460ae617dc 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="47c39cf470ce1a6cc7ace4de4a3e5465ae9e1511"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 8d37c3dba57cbeb84062edae2a54c41b225caedc Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 07:40:26 -0700
Subject: [PATCH 115/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/aa56abbdbc46
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #22200 from vingtetun/revert.revert.browser-container

Revert "Revert "Bug 1042744 - Add a container around app iframes and som...

========

https://hg.mozilla.org/integration/gaia-central/rev/240ee7e4cf30
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Revert "Revert "Bug 1042744 - Add a container around app iframes and some chrome UI. r=alive" under suspicion of breaking JB emulator builds"

This reverts commit ebb824c7e4c1be271d68c773ac75ae0cfb79238d.
---
 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 77df63cdfae..6ee272908fa 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "593d1d8fb0403288bad6fa0f46041ad6e42bb93d", 
+    "revision": "aa56abbdbc468493bbe2e11543e789cd499e65c5", 
     "repo_path": "/integration/gaia-central"
 }

From eb6f24044f76d2cdaa4d6a69227fda95e0257fb3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 07:41:45 -0700
Subject: [PATCH 116/128] 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 36ad7efe55a..396b81690ce 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 de8440167d5..de9df37cdb0 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 922f2fcc5de..e0d2211c47b 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 36ad7efe55a..396b81690ce 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 3886662ac80..5065ae77170 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 2665a86f640..004b2a2a69e 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 3669e40bcc9..f094469811a 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 ce02e61dabe..ce6a6929c68 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5460ae617dc..646885fb85d 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="f0c7c212dd1ab128b8d2583e7629112634c26243"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 2d34256e7d7a2fc08c31b0e9b589902af15198eb Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 09:05:25 -0700
Subject: [PATCH 117/128] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/710e14a7a9f5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1043870 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/homescreen_navigation_test.js | Homescreen navigation > Going to the homescreen and back to a warm 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 6ee272908fa..34a5a23aded 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "aa56abbdbc468493bbe2e11543e789cd499e65c5", 
+    "revision": "710e14a7a9f54b5e868a703b0777d96a2aee6bf8", 
     "repo_path": "/integration/gaia-central"
 }

From f240b50fbea9974c3f6dbcfe8b23b785e8358652 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 09:11:42 -0700
Subject: [PATCH 118/128] 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 396b81690ce..3bce65135d8 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 de9df37cdb0..bed3c92299b 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e0d2211c47b..2600c1d2b5c 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 396b81690ce..3bce65135d8 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5065ae77170..f2886edfdab 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 004b2a2a69e..18481c9989d 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 f094469811a..9957a78bc50 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 ce6a6929c68..7f2e2eb40da 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 646885fb85d..dbb8f19bbee 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="33593d1e953de9626ae1ddd9f0e05556d28c023b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ef82543a75e116c160fae9f5b19156fc5b4353c6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 09:35:25 -0700
Subject: [PATCH 119/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5e4087a76c67
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21652 from KevinGrandon/bug_1037864_gaia_grid_localization

Bug 1037864 - [GaiaGrid] Serve localization from within the gaia grid component

========

https://hg.mozilla.org/integration/gaia-central/rev/e3b41ce293d9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1037864 - [GaiaGrid] Serve localization from within the gaia grid component r=crdlc
---
 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 34a5a23aded..4e76b1e8718 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "710e14a7a9f54b5e868a703b0777d96a2aee6bf8", 
+    "revision": "5e4087a76c67bc43bc642070d547e8af86d6ac32", 
     "repo_path": "/integration/gaia-central"
 }

From faf07f412105e4ba7e63c845993618b4b9f10823 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 09:41:41 -0700
Subject: [PATCH 120/128] 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 3bce65135d8..ecc4f537ad2 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 bed3c92299b..f2597ef5584 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2600c1d2b5c..7ab3bba18ab 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3bce65135d8..ecc4f537ad2 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 f2886edfdab..9887487314f 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 18481c9989d..8ef7f5db5c7 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 9957a78bc50..5eaedc2ffbc 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 7f2e2eb40da..12bdf8951bb 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index dbb8f19bbee..5e357d99959 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="fa47621eca7b41c25f1f315440707f7270df9812"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 29614efe82b03883420dcae0a94521de34d58050 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 10:45:31 -0700
Subject: [PATCH 121/128] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b0a42937723c
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1044492 - Discard suggestions notice unconditionally. 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 4e76b1e8718..99c682a2764 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "5e4087a76c67bc43bc642070d547e8af86d6ac32", 
+    "revision": "b0a42937723c86087b12faf977d002f73ab33871", 
     "repo_path": "/integration/gaia-central"
 }

From 9248adf8e5e1054a243adbff563ce42dc27c9ecf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 10:51:19 -0700
Subject: [PATCH 122/128] 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 ecc4f537ad2..c016970322d 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 f2597ef5584..62c4dad12cb 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7ab3bba18ab..f29a93beb1f 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ecc4f537ad2..c016970322d 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 9887487314f..25080799449 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 8ef7f5db5c7..0fc209dd118 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 5eaedc2ffbc..a4f168dbbe5 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 12bdf8951bb..1210862ac9b 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5e357d99959..7c3d533d603 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="c64391365de44f9e531af24c900cfea09f0b8eaa"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 63338acd94fb0cc2a9efe0cc3cb66b516bff155d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 16:25:24 -0700
Subject: [PATCH 123/128] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/377478a69651
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Revert "Revert "Bug 1042744 - Add a container around app iframes and some chrome UI. r=alive" under suspicion of breaking JB emulator builds""

This reverts commit a6d415335e8e73bf8bca00cd8591fd59164f915a.
---
 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 99c682a2764..d1f707bde87 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b0a42937723c86087b12faf977d002f73ab33871", 
+    "revision": "377478a696510e930fad2e6e4cc3836cb47691e8", 
     "repo_path": "/integration/gaia-central"
 }

From 5e45b5da0783e1fd6294378e70df2e007afce085 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 16:26:45 -0700
Subject: [PATCH 124/128] 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 c016970322d..f5107e26a69 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 62c4dad12cb..ec6b5732590 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f29a93beb1f..5dbaaadd5c8 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index c016970322d..f5107e26a69 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 25080799449..d1f318a5188 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 0fc209dd118..d026b87636d 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 a4f168dbbe5..ff60ac435af 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 1210862ac9b..c186d51d2d7 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 7c3d533d603..5c7225c2742 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="b85367fb2124e0c7223918cc3b1c7ac16009ec7f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 5ea98e5b17320c6751e3e4d6d28db973203de717 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 20:30:25 -0700
Subject: [PATCH 125/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9558a7e07078
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #22082 from aajain/bug_1042357

Bug 1042357 - Code to removeEventListener for radiostatechange in radio.js is not working r=arthur.chen

========

https://hg.mozilla.org/integration/gaia-central/rev/aaaa2eb77e49
Author: Anshul Jain <anshulj@codeaurora.org>
Desc: Bug 1042357 - Code to removeEventListener for radiostatechange in
radio.js is not working r=arthur.chen
---
 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 d1f707bde87..c4c021b58af 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "377478a696510e930fad2e6e4cc3836cb47691e8", 
+    "revision": "9558a7e0707896b812ef145d4158e04872a0dc44", 
     "repo_path": "/integration/gaia-central"
 }

From e7cdfeb9095f19cde90e434d23504e5352d953ed Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 20:36:39 -0700
Subject: [PATCH 126/128] 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 f5107e26a69..6f746e9de9d 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 ec6b5732590..f4f8c8ee31f 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5dbaaadd5c8..2f3d5f43e61 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f5107e26a69..6f746e9de9d 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 d1f318a5188..26a71743907 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d026b87636d..87aa81ddd99 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 ff60ac435af..96cf68c630e 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 c186d51d2d7..568d34ac975 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5c7225c2742..30fbbbecc9e 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="a5f93c8ba175ae83fac6b7740a8414459fbd7a5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 628d8466e79899194dd0033473c5db03ba93aa92 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 22:40:25 -0700
Subject: [PATCH 127/128] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/97a95feb1d15
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #22155 from snowmantw/issue1043821

Bug 1043821 - [LockScreen] Move passcode verification to other System co...

========

https://hg.mozilla.org/integration/gaia-central/rev/4fe05e9c30dd
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1043821 - [LockScreen] Move passcode verification to other System components
---
 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 c4c021b58af..740dc62489d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "9558a7e0707896b812ef145d4158e04872a0dc44", 
+    "revision": "97a95feb1d1505c9d179266fee891e600ad8760b", 
     "repo_path": "/integration/gaia-central"
 }

From 6a7a0b98c8152918a794c24c80713ab58240b585 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Sun, 27 Jul 2014 22:46:44 -0700
Subject: [PATCH 128/128] 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 6f746e9de9d..3f0637e03d0 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 f4f8c8ee31f..d9405d1c8f8 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2f3d5f43e61..6c6a2d018e6 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="999e945b85c578c503ad445c2285940f16aacdae">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6f746e9de9d..3f0637e03d0 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 26a71743907..9382e2adf06 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 87aa81ddd99..077ed79a015 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 96cf68c630e..626c507870e 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <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 568d34ac975..5b77eacd749 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="11f01789444d4ebe97581c31d8756d773e18356f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 30fbbbecc9e..10d3d5c2b3b 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="8dd303f770121ad2eef084335b580a273a18ecde"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="295967a0b824a355ae9d57fb08f3632ed2ad18dd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7f792d756385bb894fba7645da59c67fe2c804bf"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>