From 3c51e3c572c994efbbf11d7150cf6865853f9226 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Mon, 20 Apr 2015 11:14:57 -0700
Subject: [PATCH 01/80] Bug 1151974 P1 Delay Cache Context start until previous
 Context has completed. r=ehsan

---
 dom/cache/Context.cpp | 68 ++++++++++++++++++++++++++++++++++++-------
 dom/cache/Context.h   |  8 ++++-
 dom/cache/Manager.cpp | 48 ++++++++++++++++++------------
 dom/cache/Manager.h   | 13 +++++++--
 4 files changed, 103 insertions(+), 34 deletions(-)

diff --git a/dom/cache/Context.cpp b/dom/cache/Context.cpp
index 9b4d30061ca..2b5c92959ad 100644
--- a/dom/cache/Context.cpp
+++ b/dom/cache/Context.cpp
@@ -701,18 +701,19 @@ Context::ThreadsafeHandle::ContextDestroyed(Context* aContext)
 
 // static
 already_AddRefed<Context>
-Context::Create(Manager* aManager, Action* aQuotaIOThreadAction)
+Context::Create(Manager* aManager, Action* aQuotaIOThreadAction,
+                Context* aOldContext)
 {
   nsRefPtr<Context> context = new Context(aManager);
 
+  // Do this here to avoid doing an AddRef() in the constructor
   context->mInitRunnable = new QuotaInitRunnable(context, aManager,
                                                  aQuotaIOThreadAction);
-  nsresult rv = context->mInitRunnable->Dispatch();
-  if (NS_FAILED(rv)) {
-    // Shutdown must be delayed until all Contexts are destroyed.  Shutdown
-    // must also prevent any new Contexts from being constructed.  Crash
-    // for this invariant violation.
-    MOZ_CRASH("Failed to dispatch QuotaInitRunnable.");
+
+  if (aOldContext) {
+    aOldContext->SetNextContext(context);
+  } else {
+    context->Start();
   }
 
   return context.forget();
@@ -720,7 +721,7 @@ Context::Create(Manager* aManager, Action* aQuotaIOThreadAction)
 
 Context::Context(Manager* aManager)
   : mManager(aManager)
-  , mState(STATE_CONTEXT_INIT)
+  , mState(STATE_CONTEXT_PREINIT)
 {
   MOZ_ASSERT(mManager);
 }
@@ -735,7 +736,8 @@ Context::Dispatch(nsIEventTarget* aTarget, Action* aAction)
   MOZ_ASSERT(mState != STATE_CONTEXT_CANCELED);
   if (mState == STATE_CONTEXT_CANCELED) {
     return;
-  } else if (mState == STATE_CONTEXT_INIT) {
+  } else if (mState == STATE_CONTEXT_INIT ||
+             mState == STATE_CONTEXT_PREINIT) {
     PendingAction* pending = mPendingActions.AppendElement();
     pending->mTarget = aTarget;
     pending->mAction = aAction;
@@ -751,8 +753,15 @@ Context::CancelAll()
 {
   NS_ASSERT_OWNINGTHREAD(Context);
 
-  if (mInitRunnable) {
-    MOZ_ASSERT(mState == STATE_CONTEXT_INIT);
+  // In PREINIT state we have not dispatch the init runnable yet.  Just
+  // forget it.
+  if (mState == STATE_CONTEXT_PREINIT) {
+    mInitRunnable = nullptr;
+
+  // In INIT state we have dispatched the runnable, but not received the
+  // async completion yet.  Cancel the runnable, but don't forget about it
+  // until we get OnQuotaInit() callback.
+  } else if (mState == STATE_CONTEXT_INIT) {
     mInitRunnable->Cancel();
   }
 
@@ -823,6 +832,34 @@ Context::~Context()
   }
 
   mManager->RemoveContext(this);
+
+  if (mNextContext) {
+    mNextContext->Start();
+  }
+}
+
+void
+Context::Start()
+{
+  NS_ASSERT_OWNINGTHREAD(Context);
+
+  // Previous context closing delayed our start, but then we were canceled.
+  // In this case, just do nothing here.
+  if (mState == STATE_CONTEXT_CANCELED) {
+    MOZ_ASSERT(!mInitRunnable);
+    return;
+  }
+
+  MOZ_ASSERT(mState == STATE_CONTEXT_PREINIT);
+  mState = STATE_CONTEXT_INIT;
+
+  nsresult rv = mInitRunnable->Dispatch();
+  if (NS_FAILED(rv)) {
+    // Shutdown must be delayed until all Contexts are destroyed.  Shutdown
+    // must also prevent any new Contexts from being constructed.  Crash
+    // for this invariant violation.
+    MOZ_CRASH("Failed to dispatch QuotaInitRunnable.");
+  }
 }
 
 void
@@ -905,6 +942,15 @@ Context::CreateThreadsafeHandle()
   return ref.forget();
 }
 
+void
+Context::SetNextContext(Context* aNextContext)
+{
+  NS_ASSERT_OWNINGTHREAD(Context);
+  MOZ_ASSERT(aNextContext);
+  MOZ_ASSERT(!mNextContext);
+  mNextContext = aNextContext;
+}
+
 } // namespace cache
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/cache/Context.h b/dom/cache/Context.h
index f2abf02e953..b626468514d 100644
--- a/dom/cache/Context.h
+++ b/dom/cache/Context.h
@@ -111,7 +111,7 @@ public:
   // will run on the QuotaManager IO thread.  Note, this Action must
   // be execute synchronously.
   static already_AddRefed<Context>
-  Create(Manager* aManager, Action* aQuotaIOThreadAction);
+  Create(Manager* aManager, Action* aQuotaIOThreadAction, Context* aOldContext);
 
   // Execute given action on the target once the quota manager has been
   // initialized.
@@ -157,6 +157,7 @@ private:
 
   enum State
   {
+    STATE_CONTEXT_PREINIT,
     STATE_CONTEXT_INIT,
     STATE_CONTEXT_READY,
     STATE_CONTEXT_CANCELED
@@ -170,6 +171,7 @@ private:
 
   explicit Context(Manager* aManager);
   ~Context();
+  void Start();
   void DispatchAction(nsIEventTarget* aTarget, Action* aAction);
   void OnQuotaInit(nsresult aRv, const QuotaInfo& aQuotaInfo,
                    nsMainThreadPtrHandle<OfflineStorage>& aOfflineStorage);
@@ -177,6 +179,9 @@ private:
   already_AddRefed<ThreadsafeHandle>
   CreateThreadsafeHandle();
 
+  void
+  SetNextContext(Context* aNextContext);
+
   nsRefPtr<Manager> mManager;
   State mState;
   QuotaInfo mQuotaInfo;
@@ -194,6 +199,7 @@ private:
   nsRefPtr<ThreadsafeHandle> mThreadsafeHandle;
 
   nsMainThreadPtrHandle<OfflineStorage> mOfflineStorage;
+  nsRefPtr<Context> mNextContext;
 
 public:
   NS_INLINE_DECL_REFCOUNTING(cache::Context)
diff --git a/dom/cache/Manager.cpp b/dom/cache/Manager.cpp
index 4ddde199735..ff779a2f355 100644
--- a/dom/cache/Manager.cpp
+++ b/dom/cache/Manager.cpp
@@ -157,7 +157,12 @@ public:
       if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
       ref = new Manager(aManagerId, ioThread);
-      ref->Init();
+
+      // There may be an old manager for this origin in the process of
+      // cleaning up.  We need to tell the new manager about this so
+      // that it won't actually start until the old manager is done.
+      nsRefPtr<Manager> oldManager = Get(aManagerId, Closing);
+      ref->Init(oldManager);
 
       MOZ_ASSERT(!sFactory->mManagerList.Contains(ref));
       sFactory->mManagerList.AppendElement(ref);
@@ -169,20 +174,20 @@ public:
   }
 
   static already_AddRefed<Manager>
-  Get(ManagerId* aManagerId)
+  Get(ManagerId* aManagerId, State aState = Open)
   {
     mozilla::ipc::AssertIsOnBackgroundThread();
 
     nsresult rv = MaybeCreateInstance();
     if (NS_WARN_IF(NS_FAILED(rv))) { return nullptr; }
 
-    ManagerList::ForwardIterator iter(sFactory->mManagerList);
+    // Iterate in reverse to find the most recent, matching Manager.  This
+    // is important when looking for a Closing Manager.  If a new Manager
+    // chains to an old Manager we want it to be the most recent one.
+    ManagerList::BackwardIterator iter(sFactory->mManagerList);
     while (iter.HasMore()) {
       nsRefPtr<Manager> manager = iter.GetNext();
-      // If there is an invalid Manager finishing up and a new Manager
-      // is created for the same origin, then the new Manager will
-      // be blocked until QuotaManager finishes clearing the origin.
-      if (!manager->IsClosing() && *manager->mManagerId == *aManagerId) {
+      if (aState == manager->GetState() && *manager->mManagerId == *aManagerId) {
         return manager.forget();
       }
     }
@@ -1450,7 +1455,7 @@ Manager::RemoveContext(Context* aContext)
   // Whether the Context destruction was triggered from the Manager going
   // idle or the underlying storage being invalidated, we should know we
   // are closing before the Conext is destroyed.
-  MOZ_ASSERT(mClosing);
+  MOZ_ASSERT(mState == Closing);
 
   mContext = nullptr;
 
@@ -1465,14 +1470,14 @@ Manager::NoteClosing()
 {
   NS_ASSERT_OWNINGTHREAD(Manager);
   // This can be called more than once legitimately through different paths.
-  mClosing = true;
+  mState = Closing;
 }
 
-bool
-Manager::IsClosing() const
+Manager::State
+Manager::GetState() const
 {
   NS_ASSERT_OWNINGTHREAD(Manager);
-  return mClosing;
+  return mState;
 }
 
 void
@@ -1593,7 +1598,7 @@ Manager::ExecuteCacheOp(Listener* aListener, CacheId aCacheId,
   MOZ_ASSERT(aOpArgs.type() != CacheOpArgs::TCacheAddAllArgs);
   MOZ_ASSERT(aOpArgs.type() != CacheOpArgs::TCachePutAllArgs);
 
-  if (mClosing) {
+  if (mState == Closing) {
     aListener->OnOpComplete(ErrorResult(NS_ERROR_FAILURE), void_t());
     return;
   }
@@ -1637,7 +1642,7 @@ Manager::ExecuteStorageOp(Listener* aListener, Namespace aNamespace,
   NS_ASSERT_OWNINGTHREAD(Manager);
   MOZ_ASSERT(aListener);
 
-  if (mClosing) {
+  if (mState == Closing) {
     aListener->OnOpComplete(ErrorResult(NS_ERROR_FAILURE), void_t());
     return;
   }
@@ -1686,7 +1691,7 @@ Manager::ExecutePutAll(Listener* aListener, CacheId aCacheId,
   NS_ASSERT_OWNINGTHREAD(Manager);
   MOZ_ASSERT(aListener);
 
-  if (mClosing) {
+  if (mState == Closing) {
     aListener->OnOpComplete(ErrorResult(NS_ERROR_FAILURE), CachePutAllResult());
     return;
   }
@@ -1708,7 +1713,7 @@ Manager::Manager(ManagerId* aManagerId, nsIThread* aIOThread)
   , mIOThread(aIOThread)
   , mContext(nullptr)
   , mShuttingDown(false)
-  , mClosing(false)
+  , mState(Open)
 {
   MOZ_ASSERT(mManagerId);
   MOZ_ASSERT(mIOThread);
@@ -1717,7 +1722,7 @@ Manager::Manager(ManagerId* aManagerId, nsIThread* aIOThread)
 Manager::~Manager()
 {
   NS_ASSERT_OWNINGTHREAD(Manager);
-  MOZ_ASSERT(mClosing);
+  MOZ_ASSERT(mState == Closing);
   MOZ_ASSERT(!mContext);
 
   nsCOMPtr<nsIThread> ioThread;
@@ -1731,15 +1736,20 @@ Manager::~Manager()
 }
 
 void
-Manager::Init()
+Manager::Init(Manager* aOldManager)
 {
   NS_ASSERT_OWNINGTHREAD(Manager);
 
+  nsRefPtr<Context> oldContext;
+  if (aOldManager) {
+    oldContext = aOldManager->mContext;
+  }
+
   // Create the context immediately.  Since there can at most be one Context
   // per Manager now, this lets us cleanly call Factory::Remove() once the
   // Context goes away.
   nsRefPtr<Action> setupAction = new SetupAction();
-  nsRefPtr<Context> ref = Context::Create(this, setupAction);
+  nsRefPtr<Context> ref = Context::Create(this, setupAction, oldContext);
   mContext = ref;
 }
 
diff --git a/dom/cache/Manager.h b/dom/cache/Manager.h
index f07d5e07b2d..e27d2c09e7f 100644
--- a/dom/cache/Manager.h
+++ b/dom/cache/Manager.h
@@ -119,6 +119,12 @@ public:
     ~Listener() { }
   };
 
+  enum State
+  {
+    Open,
+    Closing
+  };
+
   static nsresult GetOrCreate(ManagerId* aManagerId, Manager** aManagerOut);
   static already_AddRefed<Manager> Get(ManagerId* aManagerId);
 
@@ -134,7 +140,8 @@ public:
   // Marks the Manager "invalid".  Once the Context completes no new operations
   // will be permitted with this Manager.  New actors will get a new Manager.
   void NoteClosing();
-  bool IsClosing() const;
+
+  State GetState() const;
 
   // If an actor represents a long term reference to a cache or body stream,
   // then they must call AddRefCacheId() or AddRefBodyId().  This will
@@ -185,7 +192,7 @@ private:
 
   Manager(ManagerId* aManagerId, nsIThread* aIOThread);
   ~Manager();
-  void Init();
+  void Init(Manager* aOldManager);
   void Shutdown();
   already_AddRefed<Context> CurrentContext();
 
@@ -249,7 +256,7 @@ private:
   nsTArray<StreamList*> mStreamLists;
 
   bool mShuttingDown;
-  bool mClosing;
+  State mState;
 
   struct CacheIdRefCounter
   {

From e78b452a980fff1b5379831e95c281af777dbf09 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Mon, 20 Apr 2015 11:14:57 -0700
Subject: [PATCH 02/80] Bug 1151974 P2 Re-enable
 serviceworkers/test_periodic_update.html. r=ehsan

---
 dom/workers/test/serviceworkers/mochitest.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/serviceworkers/mochitest.ini
index 88cbc58d6d8..beaaa6d0ee3 100644
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -103,4 +103,3 @@ skip-if = os != "linux" # Bug 1136780
 [test_bug1151916.html]
 [test_empty_serviceworker.html]
 [test_periodic_update.html]
-skip-if = true # bug 1151974

From 6d5738d702cdee800ac972b5c58bca4f83162be5 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Mon, 20 Apr 2015 11:33:40 -0700
Subject: [PATCH 03/80] Bug 1155468 - Fix Register::GetName typedef issue with
 clang. r=jandem

---
 js/src/jit/arm/Architecture-arm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/jit/arm/Architecture-arm.h b/js/src/jit/arm/Architecture-arm.h
index a4675ceb919..a3f70dd4e52 100644
--- a/js/src/jit/arm/Architecture-arm.h
+++ b/js/src/jit/arm/Architecture-arm.h
@@ -83,12 +83,12 @@ class Registers
     };
 
     static const char* GetName(Code code) {
+        MOZ_ASSERT(code < Total);
         static const char * const Names[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
                                               "r8", "r9", "r10", "r11", "r12", "sp", "r14", "pc"};
         return Names[code];
     }
-    static const char* GetName(uint32_t i) {
-        MOZ_ASSERT(i < Total);
+    static const char* GetName(Encoding i) {
         return GetName(Code(i));
     }
 

From a35f9ad8089a5944951c913a58d31e8aaa4b432a Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Tue, 14 Apr 2015 13:28:39 -0700
Subject: [PATCH 04/80] Bug 1154085 - Move eager scanning under the ambit of
 GCMarker::traverse; r=sfink

---
 js/src/gc/Marking.cpp | 164 ++++++++++++++++--------------------------
 js/src/gc/Tracer.cpp  |   2 +-
 js/src/gc/Tracer.h    |  21 ++++--
 js/src/jsgc.h         |  27 ++++---
 4 files changed, 97 insertions(+), 117 deletions(-)

diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 3bef6454b6d..8b8f38c8f4a 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -42,15 +42,11 @@ void * const js::NullPtr::constNullValue = nullptr;
 
 JS_PUBLIC_DATA(void * const) JS::NullPtr::constNullValue = nullptr;
 
-static inline void
+static void
 PushMarkStack(GCMarker* gcmarker, JSObject* thing) {
     gcmarker->traverse(thing);
 }
-static inline void
-PushMarkStack(GCMarker* gcmarker, JSFunction* thing) {
-    gcmarker->traverse(static_cast<JSObject*>(thing));
-}
-static inline void
+static void
 PushMarkStack(GCMarker* gcmarker, ObjectGroup* thing) {
     gcmarker->traverse(thing);
 }
@@ -58,23 +54,38 @@ static void
 PushMarkStack(GCMarker* gcmarker, jit::JitCode* thing) {
     gcmarker->traverse(thing);
 }
-static inline void
+static void
 PushMarkStack(GCMarker* gcmarker, JSScript* thing) {
     gcmarker->traverse(thing);
 }
-static inline void
+static void
 PushMarkStack(GCMarker* gcmarker, LazyScript* thing) {
     gcmarker->traverse(thing);
 }
+static void
+PushMarkStack(GCMarker* gcmarker, Shape* thing) {
+    gcmarker->traverse(thing);
+}
+static void
+PushMarkStack(GCMarker* gcmarker, BaseShape* thing) {
+    gcmarker->traverse(thing);
+}
+static void
+PushMarkStack(GCMarker* gcmarker, JSString* str) {
+    // Permanent atoms might not be associated with this runtime.
+    if (str->isPermanentAtom())
+        return;
 
-static inline void
-PushMarkStack(GCMarker* gcmarker, Shape* thing);
-static inline void
-PushMarkStack(GCMarker* gcmarker, BaseShape* thing);
-static inline void
-PushMarkStack(GCMarker* gcmarker, JSString* thing);
-static inline void
-PushMarkStack(GCMarker* gcmarker, JS::Symbol* thing);
+    gcmarker->traverse(str);
+}
+static void
+PushMarkStack(GCMarker* gcmarker, JS::Symbol* sym) {
+    // Well-known symbols might not be associated with this runtime.
+    if (sym->isWellKnownSymbol())
+        return;
+
+    gcmarker->traverse(sym);
+}
 
 /*** Object Marking ***/
 
@@ -236,7 +247,7 @@ CheckMarkedThing<jsid>(JSTracer* trc, jsid id)
 
 // A C++ version of JSGCTraceKind
 enum class TraceKind {
-#define NAMES(name, _) name,
+#define NAMES(name, _, __) name,
 FOR_EACH_GC_LAYOUT(NAMES)
 #undef NAMES
 };
@@ -298,7 +309,7 @@ template <typename T,
                     : IsBaseOf<LazyScript, T>::value   ? TraceKind::LazyScript
                     :                                    TraceKind::ObjectGroup>
 struct BaseGCType;
-#define IMPL_BASE_GC_TYPE(name, type_) \
+#define IMPL_BASE_GC_TYPE(name, type_, _) \
     template <typename T> struct BaseGCType<T, TraceKind:: name> { typedef type_ type; };
 FOR_EACH_GC_LAYOUT(IMPL_BASE_GC_TYPE);
 #undef IMPL_BASE_GC_TYPE
@@ -412,7 +423,7 @@ template <typename T>
 void
 DispatchToTracer(JSTracer* trc, T* thingp, const char* name)
 {
-#define IS_SAME_TYPE_OR(name, type) mozilla::IsSame<type*, T>::value ||
+#define IS_SAME_TYPE_OR(name, type, _) mozilla::IsSame<type*, T>::value ||
     static_assert(
             FOR_EACH_GC_LAYOUT(IS_SAME_TYPE_OR)
             mozilla::IsSame<T, JS::Value>::value ||
@@ -550,7 +561,7 @@ template <typename T>
 static inline void
 CheckIsMarkedThing(T* thingp)
 {
-#define IS_SAME_TYPE_OR(name, type) mozilla::IsSame<type*, T>::value ||
+#define IS_SAME_TYPE_OR(name, type, _) mozilla::IsSame<type*, T>::value ||
     static_assert(
             FOR_EACH_GC_LAYOUT(IS_SAME_TYPE_OR)
             false, "Only the base cell layout types are allowed into marking/tracing internals");
@@ -930,23 +941,6 @@ MaybePushMarkStackBetweenSlices(GCMarker* gcmarker, JSObject* thing)
         gcmarker->traverse(thing);
 }
 
-static void
-ScanShape(GCMarker* gcmarker, Shape* shape);
-
-static void
-PushMarkStack(GCMarker* gcmarker, Shape* thing)
-{
-    JS_COMPARTMENT_ASSERT(gcmarker->runtime(), thing);
-    MOZ_ASSERT(!IsInsideNursery(thing));
-
-    /* We mark shapes directly rather than pushing on the stack. */
-    if (thing->markIfUnmarked(gcmarker->markColor()))
-        ScanShape(gcmarker, thing);
-}
-
-static inline void
-ScanBaseShape(GCMarker* gcmarker, BaseShape* base);
-
 void
 BaseShape::traceChildren(JSTracer* trc)
 {
@@ -958,49 +952,38 @@ BaseShape::traceChildren(JSTracer* trc)
         TraceManuallyBarrieredEdge(trc, &global, "global");
 }
 
-static void
-PushMarkStack(GCMarker* gcmarker, BaseShape* thing)
-{
-    JS_COMPARTMENT_ASSERT(gcmarker->runtime(), thing);
-    MOZ_ASSERT(!IsInsideNursery(thing));
-
-    /* We mark base shapes directly rather than pushing on the stack. */
-    if (thing->markIfUnmarked(gcmarker->markColor()))
-        ScanBaseShape(gcmarker, thing);
-}
-
-static void
-ScanShape(GCMarker* gcmarker, Shape* shape)
+inline void
+GCMarker::eagerlyMarkChildren(Shape* shape)
 {
   restart:
-    PushMarkStack(gcmarker, shape->base());
+    PushMarkStack(this, shape->base());
 
     const BarrieredBase<jsid>& id = shape->propidRef();
     if (JSID_IS_STRING(id))
-        PushMarkStack(gcmarker, JSID_TO_STRING(id));
+        PushMarkStack(this, JSID_TO_STRING(id));
     else if (JSID_IS_SYMBOL(id))
-        PushMarkStack(gcmarker, JSID_TO_SYMBOL(id));
+        PushMarkStack(this, JSID_TO_SYMBOL(id));
 
     if (shape->hasGetterObject())
-        MaybePushMarkStackBetweenSlices(gcmarker, shape->getterObject());
+        MaybePushMarkStackBetweenSlices(this, shape->getterObject());
 
     if (shape->hasSetterObject())
-        MaybePushMarkStackBetweenSlices(gcmarker, shape->setterObject());
+        MaybePushMarkStackBetweenSlices(this, shape->setterObject());
 
     shape = shape->previous();
-    if (shape && shape->markIfUnmarked(gcmarker->markColor()))
+    if (shape && shape->markIfUnmarked(this->markColor()))
         goto restart;
 }
 
-static inline void
-ScanBaseShape(GCMarker* gcmarker, BaseShape* base)
+inline void
+GCMarker::eagerlyMarkChildren(BaseShape* base)
 {
     base->assertConsistency();
 
     base->compartment()->mark();
 
     if (GlobalObject* global = base->compartment()->unsafeUnbarrieredMaybeGlobal())
-        gcmarker->traverse(global);
+        traverse(global);
 
     /*
      * All children of the owned base shape are consistent with its
@@ -1010,7 +993,7 @@ ScanBaseShape(GCMarker* gcmarker, BaseShape* base)
     if (base->isOwned()) {
         UnownedBaseShape* unowned = base->baseUnowned();
         MOZ_ASSERT(base->compartment() == unowned->compartment());
-        unowned->markIfUnmarked(gcmarker->markColor());
+        unowned->markIfUnmarked(markColor());
     }
 }
 
@@ -1091,52 +1074,20 @@ ScanRope(GCMarker* gcmarker, JSRope* rope)
     MOZ_ASSERT(savedPos == gcmarker->stack.position());
  }
 
-static inline void
-ScanString(GCMarker* gcmarker, JSString* str)
+inline void
+GCMarker::eagerlyMarkChildren(JSString* str)
 {
     if (str->isLinear())
-        ScanLinearString(gcmarker, &str->asLinear());
+        ScanLinearString(this, &str->asLinear());
     else
-        ScanRope(gcmarker, &str->asRope());
+        ScanRope(this, &str->asRope());
 }
 
-static inline void
-PushMarkStack(GCMarker* gcmarker, JSString* str)
-{
-    // Permanent atoms might not be associated with this runtime.
-    if (str->isPermanentAtom())
-        return;
-
-    JS_COMPARTMENT_ASSERT(gcmarker->runtime(), str);
-
-    /*
-     * As string can only refer to other strings we fully scan its GC graph
-     * using the explicit stack when navigating the rope tree to avoid
-     * dealing with strings on the stack in drainMarkStack.
-     */
-    if (str->markIfUnmarked())
-        ScanString(gcmarker, str);
-}
-
-static inline void
-ScanSymbol(GCMarker* gcmarker, JS::Symbol* sym)
+inline void
+GCMarker::eagerlyMarkChildren(JS::Symbol* sym)
 {
     if (JSString* desc = sym->description())
-        PushMarkStack(gcmarker, desc);
-}
-
-static inline void
-PushMarkStack(GCMarker* gcmarker, JS::Symbol* sym)
-{
-    // Well-known symbols might not be associated with this runtime.
-    if (sym->isWellKnownSymbol())
-        return;
-
-    JS_COMPARTMENT_ASSERT(gcmarker->runtime(), sym);
-    MOZ_ASSERT(!IsInsideNursery(sym));
-
-    if (sym->markIfUnmarked())
-        ScanSymbol(gcmarker, sym);
+        PushMarkStack(this, desc);
 }
 
 /*
@@ -1441,7 +1392,7 @@ GCMarker::markAndScanString(JSObject* source, JSString* str)
         JS_COMPARTMENT_ASSERT(runtime(), str);
         MOZ_ASSERT(runtime()->isAtomsZone(str->zone()) || str->zone() == source->zone());
         if (str->markIfUnmarked())
-            ScanString(this, str);
+            eagerlyMarkChildren(str);
     }
 }
 
@@ -1452,7 +1403,7 @@ GCMarker::markAndScanSymbol(JSObject* source, JS::Symbol* sym)
         JS_COMPARTMENT_ASSERT(runtime(), sym);
         MOZ_ASSERT(runtime()->isAtomsZone(sym->zone()) || sym->zone() == source->zone());
         if (sym->markIfUnmarked())
-            ScanSymbol(this, sym);
+            eagerlyMarkChildren(sym);
     }
 }
 
@@ -1698,6 +1649,17 @@ GCMarker::dispatchToTraceChildren(T* thing)
     thing->traceChildren(this);
 }
 
+template <typename T>
+bool
+GCMarker::mark(T* thing)
+{
+    JS_COMPARTMENT_ASSERT(runtime(), thing);
+    MOZ_ASSERT(!IsInsideNursery(gc::TenuredCell::fromPointer(thing)));
+    return gc::ParticipatesInCC<T>::value
+           ? gc::TenuredCell::fromPointer(thing)->markIfUnmarked(markColor())
+           : gc::TenuredCell::fromPointer(thing)->markIfUnmarked(gc::BLACK);
+}
+
 struct TraceChildrenFunctor {
     template <typename T>
     void operator()(JSTracer* trc, void* thing) {
diff --git a/js/src/gc/Tracer.cpp b/js/src/gc/Tracer.cpp
index 36f47094544..de63796d3f7 100644
--- a/js/src/gc/Tracer.cpp
+++ b/js/src/gc/Tracer.cpp
@@ -37,7 +37,7 @@ DoCallback(JS::CallbackTracer* trc, T* thingp, const char* name)
     JS::AutoTracingName ctx(trc, name);
     trc->invoke((void**)thingp, kind);
 }
-#define INSTANTIATE_ALL_VALID_TRACE_FUNCTIONS(name, type) \
+#define INSTANTIATE_ALL_VALID_TRACE_FUNCTIONS(name, type, _) \
     template void DoCallback<type*>(JS::CallbackTracer*, type**, const char*);
 FOR_EACH_GC_LAYOUT(INSTANTIATE_ALL_VALID_TRACE_FUNCTIONS);
 #undef INSTANTIATE_ALL_VALID_TRACE_FUNCTIONS
diff --git a/js/src/gc/Tracer.h b/js/src/gc/Tracer.h
index b75cb2f5f35..e7dd4cda268 100644
--- a/js/src/gc/Tracer.h
+++ b/js/src/gc/Tracer.h
@@ -161,6 +161,11 @@ class GCMarker : public JSTracer
     void traverse(JSObject* thing) { markAndPush(ObjectTag, thing); }
     void traverse(ObjectGroup* thing) { markAndPush(GroupTag, thing); }
     void traverse(jit::JitCode* thing) { markAndPush(JitCodeTag, thing); }
+    // Mark the given GC thing and then eagerly mark all children.
+    void traverse(Shape* thing) { markAndScan(thing); }
+    void traverse(BaseShape* thing) { markAndScan(thing); }
+    void traverse(JSString* thing) { markAndScan(thing); }
+    void traverse(JS::Symbol* thing) { markAndScan(thing); }
     // The following traverse methods traverse immediately, go out-of-line to do so.
     void traverse(JSScript* thing) { markAndTraverse(thing); }
     void traverse(LazyScript* thing) { markAndTraverse(thing); }
@@ -250,6 +255,16 @@ class GCMarker : public JSTracer
             pushTaggedPtr(tag, thing);
     }
 
+    template <typename T>
+    void markAndScan(T* thing) {
+        if (mark(thing))
+            eagerlyMarkChildren(thing);
+    }
+    void eagerlyMarkChildren(Shape* shape);
+    void eagerlyMarkChildren(BaseShape* base);
+    void eagerlyMarkChildren(JSString* str);
+    void eagerlyMarkChildren(JS::Symbol* sym);
+
     template <typename T>
     void markAndTraverse(T* thing) {
         if (mark(thing))
@@ -263,11 +278,7 @@ class GCMarker : public JSTracer
     // Mark the given GC thing, but do not trace its children. Return true
     // if the thing became marked.
     template <typename T>
-    bool mark(T* thing) {
-        JS_COMPARTMENT_ASSERT(runtime(), thing);
-        MOZ_ASSERT(!IsInsideNursery(gc::TenuredCell::fromPointer(thing)));
-        return gc::TenuredCell::fromPointer(thing)->markIfUnmarked(markColor());
-    }
+    bool mark(T* thing);
 
     void pushTaggedPtr(StackTag tag, void* ptr) {
         checkZone(ptr);
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 4165ce8920f..8f18d2bad05 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -24,16 +24,17 @@
 #include "vm/NativeObject.h"
 
 #define FOR_EACH_GC_LAYOUT(D) \
-    D(Object, JSObject) \
-    D(String, JSString) \
-    D(Symbol, JS::Symbol) \
-    D(Script, JSScript) \
-    D(AccessorShape, js::AccessorShape) \
-    D(Shape, js::Shape) \
-    D(BaseShape, js::BaseShape) \
-    D(JitCode, js::jit::JitCode) \
-    D(LazyScript, js::LazyScript) \
-    D(ObjectGroup, js::ObjectGroup)
+ /* PrettyName       TypeName           AddToCCKind */ \
+    D(AccessorShape, js::AccessorShape, true) \
+    D(BaseShape,     js::BaseShape,     true) \
+    D(JitCode,       js::jit::JitCode,  true) \
+    D(LazyScript,    js::LazyScript,    true) \
+    D(Object,        JSObject,          true) \
+    D(ObjectGroup,   js::ObjectGroup,   true) \
+    D(Script,        JSScript,          true) \
+    D(Shape,         js::Shape,         true) \
+    D(String,        JSString,          false) \
+    D(Symbol,        JS::Symbol,        false)
 
 namespace js {
 
@@ -84,6 +85,12 @@ template <> struct MapTypeToFinalizeKind<JSExternalString>  { static const Alloc
 template <> struct MapTypeToFinalizeKind<JS::Symbol>        { static const AllocKind kind = AllocKind::SYMBOL; };
 template <> struct MapTypeToFinalizeKind<jit::JitCode>      { static const AllocKind kind = AllocKind::JITCODE; };
 
+template <typename T> struct ParticipatesInCC {};
+#define EXPAND_PARTICIPATES_IN_CC(_, type, addToCCKind) \
+    template <> struct ParticipatesInCC<type> { static const bool value = addToCCKind; };
+FOR_EACH_GC_LAYOUT(EXPAND_PARTICIPATES_IN_CC)
+#undef EXPAND_PARTICIPATES_IN_CC
+
 static inline bool
 IsNurseryAllocable(AllocKind kind)
 {

From 2acdc40b3daba09505bf704b4a8a2139b8ce78b7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 18 Apr 2015 15:50:21 -0400
Subject: [PATCH 05/80] Bug 1156010 - Mark nsINode::mParent as MOZ_OWNING_REF;
 r=smaug

---
 dom/base/nsINode.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
index 9ee36c14e78..077e09e93db 100644
--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
@@ -1971,7 +1971,10 @@ protected:
 
   nsRefPtr<mozilla::dom::NodeInfo> mNodeInfo;
 
-  nsINode* mParent;
+  // mParent is an owning ref most of the time, except for the case of document
+  // nodes, so it cannot be represented by nsCOMPtr, so mark is as
+  // MOZ_OWNING_REF.
+  nsINode* MOZ_OWNING_REF mParent;
 
 private:
   // Boolean flags.

From 6736041d5aac761eb9ad0f33bc7466719858dbbf Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Mon, 20 Apr 2015 21:46:19 +0200
Subject: [PATCH 06/80] Bug 1144055, Upgrade Firefox 39 to use NSS 3.19,
 NSS_3_19_BETA4 to pick up bug 1155279

---
 security/nss/TAG-INFO                       | 2 +-
 security/nss/coreconf/coreconf.dep          | 1 -
 security/nss/lib/ckfw/builtins/certdata.txt | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 3c288e6386f..a82a9f3c94e 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_19_BETA3
+NSS_3_19_BETA4
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 590d1bfaeee..5182f75552c 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 1ea27c4fa0d..d3209db50f0 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -187,9 +187,9 @@ END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\004\065\336\364\317
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 # Distrust "Distrust a pb.com certificate that does not comply with the baseline requirements."

From 068cbb1f828c3eda88a094e60713d93547ca7d7e Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Thu, 9 Apr 2015 08:41:49 +0100
Subject: [PATCH 07/80] Bug 1141867 - patch 1 - Use the proper writing mode to
 return the inline-size from FloatMarginISize. r=smontagu

---
 layout/generic/nsBlockReflowState.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index 119a770dcc5..836675f781c 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -642,6 +642,8 @@ nsBlockReflowState::CanPlaceFloat(nscoord aFloatISize,
       aFloatISize;
 }
 
+// Return the inline-size that the float (including margins) will take up
+// in the writing mode of the containing block.
 static nscoord
 FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
                  nscoord aFloatAvailableISize,
@@ -663,9 +665,11 @@ FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
               aFloatOffsetState.ComputedLogicalPadding().Size(wm),
               nsIFrame::ComputeSizeFlags::eShrinkWrap);
 
-  return floatSize.ISize(wm) +
-         aFloatOffsetState.ComputedLogicalMargin().IStartEnd(wm) +
-         aFloatOffsetState.ComputedLogicalBorderPadding().IStartEnd(wm);
+  floatSize += aFloatOffsetState.ComputedLogicalMargin().Size(wm);
+  floatSize += aFloatOffsetState.ComputedLogicalBorderPadding().Size(wm);
+
+  WritingMode cbwm = aCBReflowState.GetWritingMode();
+  return floatSize.ConvertTo(cbwm, wm).ISize(cbwm);
 }
 
 bool

From fc77be1f6fb855c76b799e2208846c5ebcb58d28 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Thu, 9 Apr 2015 10:08:17 +0100
Subject: [PATCH 08/80] Bug 1141867 - patch 2 - If FloatMarginISize returns
 unconstrained, we need to do an early reflow on the orthogonal float to find
 out its real size. r=smontagu

---
 layout/generic/nsBlockReflowState.cpp | 35 +++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index 836675f781c..dec4dd337cd 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -643,7 +643,10 @@ nsBlockReflowState::CanPlaceFloat(nscoord aFloatISize,
 }
 
 // Return the inline-size that the float (including margins) will take up
-// in the writing mode of the containing block.
+// in the writing mode of the containing block. If this returns
+// NS_UNCONSTRAINEDSIZE, we're dealing with an orthogonal block that
+// has block-size:auto, and we'll need to actually reflow it to find out
+// how much inline-size it will occupy in the containing block's mode.
 static nscoord
 FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
                  nscoord aFloatAvailableISize,
@@ -665,11 +668,17 @@ FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
               aFloatOffsetState.ComputedLogicalPadding().Size(wm),
               nsIFrame::ComputeSizeFlags::eShrinkWrap);
 
-  floatSize += aFloatOffsetState.ComputedLogicalMargin().Size(wm);
-  floatSize += aFloatOffsetState.ComputedLogicalBorderPadding().Size(wm);
-
   WritingMode cbwm = aCBReflowState.GetWritingMode();
-  return floatSize.ConvertTo(cbwm, wm).ISize(cbwm);
+  nscoord floatISize = floatSize.ConvertTo(cbwm, wm).ISize(cbwm);
+  if (floatISize == NS_UNCONSTRAINEDSIZE) {
+    return NS_UNCONSTRAINEDSIZE; // reflow is needed to get the true size
+  }
+
+  return floatISize +
+         aFloatOffsetState.ComputedLogicalMargin().Size(wm).
+           ConvertTo(cbwm, wm).ISize(cbwm) +
+         aFloatOffsetState.ComputedLogicalBorderPadding().Size(wm).
+           ConvertTo(cbwm, wm).ISize(cbwm);
 }
 
 bool
@@ -725,14 +734,20 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
   // If it's a floating first-letter, we need to reflow it before we
   // know how wide it is (since we don't compute which letters are part
   // of the first letter until reflow!).
-  bool isLetter = aFloat->GetType() == nsGkAtoms::letterFrame;
-  if (isLetter) {
+  // We also need to do this early reflow if FloatMarginISize returned
+  // an unconstrained inline-size, which can occur if the float had an
+  // orthogonal writing mode and 'auto' block-size (in its mode).
+  bool earlyFloatReflow =
+    aFloat->GetType() == nsGkAtoms::letterFrame ||
+    floatMarginISize == NS_UNCONSTRAINEDSIZE;
+  if (earlyFloatReflow) {
     mBlock->ReflowFloat(*this, adjustedAvailableSpace, aFloat, floatMargin,
                         floatOffsets, false, reflowStatus);
     floatMarginISize = aFloat->ISize(wm) + floatMargin.IStartEnd(wm);
     NS_ASSERTION(NS_FRAME_IS_COMPLETE(reflowStatus),
-                 "letter frames shouldn't break, and if they do now, "
-                 "then they're breaking at the wrong point");
+                 "letter frames and orthogonal floats with auto block-size "
+                 "shouldn't break, and if they do now, then they're breaking "
+                 "at the wrong point");
   }
 
   // Find a place to place the float. The CSS2 spec doesn't want
@@ -857,7 +872,7 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
 
   // Reflow the float after computing its vertical position so it knows
   // where to break.
-  if (!isLetter) {
+  if (!earlyFloatReflow) {
     bool pushedDown = mBCoord != saveBCoord;
     mBlock->ReflowFloat(*this, adjustedAvailableSpace, aFloat, floatMargin,
                         floatOffsets, pushedDown, reflowStatus);

From d0f6f3bedca8513c0faa72b9d309fecc33a99477 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Thu, 9 Apr 2015 14:40:54 +0100
Subject: [PATCH 09/80] Bug 1141867 - patch 3 - Reftests for contiguous
 orthogonal floats. r=smontagu

---
 .../floats/orthogonal-floats-1-ref.html       | 39 +++++++++++++
 .../reftests/floats/orthogonal-floats-1a.html | 54 ++++++++++++++++++
 .../reftests/floats/orthogonal-floats-1b.html | 54 ++++++++++++++++++
 .../reftests/floats/orthogonal-floats-1c.html | 56 +++++++++++++++++++
 .../reftests/floats/orthogonal-floats-1d.html | 56 +++++++++++++++++++
 layout/reftests/floats/reftest.list           |  4 ++
 6 files changed, 263 insertions(+)
 create mode 100644 layout/reftests/floats/orthogonal-floats-1-ref.html
 create mode 100644 layout/reftests/floats/orthogonal-floats-1a.html
 create mode 100644 layout/reftests/floats/orthogonal-floats-1b.html
 create mode 100644 layout/reftests/floats/orthogonal-floats-1c.html
 create mode 100644 layout/reftests/floats/orthogonal-floats-1d.html

diff --git a/layout/reftests/floats/orthogonal-floats-1-ref.html b/layout/reftests/floats/orthogonal-floats-1-ref.html
new file mode 100644
index 00000000000..a5ccc8a3c85
--- /dev/null
+++ b/layout/reftests/floats/orthogonal-floats-1-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
+  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
+  <meta charset="utf-8">
+  <style type="text/css">
+  body {
+    margin: 8px;
+  }
+  p {
+    clear: both;
+  }
+  div#dummy {
+    height: 100px;
+    float: right;
+  }
+  div#reference {
+    background-color: green;
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    z-index: -1;
+  }
+  </style>
+ </head>
+
+ <body>
+
+  <div id="dummy"></div>
+
+  <div id="reference"></div>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ </body>
+</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1a.html b/layout/reftests/floats/orthogonal-floats-1a.html
new file mode 100644
index 00000000000..87aa34da588
--- /dev/null
+++ b/layout/reftests/floats/orthogonal-floats-1a.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
+  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
+  <meta charset="utf-8">
+  <style type="text/css">
+  body {
+    margin: 8px;
+  }
+  p {
+    clear: both;
+  }
+  div.floated-right {
+    background: green;
+    color: green;
+    inline-size: 100px;
+    block-size: 20px;
+    float: right;
+    -ah-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
+    writing-mode: tb-rl; /* IE 11 */
+    writing-mode: vertical-rl;
+  }
+  div#reference-overlapped-red {
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    z-index: -1;
+  }
+  </style>
+ </head>
+
+ <body>
+
+  <div class="floated-right">abcde</div>
+
+  <div class="floated-right">fghijk</div>
+
+  <div class="floated-right">lmnopq</div>
+
+  <div class="floated-right">rstuv</div>
+
+  <div class="floated-right">wxyz!</div>
+
+  <div id="reference-overlapped-red"></div>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ </body>
+</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1b.html b/layout/reftests/floats/orthogonal-floats-1b.html
new file mode 100644
index 00000000000..f4890f32d1a
--- /dev/null
+++ b/layout/reftests/floats/orthogonal-floats-1b.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
+  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
+  <meta charset="utf-8">
+  <style type="text/css">
+  body {
+    margin: 8px;
+  }
+  p {
+    clear: both;
+  }
+  div.floated-right {
+    background: green;
+    color: green;
+    inline-size: 100px;
+    block-size: 20px;
+    float: right;
+    -ah-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
+    writing-mode: tb-lr; /* IE 11 */
+    writing-mode: vertical-lr;
+  }
+  div#reference-overlapped-red {
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    z-index: -1;
+  }
+  </style>
+ </head>
+
+ <body>
+
+  <div class="floated-right">abcde</div>
+
+  <div class="floated-right">fghijk</div>
+
+  <div class="floated-right">lmnopq</div>
+
+  <div class="floated-right">rstuv</div>
+
+  <div class="floated-right">wxyz!</div>
+
+  <div id="reference-overlapped-red"></div>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ </body>
+</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1c.html b/layout/reftests/floats/orthogonal-floats-1c.html
new file mode 100644
index 00000000000..4d8f77b032c
--- /dev/null
+++ b/layout/reftests/floats/orthogonal-floats-1c.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
+  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
+  <style type="text/css">
+  <meta charset="utf-8">
+  @font-face {
+    font-family: Ahem;
+    src: url(../fonts/Ahem.ttf);
+  }
+  body {
+    margin: 8px;
+  }
+  p {
+    clear: both;
+  }
+  div.floated-right {
+    color: green;
+    float: right;
+    -ah-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
+    writing-mode: tb-rl; /* IE 11 */
+    writing-mode: vertical-rl;
+    font: 20px/20px Ahem;
+  }
+  div#reference-overlapped-red {
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    z-index: -1;
+  }
+  </style>
+ </head>
+
+ <body>
+
+  <div class="floated-right">abcde</div>
+
+  <div class="floated-right">fghij</div>
+
+  <div class="floated-right">klmno</div>
+
+  <div class="floated-right">qrstu</div>
+
+  <div class="floated-right">vwxyz</div>
+
+  <div id="reference-overlapped-red"></div>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ </body>
+</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1d.html b/layout/reftests/floats/orthogonal-floats-1d.html
new file mode 100644
index 00000000000..97a22e1a666
--- /dev/null
+++ b/layout/reftests/floats/orthogonal-floats-1d.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
+  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
+  <meta charset="utf-8">
+  <style type="text/css">
+  @font-face {
+    font-family: Ahem;
+    src: url(../fonts/Ahem.ttf);
+  }
+  body {
+    margin: 8px;
+  }
+  p {
+    clear: both;
+  }
+  div.floated-right {
+    color: green;
+    float: right;
+    -ah-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
+    writing-mode: tb-lr; /* IE 11 */
+    writing-mode: vertical-lr;
+    font: 20px/20px Ahem;
+  }
+  div#reference-overlapped-red {
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    z-index: -1;
+  }
+  </style>
+ </head>
+
+ <body>
+
+  <div class="floated-right">abcde</div>
+
+  <div class="floated-right">fghij</div>
+
+  <div class="floated-right">klmno</div>
+
+  <div class="floated-right">qrstu</div>
+
+  <div class="floated-right">vwxyz</div>
+
+  <div id="reference-overlapped-red"></div>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ </body>
+</html>
diff --git a/layout/reftests/floats/reftest.list b/layout/reftests/floats/reftest.list
index c915e365d5b..fb7a8fa0c33 100644
--- a/layout/reftests/floats/reftest.list
+++ b/layout/reftests/floats/reftest.list
@@ -35,3 +35,7 @@ fails == 345369-2.html 345369-2-ref.html
 == float-in-rtl-4b.html float-in-rtl-4-ref.html
 == float-in-rtl-4c.html float-in-rtl-4-ref.html
 == float-in-rtl-4d.html float-in-rtl-4-ref.html
+fuzzy-if(Android,16,2) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
+== orthogonal-floats-1b.html orthogonal-floats-1-ref.html
+fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1c.html orthogonal-floats-1-ref.html
+fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1d.html orthogonal-floats-1-ref.html

From fdc89d08f832c4a337cb4a320ef16e2520a9e70f Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Mon, 20 Apr 2015 12:47:20 -0700
Subject: [PATCH 10/80] Bug 1126010 - XULContentSinkImpl::mParser should be an
 nsRefPtr. r=smaug

---
 dom/xul/nsXULContentSink.cpp | 13 ++++---------
 dom/xul/nsXULContentSink.h   |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp
index 3444fd5a9c2..2f728d366db 100644
--- a/dom/xul/nsXULContentSink.cpp
+++ b/dom/xul/nsXULContentSink.cpp
@@ -162,8 +162,7 @@ XULContentSinkImpl::XULContentSinkImpl()
       mTextLength(0),
       mTextSize(0),
       mConstrainSize(true),
-      mState(eInProlog),
-      mParser(nullptr)
+      mState(eInProlog)
 {
 
 #ifdef PR_LOGGING
@@ -175,8 +174,6 @@ XULContentSinkImpl::XULContentSinkImpl()
 
 XULContentSinkImpl::~XULContentSinkImpl()
 {
-    NS_IF_RELEASE(mParser); // XXX should've been released by now, unless error.
-
     // The context stack _should_ be empty, unless something has gone wrong.
     NS_ASSERTION(mContextStack.Depth() == 0, "Context stack not empty?");
     mContextStack.Clear();
@@ -193,14 +190,14 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(XULContentSinkImpl)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mNodeInfoManager)
   tmp->mContextStack.Clear();
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mPrototype)
-  NS_IF_RELEASE(tmp->mParser);
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mParser)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(XULContentSinkImpl)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNodeInfoManager)
   tmp->mContextStack.Traverse(cb);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrototype)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mParser)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParser)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULContentSinkImpl)
@@ -241,7 +238,7 @@ XULContentSinkImpl::DidBuildModel(bool aTerminated)
 
     // Drop our reference to the parser to get rid of a circular
     // reference.
-    NS_IF_RELEASE(mParser);
+    mParser = nullptr;
     return NS_OK;
 }
 
@@ -262,9 +259,7 @@ XULContentSinkImpl::WillResume(void)
 NS_IMETHODIMP
 XULContentSinkImpl::SetParser(nsParserBase* aParser)
 {
-    NS_IF_RELEASE(mParser);
     mParser = aParser;
-    NS_IF_ADDREF(mParser);
     return NS_OK;
 }
 
diff --git a/dom/xul/nsXULContentSink.h b/dom/xul/nsXULContentSink.h
index 793685ddd4f..377609cd7f6 100644
--- a/dom/xul/nsXULContentSink.h
+++ b/dom/xul/nsXULContentSink.h
@@ -144,8 +144,7 @@ protected:
 
     nsRefPtr<nsXULPrototypeDocument> mPrototype;  // [OWNER]
 
-    // We use regular pointer b/c of funky exports on nsIParser:
-    nsParserBase*         mParser;               // [OWNER]
+    nsRefPtr<nsParserBase> mParser;
     nsCOMPtr<nsIScriptSecurityManager> mSecMan;
 };
 

From f8dbc523b462bfbd9e21af93db66f65839b1a65c Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Mon, 20 Apr 2015 12:48:15 -0700
Subject: [PATCH 11/80] Bug 1144298 - Eliminate gratuitous gotos from
 Directory::RemoveInternal(). r=baku

---
 dom/filesystem/Directory.cpp | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp
index 3bdacc0017e..916d243df43 100644
--- a/dom/filesystem/Directory.cpp
+++ b/dom/filesystem/Directory.cpp
@@ -198,29 +198,20 @@ Directory::RemoveInternal(const StringOrFileOrDirectory& aPath, bool aRecursive,
 
   if (aPath.IsFile()) {
     file = aPath.GetAsFile().Impl();
-    goto parameters_check_done;
-  }
-
-  if (aPath.IsString()) {
+  } else if (aPath.IsString()) {
     if (!DOMPathToRealPath(aPath.GetAsString(), realPath)) {
       error = NS_ERROR_DOM_FILESYSTEM_INVALID_PATH_ERR;
     }
-    goto parameters_check_done;
-  }
-
-  if (!mFileSystem->IsSafeDirectory(&aPath.GetAsDirectory())) {
+  } else if (!mFileSystem->IsSafeDirectory(&aPath.GetAsDirectory())) {
     error = NS_ERROR_DOM_SECURITY_ERR;
-    goto parameters_check_done;
+  } else {
+    realPath = aPath.GetAsDirectory().mPath;
+    // The target must be a descendant of this directory.
+    if (!FileSystemUtils::IsDescendantPath(mPath, realPath)) {
+      error = NS_ERROR_DOM_FILESYSTEM_NO_MODIFICATION_ALLOWED_ERR;
+    }
   }
 
-  realPath = aPath.GetAsDirectory().mPath;
-  // The target must be a descendant of this directory.
-  if (!FileSystemUtils::IsDescendantPath(mPath, realPath)) {
-    error = NS_ERROR_DOM_FILESYSTEM_NO_MODIFICATION_ALLOWED_ERR;
-  }
-
-parameters_check_done:
-
   nsRefPtr<RemoveTask> task = new RemoveTask(mFileSystem, mPath, file, realPath,
     aRecursive, aRv);
   if (aRv.Failed()) {

From f5d120a4c2632897492a8bbb2bcbce3f34a9eb4e Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Mon, 20 Apr 2015 12:50:33 -0700
Subject: [PATCH 12/80] Bug 1141661 - No need to manually convert this URI
 anymore. r=mossop

---
 .../components/processsingleton/MainProcessSingleton.js  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/toolkit/components/processsingleton/MainProcessSingleton.js b/toolkit/components/processsingleton/MainProcessSingleton.js
index 0a57996593e..76a0c14330b 100644
--- a/toolkit/components/processsingleton/MainProcessSingleton.js
+++ b/toolkit/components/processsingleton/MainProcessSingleton.js
@@ -12,13 +12,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 
-// Temporary workaround for bug 1141661
-function convertURL(url) {
-  let chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"].
-                       getService(Ci.nsIChromeRegistry);
-  return chromeRegistry.convertChromeURL(Services.io.newURI(url, null, null)).spec;
-}
-
 function MainProcessSingleton() {}
 MainProcessSingleton.prototype = {
   classID: Components.ID("{0636a680-45cb-11e4-916c-0800200c9a66}"),
@@ -85,7 +78,7 @@ MainProcessSingleton.prototype = {
       // Load this script early so that console.* is initialized
       // before other frame scripts.
       Services.mm.loadFrameScript("chrome://global/content/browser-content.js", true);
-      Services.ppmm.loadProcessScript(convertURL("chrome://global/content/process-content.js"), true);
+      Services.ppmm.loadProcessScript("chrome://global/content/process-content.js", true);
       Services.ppmm.addMessageListener("Console:Log", this.logConsoleMessage);
       Services.mm.addMessageListener("Search:AddEngine", this.addSearchEngine);
       break;

From 3265550b1283d38f96e3ed1bc3b8686ba29cd703 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Mon, 20 Apr 2015 12:50:34 -0700
Subject: [PATCH 13/80] Bug 1141661 - Load chrome before processing delayed
 frame scripts. r=smaug

---
 dom/ipc/ContentParent.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index bc234c21b6d..fdda2ce021e 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2360,6 +2360,13 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority,
                             bool aSetupOffMainThreadCompositing,
                             bool aSendRegisteredChrome)
 {
+    if (aSendRegisteredChrome) {
+        nsCOMPtr<nsIChromeRegistry> registrySvc = nsChromeRegistry::GetService();
+        nsChromeRegistryChrome* chromeRegistry =
+            static_cast<nsChromeRegistryChrome*>(registrySvc.get());
+        chromeRegistry->SendRegisteredChrome(this);
+    }
+
     // Initialize the message manager (and load delayed scripts) now that we
     // have established communications with the child.
     mMessageManager->InitWithCallback(this);
@@ -2402,13 +2409,6 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority,
 #endif
     }
 
-    if (aSendRegisteredChrome) {
-        nsCOMPtr<nsIChromeRegistry> registrySvc = nsChromeRegistry::GetService();
-        nsChromeRegistryChrome* chromeRegistry =
-            static_cast<nsChromeRegistryChrome*>(registrySvc.get());
-        chromeRegistry->SendRegisteredChrome(this);
-    }
-
     if (gAppData) {
         nsCString version(gAppData->version);
         nsCString buildID(gAppData->buildID);

From aa63c446659f3c9c9754bc79b03d86955783a6dd Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Mon, 20 Apr 2015 14:15:27 -0600
Subject: [PATCH 14/80] Bug 1133833 - Disable xpcshell
 test_async_notification.js on Android 4.3 for frequent failures;
 r=trivial,test-only

---
 image/test/unit/xpcshell.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/image/test/unit/xpcshell.ini b/image/test/unit/xpcshell.ini
index 6dc229e0323..c3332743410 100644
--- a/image/test/unit/xpcshell.ini
+++ b/image/test/unit/xpcshell.ini
@@ -34,6 +34,8 @@ support-files =
 
 
 [test_async_notification.js]
+# Bug 1156452: frequent crash on Android 4.3
+skip-if = android_version == "18"
 [test_async_notification_404.js]
 [test_async_notification_animated.js]
 [test_encoder_apng.js]

From d12ff3819077ba098a4c9477e55f2e5f0090b47d Mon Sep 17 00:00:00 2001
From: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
Date: Mon, 20 Apr 2015 16:16:17 -0400
Subject: [PATCH 15/80] Bug 1146024 - Fix up input routing for APZ on Fennec.
 r=kats

nsWindow::ProcessUntransformedAPZEvent is the method that
deals with APZ Input, so it should receive it's events
---
 gfx/layers/apz/util/APZThreadUtils.cpp | 12 ++++++++++++
 layout/generic/nsGfxScrollFrame.cpp    |  4 ++--
 widget/android/AndroidJNI.cpp          |  2 +-
 widget/android/AndroidJavaWrappers.cpp |  7 +++++++
 widget/android/AndroidJavaWrappers.h   |  5 ++++-
 widget/android/nsWindow.cpp            | 15 ++++++++++++++-
 widget/android/nsWindow.h              |  2 ++
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/gfx/layers/apz/util/APZThreadUtils.cpp b/gfx/layers/apz/util/APZThreadUtils.cpp
index 9c4ddc35a2f..1b77f0a5781 100644
--- a/gfx/layers/apz/util/APZThreadUtils.cpp
+++ b/gfx/layers/apz/util/APZThreadUtils.cpp
@@ -6,6 +6,7 @@
 #include "mozilla/layers/APZThreadUtils.h"
 
 #include "mozilla/layers/Compositor.h"
+#include "AndroidBridge.h"
 
 namespace mozilla {
 namespace layers {
@@ -52,6 +53,16 @@ APZThreadUtils::AssertOnCompositorThread()
 /*static*/ void
 APZThreadUtils::RunOnControllerThread(Task* aTask)
 {
+#ifdef MOZ_ANDROID_APZ
+  // This is needed while nsWindow::ConfigureAPZControllerThread is not propper
+  // implemented.
+  if (AndroidBridge::IsJavaUiThread()) {
+    aTask->Run();
+    delete aTask;
+  } else {
+    AndroidBridge::Bridge()->PostTaskToUiThread(aTask, 0);
+  }
+#else
   if (!sControllerThread) {
     // Could happen on startup
     NS_WARNING("Dropping task posted to controller thread\n");
@@ -65,6 +76,7 @@ APZThreadUtils::RunOnControllerThread(Task* aTask)
   } else {
     sControllerThread->PostTask(FROM_HERE, aTask);
   }
+#endif
 }
 
 } // namespace layers
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index ae84492ffec..2c5e4f0a82c 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1074,7 +1074,7 @@ ScrollFrameHelper::HandleScrollbarStyleSwitching()
   }
 }
 
-#if defined(MOZ_B2G) || defined(MOZ_WIDGET_ANDROID)
+#if defined(MOZ_B2G) || (defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_ANDROID_APZ))
 static bool IsFocused(nsIContent* aContent)
 {
   // Some content elements, like the GetContent() of a scroll frame
@@ -1099,7 +1099,7 @@ ScrollFrameHelper::WantAsyncScroll() const
   bool isHScrollable = !!(directions & nsIScrollableFrame::HORIZONTAL) &&
                        (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN);
 
-#if defined(MOZ_B2G) || defined(MOZ_WIDGET_ANDROID)
+#if defined(MOZ_B2G) || (defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_ANDROID_APZ))
   // Mobile platforms need focus to scroll.
   bool canScrollWithoutScrollbars = IsFocused(mOuter->GetContent());
 #else
diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp
index 3200c8c7942..ce152336eb1 100644
--- a/widget/android/AndroidJNI.cpp
+++ b/widget/android/AndroidJNI.cpp
@@ -949,7 +949,7 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_handleTouchEvent(JNIEnv* env,
     uint64_t blockId;
     nsEventStatus status = controller->ReceiveInputEvent(input, &guid, &blockId);
     if (status != nsEventStatus_eConsumeNoDefault) {
-        nsAppShell::gAppShell->PostEvent(AndroidGeckoEvent::MakeApzInputEvent(input, guid, blockId));
+        nsAppShell::gAppShell->PostEvent(AndroidGeckoEvent::MakeApzInputEvent(input, guid, blockId, status));
     }
     return true;
 }
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index 829aa3916c9..5662fac8d06 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -672,6 +672,13 @@ AndroidGeckoEvent::ApzInputBlockId()
     return mApzInputBlockId;
 }
 
+nsEventStatus
+AndroidGeckoEvent::ApzEventStatus()
+{
+    MOZ_ASSERT(Type() == APZ_INPUT_EVENT);
+    return mApzEventStatus;
+}
+
 WidgetTouchEvent
 AndroidGeckoEvent::MakeTouchEvent(nsIWidget* widget)
 {
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index 7ef13ec8db5..9f71e217a58 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -495,12 +495,13 @@ public:
         return event;
     }
 
-    static AndroidGeckoEvent* MakeApzInputEvent(const MultiTouchInput& aInput, const mozilla::layers::ScrollableLayerGuid& aGuid, uint64_t aInputBlockId) {
+    static AndroidGeckoEvent* MakeApzInputEvent(const MultiTouchInput& aInput, const mozilla::layers::ScrollableLayerGuid& aGuid, uint64_t aInputBlockId, nsEventStatus aEventStatus) {
         AndroidGeckoEvent* event = new AndroidGeckoEvent();
         event->Init(APZ_INPUT_EVENT);
         event->mApzInput = aInput;
         event->mApzGuid = aGuid;
         event->mApzInputBlockId = aInputBlockId;
+        event->mApzEventStatus = aEventStatus;
         return event;
     }
 
@@ -570,6 +571,7 @@ public:
     nsIObserver *Observer() { return mObserver; }
     mozilla::layers::ScrollableLayerGuid ApzGuid();
     uint64_t ApzInputBlockId();
+    nsEventStatus ApzEventStatus();
 
 protected:
     int mAction;
@@ -612,6 +614,7 @@ protected:
     MultiTouchInput mApzInput;
     mozilla::layers::ScrollableLayerGuid mApzGuid;
     uint64_t mApzInputBlockId;
+    nsEventStatus mApzEventStatus;
     AutoGlobalWrappedJavaObject mObject;
 
     void ReadIntArray(nsTArray<int> &aVals,
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index c7717032fb0..0e93f7bd0d8 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -46,6 +46,7 @@ using mozilla::unused;
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "mozilla/layers/AsyncCompositionManager.h"
 #include "mozilla/layers/APZCTreeManager.h"
+#include "mozilla/layers/APZThreadUtils.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
 #include "ScopedGLHelpers.h"
@@ -837,7 +838,13 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
             break;
         }
 
-        case AndroidGeckoEvent::APZ_INPUT_EVENT:
+        case AndroidGeckoEvent::APZ_INPUT_EVENT: {
+            win->UserActivity();
+
+            WidgetTouchEvent touchEvent = ae->MakeTouchEvent(win);
+            win->ProcessUntransformedAPZEvent(&touchEvent, ae->ApzGuid(), ae->ApzInputBlockId(), ae->ApzEventStatus());
+            break;
+        }
         case AndroidGeckoEvent::MOTION_EVENT: {
             win->UserActivity();
             bool preventDefaultActions = win->OnMultitouchEvent(ae);
@@ -2513,6 +2520,12 @@ nsWindow::ConfigureAPZCTreeManager()
     }
 }
 
+void
+nsWindow::ConfigureAPZControllerThread()
+{
+    APZThreadUtils::SetControllerThread(nullptr);
+}
+
 already_AddRefed<GeckoContentController>
 nsWindow::CreateRootContentController()
 {
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index 04d63bc7c91..8a12eb55771 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -203,6 +203,8 @@ protected:
     void FlushIMEChanges();
 
     void ConfigureAPZCTreeManager() override;
+    void ConfigureAPZControllerThread() override;
+
     already_AddRefed<GeckoContentController> CreateRootContentController() override;
 
     // Call this function when the users activity is the direct cause of an

From 0b7d9a127391d5d5f6f68d1da9bf6639bc2dc92b Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 20 Apr 2015 16:25:52 -0400
Subject: [PATCH 16/80] Bug 1146024 - Followup to fix non-android bustage on a
 CLOSED TREE. r=bustage

---
 gfx/layers/apz/util/APZThreadUtils.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/layers/apz/util/APZThreadUtils.cpp b/gfx/layers/apz/util/APZThreadUtils.cpp
index 1b77f0a5781..7f3dd5eb864 100644
--- a/gfx/layers/apz/util/APZThreadUtils.cpp
+++ b/gfx/layers/apz/util/APZThreadUtils.cpp
@@ -6,7 +6,9 @@
 #include "mozilla/layers/APZThreadUtils.h"
 
 #include "mozilla/layers/Compositor.h"
+#ifdef MOZ_ANDROID_APZ
 #include "AndroidBridge.h"
+#endif
 
 namespace mozilla {
 namespace layers {

From 0b2707c91ef43c4058ac50e5a2f017367c7c1121 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 20 Apr 2015 16:54:46 -0400
Subject: [PATCH 17/80] Bug 1155942.  Treat USVString and ByteString as
 serializable values.  r=bkelly

---
 dom/bindings/parser/WebIDL.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 868542018ae..15e1700d9f1 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -2776,7 +2776,7 @@ class IDLBuiltinType(IDLType):
                self._typeTag == IDLBuiltinType.Types.unrestricted_double
 
     def isSerializable(self):
-        return self.isPrimitive() or self.isDOMString() or self.isDate()
+        return self.isPrimitive() or self.isString() or self.isDate()
 
     def includesRestrictedFloat(self):
         return self.isFloat() and not self.isUnrestricted()

From 91607f83e63c4bb8f4d4fe38072bc5c0eba6c9e9 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 20 Apr 2015 16:54:46 -0400
Subject: [PATCH 18/80] Bug 1156197.  Just use the return value of the cols DOM
 property for determining the default number of rendered columns for a
 textarea.  r=ms2ger

---
 dom/html/HTMLTextAreaElement.cpp                     | 10 +---------
 layout/reftests/forms/textarea/reftest.list          |  1 +
 layout/reftests/forms/textarea/various-cols-ref.html |  4 ++++
 layout/reftests/forms/textarea/various-cols.html     |  4 ++++
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 layout/reftests/forms/textarea/various-cols-ref.html
 create mode 100644 layout/reftests/forms/textarea/various-cols.html

diff --git a/dom/html/HTMLTextAreaElement.cpp b/dom/html/HTMLTextAreaElement.cpp
index 6ca702af05f..bd2be22edb1 100644
--- a/dom/html/HTMLTextAreaElement.cpp
+++ b/dom/html/HTMLTextAreaElement.cpp
@@ -1461,15 +1461,7 @@ HTMLTextAreaElement::IsPasswordTextControl() const
 NS_IMETHODIMP_(int32_t)
 HTMLTextAreaElement::GetCols()
 {
-  const nsAttrValue* attr = GetParsedAttr(nsGkAtoms::cols);
-  if (attr) {
-    int32_t cols = attr->Type() == nsAttrValue::eInteger ?
-                   attr->GetIntegerValue() : 0;
-    // XXX why a default of 1 char, why hide it
-    return (cols <= 0) ? 1 : cols;
-  }
-
-  return DEFAULT_COLS;
+  return Cols();
 }
 
 NS_IMETHODIMP_(int32_t)
diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list
index 4bf945578fe..866304435f8 100644
--- a/layout/reftests/forms/textarea/reftest.list
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -11,3 +11,4 @@ skip-if(B2G||Mulet) fails-if(Android) fails-if(gtk2Widget) != rtl.html no-resize
 == rtl.html in-dynamic-rtl-doc.html
 == setvalue-framereconstruction-1.html setvalue-framereconstruction-ref.html
 == padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
+== various-cols.html various-cols-ref.html
diff --git a/layout/reftests/forms/textarea/various-cols-ref.html b/layout/reftests/forms/textarea/various-cols-ref.html
new file mode 100644
index 00000000000..7ba962e61d8
--- /dev/null
+++ b/layout/reftests/forms/textarea/various-cols-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<textarea cols="20"></textarea><br>
+<textarea cols="20"></textarea><br>
+<textarea cols="20"></textarea>
diff --git a/layout/reftests/forms/textarea/various-cols.html b/layout/reftests/forms/textarea/various-cols.html
new file mode 100644
index 00000000000..dc62941d8f6
--- /dev/null
+++ b/layout/reftests/forms/textarea/various-cols.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<textarea></textarea><br>
+<textarea cols="0"></textarea><br>
+<textarea cols="-1"></textarea>

From a9824af70a7e987fb1163c9ca232760de6f56f62 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 17 Apr 2015 22:01:02 -0400
Subject: [PATCH 19/80] Bug 1152902 part 1.  Add a way to flag a method in
 webidl as being identity-testable, so we'll expose such an identity test from
 bindings to other C++ code.  r=peterv

---
 dom/bindings/Codegen.py       | 22 ++++++++++++++++++++++
 dom/bindings/parser/WebIDL.py |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index ca6cbeb9c56..758cf62369c 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -8604,6 +8604,26 @@ class CGStaticMethodJitinfo(CGGeneric):
                  IDLToCIdentifier(method.identifier.name))))
 
 
+class CGMethodIdentityTest(CGAbstractMethod):
+    """
+    A class to generate a method-identity test for a given IDL operation.
+    """
+    def __init__(self, descriptor, method):
+        self.method = method
+        name = "Is%sMethod" % MakeNativeName(method.identifier.name)
+        CGAbstractMethod.__init__(self, descriptor, name, 'bool',
+                                  [Argument('JS::Handle<JSObject*>', 'aObj')])
+
+    def definition_body(self):
+        return dedent(
+            """
+            MOZ_ASSERT(aObj);
+            return js::IsFunctionObject(aObj) &&
+                   js::FunctionObjectIsNative(aObj) &&
+                   FUNCTION_VALUE_TO_JITINFO(JS::ObjectValue(*aObj)) == &%s_methodinfo;
+            """ % IDLToCIdentifier(self.method.identifier.name))
+
+
 def getEnumValueName(value):
     # Some enum values can be empty strings.  Others might have weird
     # characters in them.  Deal with the former by returning "_empty",
@@ -11200,6 +11220,8 @@ class CGDescriptor(CGThing):
                         cgThings.append(CGMemberJITInfo(descriptor, m))
                         if props.isCrossOriginMethod:
                             crossOriginMethods.add(m.identifier.name)
+                        if m.getExtendedAttribute("MethodIdentityTestable"):
+                            cgThings.append(CGMethodIdentityTest(descriptor, m))
             elif m.isAttr():
                 if m.stringifier:
                     raise TypeError("Stringifier attributes not supported yet. "
diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 15e1700d9f1..5825063b628 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -4163,7 +4163,8 @@ class IDLMethod(IDLInterfaceMember, IDLScope):
               identifier == "Func" or
               identifier == "AvailableIn" or
               identifier == "CheckPermissions" or
-              identifier == "BinaryName"):
+              identifier == "BinaryName" or
+              identifier == "MethodIdentityTestable"):
             # Known attributes that we don't need to do anything with here
             pass
         else:

From f9d2845925e078dde834ac24b0a4b46e0505b21a Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 17 Apr 2015 22:01:02 -0400
Subject: [PATCH 20/80] Bug 1152902 part 2.  Add a fast path for the case when
 a Promise is resolved with another Promise.  r=nsm

---
 dom/promise/Promise.cpp                       | 77 ++++++++++++++++++-
 dom/promise/Promise.h                         |  1 +
 dom/promise/tests/mochitest.ini               |  1 +
 .../test_thenable_vs_promise_ordering.html    | 27 +++++++
 dom/webidl/Promise.webidl                     |  2 +-
 5 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 dom/promise/tests/test_thenable_vs_promise_ordering.html

diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp
index 8b5cf161c71..b323e78491c 100644
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -170,7 +170,7 @@ GetPromise(JSContext* aCx, JS::Handle<JSObject*> aFunc)
 }
 };
 
-// Main thread runnable to resolve thenables.
+// Runnable to resolve thenables.
 // Equivalent to the specification's ResolvePromiseViaThenableTask.
 class ThenableResolverTask final : public nsRunnable
 {
@@ -201,6 +201,8 @@ protected:
     ThreadsafeAutoJSContext cx;
     JS::Rooted<JSObject*> wrapper(cx, mPromise->GetWrapper());
     MOZ_ASSERT(wrapper); // It was preserved!
+    // If we ever change which compartment we're working in here, make sure to
+    // fix the fast-path for resolved-with-a-Promise in ResolveInternal.
     JSAutoCompartment ac(cx, wrapper);
 
     JS::Rooted<JSObject*> resolveFunc(cx,
@@ -271,6 +273,48 @@ private:
   NS_DECL_OWNINGTHREAD;
 };
 
+// Fast version of ThenableResolverTask for use in the cases when we know we're
+// calling the canonical Promise.prototype.then on an actual DOM Promise.  In
+// that case we can just bypass the jumping into and out of JS and call
+// AppendCallbacks on that promise directly.
+class FastThenableResolverTask final : public nsRunnable
+{
+public:
+  FastThenableResolverTask(PromiseCallback* aResolveCallback,
+                           PromiseCallback* aRejectCallback,
+                           Promise* aNextPromise)
+    : mResolveCallback(aResolveCallback)
+    , mRejectCallback(aRejectCallback)
+    , mNextPromise(aNextPromise)
+  {
+    MOZ_ASSERT(aResolveCallback);
+    MOZ_ASSERT(aRejectCallback);
+    MOZ_ASSERT(aNextPromise);
+    MOZ_COUNT_CTOR(FastThenableResolverTask);
+  }
+
+  virtual
+  ~FastThenableResolverTask()
+  {
+    NS_ASSERT_OWNINGTHREAD(FastThenableResolverTask);
+    MOZ_COUNT_DTOR(FastThenableResolverTask);
+  }
+
+protected:
+  NS_IMETHOD
+  Run() override
+  {
+    NS_ASSERT_OWNINGTHREAD(FastThenableResolverTask);
+    mNextPromise->AppendCallbacks(mResolveCallback, mRejectCallback);
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<PromiseCallback> mResolveCallback;
+  nsRefPtr<PromiseCallback> mRejectCallback;
+  nsRefPtr<Promise> mNextPromise;
+};
+
 // Promise
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(Promise)
@@ -1198,6 +1242,37 @@ Promise::ResolveInternal(JSContext* aCx,
     if (then.isObject() && JS::IsCallable(&then.toObject())) {
       // This is the then() function of the thenable aValueObj.
       JS::Rooted<JSObject*> thenObj(aCx, &then.toObject());
+
+      // Add a fast path for the case when we're resolved with an actual
+      // Promise.  This has two requirements:
+      //
+      // 1) valueObj is a Promise.
+      // 2) thenObj is a JSFunction backed by our actual Promise::Then
+      //    implementation.
+      //
+      // If those requirements are satisfied, then we know exactly what
+      // thenObj.call(valueObj) will do, so we can optimize a bit and avoid ever
+      // entering JS for this stuff.
+      Promise* nextPromise;
+      if (PromiseBinding::IsThenMethod(thenObj) &&
+          NS_SUCCEEDED(UNWRAP_OBJECT(Promise, valueObj, nextPromise))) {
+        // If we were taking the codepath that involves ThenableResolverTask and
+        // PromiseInit below, then eventually, in ThenableResolverTask::Run, we
+        // would create some JSFunctions in the compartment of
+        // this->GetWrapper() and pass them to the PromiseInit. So by the time
+        // we'd see the resolution value it would be wrapped into the
+        // compartment of this->GetWrapper().  The global of that compartment is
+        // this->GetGlobalJSObject(), so use that as the global for
+        // ResolvePromiseCallback/RejectPromiseCallback.
+        JS::Rooted<JSObject*> glob(aCx, GlobalJSObject());
+        nsRefPtr<PromiseCallback> resolveCb = new ResolvePromiseCallback(this, glob);
+        nsRefPtr<PromiseCallback> rejectCb = new RejectPromiseCallback(this, glob);
+        nsRefPtr<FastThenableResolverTask> task =
+          new FastThenableResolverTask(resolveCb, rejectCb, nextPromise);
+        DispatchToMicroTask(task);
+        return;
+      }
+
       nsRefPtr<PromiseInit> thenCallback =
         new PromiseInit(thenObj, mozilla::dom::GetIncumbentGlobal());
       nsRefPtr<ThenableResolverTask> task =
diff --git a/dom/promise/Promise.h b/dom/promise/Promise.h
index e74d923782a..28bf5c957b4 100644
--- a/dom/promise/Promise.h
+++ b/dom/promise/Promise.h
@@ -85,6 +85,7 @@ class Promise : public nsISupports,
   friend class RejectPromiseCallback;
   friend class ResolvePromiseCallback;
   friend class ThenableResolverTask;
+  friend class FastThenableResolverTask;
   friend class WrapperPromiseCallback;
 
 public:
diff --git a/dom/promise/tests/mochitest.ini b/dom/promise/tests/mochitest.ini
index 019353ba567..3b621b1e196 100644
--- a/dom/promise/tests/mochitest.ini
+++ b/dom/promise/tests/mochitest.ini
@@ -6,3 +6,4 @@
 [test_promise_utils.html]
 [test_resolve.html]
 [test_resolver_return_value.html]
+[test_thenable_vs_promise_ordering.html]
diff --git a/dom/promise/tests/test_thenable_vs_promise_ordering.html b/dom/promise/tests/test_thenable_vs_promise_ordering.html
new file mode 100644
index 00000000000..161e95d75bd
--- /dev/null
+++ b/dom/promise/tests/test_thenable_vs_promise_ordering.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for promise resolution ordering with thenables and promises</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+var t = async_test("A promise resolved first (with a thenable) should trigger its callbacks before a promise resolved second (with a promise).");
+t.step(function() {
+  var customThenCalled = false;
+  var p0 = Promise.resolve();
+  p0.then = function(resolved, rejected) {
+    customThenCalled = true;
+    Promise.prototype.then.call(this, resolved, rejected);
+  }
+  var p1 = new Promise(function(r) { r(p0); });
+  delete p0.then;
+  var p2 = new Promise(function(r) { r(p0); });
+  var resolutionOrder = "";
+  Promise.all([ p1.then(function() { resolutionOrder += "1"; }),
+                p2.then(function() { resolutionOrder += "2"; }) ])
+         .then(t.step_func_done(function() {
+           assert_true(customThenCalled, "Should have called custom then");
+           assert_equals(resolutionOrder, "12");
+         }));
+});
+</script>
diff --git a/dom/webidl/Promise.webidl b/dom/webidl/Promise.webidl
index 1f22f58e208..a98bca780c9 100644
--- a/dom/webidl/Promise.webidl
+++ b/dom/webidl/Promise.webidl
@@ -34,7 +34,7 @@ interface _Promise {
 
   // The [TreatNonCallableAsNull] annotation is required since then() should do
   // nothing instead of throwing errors when non-callable arguments are passed.
-  [NewObject]
+  [NewObject, MethodIdentityTestable]
   Promise<any> then([TreatNonCallableAsNull] optional AnyCallback? fulfillCallback = null,
                     [TreatNonCallableAsNull] optional AnyCallback? rejectCallback = null);
 

From a0c28e17ff8406b2a5ec1602d49821b0ff4b084f Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 Apr 2015 18:05:47 +0100
Subject: [PATCH 21/80] Bug 1153510 - Improve handling of vertical writing mode
 in SVG text frames. r=longsonr

---
 layout/svg/SVGTextFrame.cpp | 220 ++++++++++++++++++++++++++----------
 1 file changed, 161 insertions(+), 59 deletions(-)

diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp
index 3b8c2f6f3ec..f44fc508c01 100644
--- a/layout/svg/SVGTextFrame.cpp
+++ b/layout/svg/SVGTextFrame.cpp
@@ -340,13 +340,17 @@ GetBaselinePosition(nsTextFrame* aFrame,
                     uint8_t aDominantBaseline,
                     float aFontSizeScaleFactor)
 {
-  // use a dummy WritingMode, because nsTextFrame::GetLogicalBaseLine
-  // doesn't use it anyway
-  WritingMode writingMode;
+  WritingMode writingMode = aFrame->GetWritingMode();
+  gfxTextRun::Metrics metrics =
+    aTextRun->MeasureText(0, aTextRun->GetLength(), gfxFont::LOOSE_INK_EXTENTS,
+                          nullptr, nullptr);
+
   switch (aDominantBaseline) {
     case NS_STYLE_DOMINANT_BASELINE_HANGING:
     case NS_STYLE_DOMINANT_BASELINE_TEXT_BEFORE_EDGE:
-      return 0;
+      return writingMode.IsVerticalRL()
+             ? metrics.mAscent + metrics.mDescent : 0;
+
     case NS_STYLE_DOMINANT_BASELINE_USE_SCRIPT:
     case NS_STYLE_DOMINANT_BASELINE_NO_CHANGE:
     case NS_STYLE_DOMINANT_BASELINE_RESET_SIZE:
@@ -354,23 +358,24 @@ GetBaselinePosition(nsTextFrame* aFrame,
       // support the complex baseline model that SVG 1.1 has and which
       // css3-linebox now defines.
       // (fall through)
+
     case NS_STYLE_DOMINANT_BASELINE_AUTO:
     case NS_STYLE_DOMINANT_BASELINE_ALPHABETIC:
-      return aFrame->GetLogicalBaseline(writingMode);
+      return writingMode.IsVerticalRL()
+             ? metrics.mAscent + metrics.mDescent -
+               aFrame->GetLogicalBaseline(writingMode)
+             : aFrame->GetLogicalBaseline(writingMode);
+
     case NS_STYLE_DOMINANT_BASELINE_MIDDLE:
       return aFrame->GetLogicalBaseline(writingMode) -
         SVGContentUtils::GetFontXHeight(aFrame) / 2.0 *
         aFrame->PresContext()->AppUnitsPerCSSPixel() * aFontSizeScaleFactor;
-  }
 
-  gfxTextRun::Metrics metrics =
-    aTextRun->MeasureText(0, aTextRun->GetLength(), gfxFont::LOOSE_INK_EXTENTS,
-                          nullptr, nullptr);
-
-  switch (aDominantBaseline) {
     case NS_STYLE_DOMINANT_BASELINE_TEXT_AFTER_EDGE:
     case NS_STYLE_DOMINANT_BASELINE_IDEOGRAPHIC:
-      return metrics.mAscent + metrics.mDescent;
+      return writingMode.IsVerticalLR()
+             ? 0 : metrics.mAscent + metrics.mDescent;
+
     case NS_STYLE_DOMINANT_BASELINE_CENTRAL:
     case NS_STYLE_DOMINANT_BASELINE_MATHEMATICAL:
       return (metrics.mAscent + metrics.mDescent) / 2.0;
@@ -526,6 +531,14 @@ struct TextRenderedRun
     return GetTextRun()->IsRightToLeft();
   }
 
+  /**
+   * Returns whether this rendered run is vertical.
+   */
+  bool IsVertical() const
+  {
+    return GetTextRun()->IsVertical();
+  }
+
   /**
    * Returns the transform that converts from a <text> element's user space into
    * the coordinate space that rendered runs can be painted directly in.
@@ -746,8 +759,12 @@ struct TextRenderedRun
   /**
    * The point in user space that the text is positioned at.
    *
+   * For a horizontal run:
    * The x coordinate is the left edge of a LTR run of text or the right edge of
    * an RTL run.  The y coordinate is the baseline of the text.
+   * For a vertical run:
+   * The x coordinate is the baseline of the text.
+   * The y coordinate is the top edge of a LTR run, or bottom of RTL.
    */
   gfxPoint mPosition;
 
@@ -770,7 +787,7 @@ struct TextRenderedRun
 
   /**
    * The baseline in app units of this text run.  The measurement is from the
-   * top of the text frame.
+   * top of the text frame. (From the left edge if vertical.)
    */
   nscoord mBaseline;
 
@@ -816,10 +833,18 @@ TextRenderedRun::GetTransformFromUserSpaceForPainting(
   m.Scale(mLengthAdjustScaleFactor, 1.0);
 
   // Translation to get the text frame in the right place.
-  nsPoint t(IsRightToLeft() ?
-              -mFrame->GetRect().width + aItem.mRightEdge :
-              -aItem.mLeftEdge,
-            -mBaseline);
+  nsPoint t;
+  if (IsVertical()) {
+    t = nsPoint(-mBaseline,
+                IsRightToLeft()
+                  ? -mFrame->GetRect().height + aItem.mRightEdge
+                  : -aItem.mLeftEdge);
+  } else {
+    t = nsPoint(IsRightToLeft()
+                  ? -mFrame->GetRect().width + aItem.mRightEdge
+                  : -aItem.mLeftEdge,
+                -mBaseline);
+  }
   m.Translate(AppUnitsToGfxUnits(t, aContext));
 
   return m;
@@ -850,10 +875,18 @@ TextRenderedRun::GetTransformFromRunUserSpaceToUserSpace(
   m.Scale(mLengthAdjustScaleFactor, 1.0);
 
   // Translation to get the text frame in the right place.
-  nsPoint t(IsRightToLeft() ?
-              -mFrame->GetRect().width + left + right :
-              0,
-            -mBaseline);
+  nsPoint t;
+  if (IsVertical()) {
+    t = nsPoint(-mBaseline,
+                IsRightToLeft()
+                  ? -mFrame->GetRect().height + left + right
+                  : 0);
+  } else {
+    t = nsPoint(IsRightToLeft()
+                  ? -mFrame->GetRect().width + left + right
+                  : 0,
+                -mBaseline);
+  }
   m.Translate(AppUnitsToGfxUnits(t, aContext) *
                 cssPxPerDevPx / mFontSizeScaleFactor);
 
@@ -874,8 +907,10 @@ TextRenderedRun::GetTransformFromRunUserSpaceToFrameUserSpace(
 
   // Translate by the horizontal distance into the text frame this
   // rendered run is.
-  return m.Translate(gfxPoint(gfxFloat(left) / aContext->AppUnitsPerCSSPixel(),
-                              0));
+  gfxFloat appPerCssPx = aContext->AppUnitsPerCSSPixel();
+  gfxPoint t = IsVertical() ? gfxPoint(0, left / appPerCssPx)
+                            : gfxPoint(left / appPerCssPx, 0);
+  return m.Translate(t);
 }
 
 SVGBBox
@@ -895,8 +930,10 @@ TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
   // horizontally.
   nsRect self = mFrame->GetVisualOverflowRectRelativeToSelf();
   nsRect rect = mFrame->GetRect();
-  nscoord above = -self.y;
-  nscoord below = self.YMost() - rect.height;
+  bool vertical = IsVertical();
+  nscoord above = vertical ? -self.x : -self.y;
+  nscoord below = vertical ? self.XMost() - rect.width
+                           : self.YMost() - rect.height;
 
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
   gfxTextRun* textRun = mFrame->GetTextRun(nsTextFrame::eInflated);
@@ -932,6 +969,11 @@ TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
   }
   nsRect fillInAppUnits(x, baseline - above,
                         width, metrics.mBoundingBox.height + above + below);
+  if (textRun->IsVertical()) {
+    // Swap line-relative textMetrics dimensions to physical coordinates.
+    Swap(fillInAppUnits.x, fillInAppUnits.y);
+    Swap(fillInAppUnits.width, fillInAppUnits.height);
+  }
 
   // Account for text-shadow.
   if (aFlags & eIncludeTextShadow) {
@@ -949,7 +991,9 @@ TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
   // Scale the rectangle up due to any mFontSizeScaleFactor.  We scale
   // it around the text's origin.
   ScaleAround(fill,
-              gfxPoint(0.0, aContext->AppUnitsToFloatCSSPixels(baseline)),
+              textRun->IsVertical()
+                ? gfxPoint(aContext->AppUnitsToFloatCSSPixels(baseline), 0.0)
+                : gfxPoint(0.0, aContext->AppUnitsToFloatCSSPixels(baseline)),
               1.0 / mFontSizeScaleFactor);
 
   // Include the fill if requested.
@@ -1091,12 +1135,23 @@ TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
   gfxFloat ascent, descent;
   GetAscentAndDescentInAppUnits(mFrame, ascent, descent);
 
-  gfxFloat topEdge = mFrame->GetLogicalBaseline(mFrame->GetWritingMode()) - ascent;
-  gfxFloat bottomEdge = topEdge + ascent + descent;
-
-  if (p.y < aContext->AppUnitsToGfxUnits(topEdge) ||
-      p.y >= aContext->AppUnitsToGfxUnits(bottomEdge)) {
-    return -1;
+  WritingMode writingMode = mFrame->GetWritingMode();
+  if (writingMode.IsVertical()) {
+    gfxFloat leftEdge =
+      mFrame->GetLogicalBaseline(writingMode) -
+        (writingMode.IsVerticalRL() ? ascent : descent);
+    gfxFloat rightEdge = leftEdge + ascent + descent;
+    if (p.x < aContext->AppUnitsToGfxUnits(leftEdge) ||
+        p.x > aContext->AppUnitsToGfxUnits(rightEdge)) {
+      return -1;
+    }
+  } else {
+    gfxFloat topEdge = mFrame->GetLogicalBaseline(writingMode) - ascent;
+    gfxFloat bottomEdge = topEdge + ascent + descent;
+    if (p.y < aContext->AppUnitsToGfxUnits(topEdge) ||
+        p.y > aContext->AppUnitsToGfxUnits(bottomEdge)) {
+      return -1;
+    }
   }
 
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
@@ -1111,7 +1166,8 @@ TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
     aContext->AppUnitsToGfxUnits(textRun->GetAdvanceWidth(offset, length,
                                                           nullptr));
 
-  if (p.x < 0 || p.x >= runAdvance) {
+  gfxFloat pos = writingMode.IsVertical() ? p.y : p.x;
+  if (pos < 0 || pos >= runAdvance) {
     return -1;
   }
 
@@ -1124,8 +1180,8 @@ TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
     gfxFloat advance =
       aContext->AppUnitsToGfxUnits(textRun->GetAdvanceWidth(offset, length,
                                                             nullptr));
-    if ((rtl && p.x < runAdvance - advance) ||
-        (!rtl && p.x >= advance)) {
+    if ((rtl && pos < runAdvance - advance) ||
+        (!rtl && pos >= advance)) {
       return i;
     }
   }
@@ -4303,9 +4359,18 @@ SVGTextFrame::GetExtentOfChar(nsIContent* aContent,
   m.Rotate(mPositions[startIndex].mAngle);
   m.Scale(1 / mFontSizeScaleFactor, 1 / mFontSizeScaleFactor);
 
-  gfxRect glyphRect
-    (x, -presContext->AppUnitsToGfxUnits(ascent) * cssPxPerDevPx,
-     advance, presContext->AppUnitsToGfxUnits(ascent + descent) * cssPxPerDevPx);
+  gfxRect glyphRect;
+  if (it.TextRun()->IsVertical()) {
+    glyphRect =
+      gfxRect(-presContext->AppUnitsToGfxUnits(descent) * cssPxPerDevPx, x,
+              presContext->AppUnitsToGfxUnits(ascent + descent) * cssPxPerDevPx,
+              advance);
+  } else {
+    glyphRect =
+      gfxRect(x, -presContext->AppUnitsToGfxUnits(ascent) * cssPxPerDevPx,
+              advance,
+              presContext->AppUnitsToGfxUnits(ascent + descent) * cssPxPerDevPx);
+  }
 
   // Transform the glyph's rect into user space.
   gfxRect r = m.TransformBounds(glyphRect);
@@ -4609,11 +4674,21 @@ SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
 
     // Reset the position to the new frame's position.
     position = frit.Position();
-    if (textRun->IsRightToLeft()) {
-      position.x += frame->GetRect().width;
+    if (textRun->IsVertical()) {
+      if (textRun->IsRightToLeft()) {
+        position.y += frame->GetRect().height;
+      }
+      position.x += GetBaselinePosition(frame, textRun,
+                                        frit.DominantBaseline(),
+                                        mFontSizeScaleFactor);
+    } else {
+      if (textRun->IsRightToLeft()) {
+        position.x += frame->GetRect().width;
+      }
+      position.y += GetBaselinePosition(frame, textRun,
+                                        frit.DominantBaseline(),
+                                        mFontSizeScaleFactor);
     }
-    position.y += GetBaselinePosition(frame, textRun, frit.DominantBaseline(),
-                                      mFontSizeScaleFactor);
 
     // Any characters not in a frame, e.g. when display:none.
     for (uint32_t i = 0; i < frit.UndisplayedCharacters(); i++) {
@@ -4636,7 +4711,8 @@ SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
             !textRun->IsClusterStart(it.GetSkippedOffset()))) {
       nscoord advance = textRun->GetAdvanceWidth(it.GetSkippedOffset(), 1,
                                                  nullptr);
-      position.x += textRun->IsRightToLeft() ? -advance : advance;
+      (textRun->IsVertical() ? position.y : position.x) +=
+        textRun->IsRightToLeft() ? -advance : advance;
       aPositions.AppendElement(lastPosition);
       it.AdvanceOriginal(1);
     }
@@ -4651,7 +4727,8 @@ SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
         uint32_t length = ClusterLength(textRun, it);
         nscoord advance = textRun->GetAdvanceWidth(it.GetSkippedOffset(),
                                                    length, nullptr);
-        position.x += textRun->IsRightToLeft() ? -advance : advance;
+        (textRun->IsVertical() ? position.y : position.x) +=
+          textRun->IsRightToLeft() ? -advance : advance;
         lastPosition = position;
       }
       it.AdvanceOriginal(1);
@@ -4706,13 +4783,15 @@ ShiftAnchoredChunk(nsTArray<mozilla::CharPosition>& aCharPositions,
                    uint32_t aChunkEnd,
                    gfxFloat aLeftEdge,
                    gfxFloat aRightEdge,
-                   TextAnchorSide aAnchorSide)
+                   TextAnchorSide aAnchorSide,
+                   bool aVertical)
 {
   NS_ASSERTION(aLeftEdge <= aRightEdge, "unexpected anchored chunk edges");
   NS_ASSERTION(aChunkStart < aChunkEnd, "unexpected values for aChunkStart and "
                                         "aChunkEnd");
 
-  gfxFloat shift = aCharPositions[aChunkStart].mPosition.x;
+  gfxFloat shift = aVertical ? aCharPositions[aChunkStart].mPosition.y
+                             : aCharPositions[aChunkStart].mPosition.x;
   switch (aAnchorSide) {
     case eAnchorLeft:
       shift -= aLeftEdge;
@@ -4728,8 +4807,14 @@ ShiftAnchoredChunk(nsTArray<mozilla::CharPosition>& aCharPositions,
   }
 
   if (shift != 0.0) {
-    for (uint32_t i = aChunkStart; i < aChunkEnd; i++) {
-      aCharPositions[i].mPosition.x += shift;
+    if (aVertical) {
+      for (uint32_t i = aChunkStart; i < aChunkEnd; i++) {
+        aCharPositions[i].mPosition.y += shift;
+      }
+    } else {
+      for (uint32_t i = aChunkStart; i < aChunkEnd; i++) {
+        aCharPositions[i].mPosition.x += shift;
+      }
     }
   }
 }
@@ -4781,6 +4866,9 @@ SVGTextFrame::AdjustPositionsForClusters()
       it.GetGlyphPartialAdvance(partLength, presContext) / mFontSizeScaleFactor;
     gfxPoint direction = gfxPoint(cos(angle), sin(angle)) *
                          (it.TextRun()->IsRightToLeft() ? -1.0 : 1.0);
+    if (it.TextRun()->IsVertical()) {
+      Swap(direction.x, direction.y);
+    }
     mPositions[charIndex].mPosition = mPositions[startIndex].mPosition +
                                       direction * advance;
 
@@ -4923,7 +5011,9 @@ SVGTextFrame::DoTextPathLayout()
       gfxFloat halfAdvance =
         it.GetGlyphAdvance(context) / mFontSizeScaleFactor / 2.0;
       gfxFloat sign = it.TextRun()->IsRightToLeft() ? -1.0 : 1.0;
-      gfxFloat midx = mPositions[i].mPosition.x + sign * halfAdvance + offset;
+      gfxFloat midx = (it.TextRun()->IsVertical() ? mPositions[i].mPosition.y
+                                                  : mPositions[i].mPosition.x) +
+                      sign * halfAdvance + offset;
 
       // Hide the character if it falls off the end of the path.
       mPositions[i].mHidden = midx < 0 || midx > pathLength;
@@ -4969,6 +5059,7 @@ SVGTextFrame::DoAnchoring()
     it.Next();
   }
 
+  bool vertical = GetWritingMode().IsVertical();
   uint32_t start = it.TextElementCharIndex();
   while (start < mPositions.Length()) {
     it.AdvanceToCharacter(start);
@@ -4983,12 +5074,15 @@ SVGTextFrame::DoAnchoring()
     do {
       if (!it.IsOriginalCharSkipped() && !it.IsOriginalCharTrimmed()) {
         gfxFloat advance = it.GetAdvance(presContext) / mFontSizeScaleFactor;
+        gfxFloat pos =
+          it.TextRun()->IsVertical() ? mPositions[index].mPosition.y
+                                     : mPositions[index].mPosition.x;
         if (it.TextRun()->IsRightToLeft()) {
-          left  = std::min(left,  mPositions[index].mPosition.x - advance);
-          right = std::max(right, mPositions[index].mPosition.x);
+          left  = std::min(left,  pos - advance);
+          right = std::max(right, pos);
         } else {
-          left  = std::min(left,  mPositions[index].mPosition.x);
-          right = std::max(right, mPositions[index].mPosition.x + advance);
+          left  = std::min(left,  pos);
+          right = std::max(right, pos + advance);
         }
       }
       it.Next();
@@ -5002,7 +5096,8 @@ SVGTextFrame::DoAnchoring()
         ConvertLogicalTextAnchorToPhysical(chunkFrame->StyleSVG()->mTextAnchor,
                                            isRTL);
 
-      ShiftAnchoredChunk(mPositions, start, end, left, right, anchor);
+      ShiftAnchoredChunk(mPositions, start, end, left, right, anchor,
+                         vertical);
     }
 
     start = it.TextElementCharIndex();
@@ -5073,6 +5168,7 @@ SVGTextFrame::DoGlyphPositioning()
   }
 
   nsPresContext* presContext = PresContext();
+  bool vertical = GetWritingMode().IsVertical();
 
   float cssPxPerDevPx = presContext->
     AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
@@ -5083,9 +5179,10 @@ SVGTextFrame::DoGlyphPositioning()
   double adjustment = 0.0;
   mLengthAdjustScaleFactor = 1.0f;
   if (adjustingTextLength) {
-    nscoord frameWidth = GetFirstPrincipalChild()->GetRect().width;
+    nscoord frameLength = vertical ? GetFirstPrincipalChild()->GetRect().height
+                                   : GetFirstPrincipalChild()->GetRect().width;
     float actualTextLength =
-      static_cast<float>(presContext->AppUnitsToGfxUnits(frameWidth) * factor);
+      static_cast<float>(presContext->AppUnitsToGfxUnits(frameLength) * factor);
 
     nsRefPtr<SVGAnimatedEnumeration> lengthAdjustEnum = element->LengthAdjust();
     uint16_t lengthAdjust = lengthAdjustEnum->AnimVal();
@@ -5119,14 +5216,16 @@ SVGTextFrame::DoGlyphPositioning()
     mPositions[0].mPosition += deltas[0];
   }
 
+  gfxFloat xLengthAdjustFactor = vertical ? 1.0 : mLengthAdjustScaleFactor;
+  gfxFloat yLengthAdjustFactor = vertical ? mLengthAdjustScaleFactor : 1.0;
   for (uint32_t i = 1; i < mPositions.Length(); i++) {
     // Fill in unspecified x position.
     if (!mPositions[i].IsXSpecified()) {
       nscoord d = charPositions[i].x - charPositions[i - 1].x;
       mPositions[i].mPosition.x =
         mPositions[i - 1].mPosition.x +
-        presContext->AppUnitsToGfxUnits(d) * factor * mLengthAdjustScaleFactor;
-      if (!mPositions[i].mUnaddressable) {
+        presContext->AppUnitsToGfxUnits(d) * factor * xLengthAdjustFactor;
+      if (!vertical && !mPositions[i].mUnaddressable) {
         mPositions[i].mPosition.x += adjustment;
       }
     }
@@ -5135,7 +5234,10 @@ SVGTextFrame::DoGlyphPositioning()
       nscoord d = charPositions[i].y - charPositions[i - 1].y;
       mPositions[i].mPosition.y =
         mPositions[i - 1].mPosition.y +
-        presContext->AppUnitsToGfxUnits(d) * factor;
+        presContext->AppUnitsToGfxUnits(d) * factor * yLengthAdjustFactor;
+      if (vertical && !mPositions[i].mUnaddressable) {
+        mPositions[i].mPosition.y += adjustment;
+      }
     }
     // Add in dx/dy.
     if (i < deltas.Length()) {

From 201d731d72be80bcd24af84a8e74d45175411d0d Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 20 Apr 2015 16:17:00 -0400
Subject: [PATCH 22/80] Bug 1095098 - followup - add back some static analysis
 attributes lost in a rebase; r=me

---
 xpcom/base/nsQueryObject.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xpcom/base/nsQueryObject.h b/xpcom/base/nsQueryObject.h
index dceabeb69a9..31e842bfd2e 100644
--- a/xpcom/base/nsQueryObject.h
+++ b/xpcom/base/nsQueryObject.h
@@ -7,13 +7,15 @@
 #ifndef nsQueryObject_h
 #define nsQueryObject_h
 
+#include "mozilla/Attributes.h"
+
 #include "nsCOMPtr.h"
 #include "nsRefPtr.h"
 
 /*****************************************************************************/
 
 template<class T>
-class nsQueryObject : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryObject : public nsCOMPtr_helper
 {
 public:
   explicit nsQueryObject(T* aRawPtr)
@@ -29,11 +31,11 @@ public:
     return status;
   }
 private:
-  T* mRawPtr;
+  T* MOZ_NON_OWNING_REF mRawPtr;
 };
 
 template<class T>
-class nsQueryObjectWithError : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryObjectWithError : public nsCOMPtr_helper
 {
 public:
   nsQueryObjectWithError(T* aRawPtr, nsresult* aErrorPtr)
@@ -52,7 +54,7 @@ public:
     return status;
   }
 private:
-  T* mRawPtr;
+  T* MOZ_NON_OWNING_REF mRawPtr;
   nsresult* mErrorPtr;
 };
 

From fe6fabf75f5a1a23e873977a2c60eaa2be713c59 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Wed, 15 Apr 2015 16:24:28 -0600
Subject: [PATCH 23/80] Bug 1155241: Check mInstanceOwner for nullptr in
 nsObjectLoadingContent::PluginDestroyed; r=smaug

---
 dom/base/nsObjectLoadingContent.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp
index ae0cf344fdf..ef0da898391 100644
--- a/dom/base/nsObjectLoadingContent.cpp
+++ b/dom/base/nsObjectLoadingContent.cpp
@@ -2733,8 +2733,10 @@ nsObjectLoadingContent::PluginDestroyed()
   // plugins in plugin host. Invalidate instance owner / prototype but otherwise
   // don't take any action.
   TeardownProtoChain();
-  mInstanceOwner->Destroy();
-  mInstanceOwner = nullptr;
+  if (mInstanceOwner) {
+    mInstanceOwner->Destroy();
+    mInstanceOwner = nullptr;
+  }
   return NS_OK;
 }
 

From 69abaadedfc0fd5ec1e30ffe4146902d933cd47f Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 20 Apr 2015 14:12:41 -0700
Subject: [PATCH 24/80] Backed out 3 changesets (bug 1141867) for reftest
 orange CLOSED TREE

Backed out changeset 8dcfc3ace301 (bug 1141867)
Backed out changeset aeaa345b9aeb (bug 1141867)
Backed out changeset b1091955192c (bug 1141867)
---
 layout/generic/nsBlockReflowState.cpp         | 35 +++---------
 .../floats/orthogonal-floats-1-ref.html       | 39 -------------
 .../reftests/floats/orthogonal-floats-1a.html | 54 ------------------
 .../reftests/floats/orthogonal-floats-1b.html | 54 ------------------
 .../reftests/floats/orthogonal-floats-1c.html | 56 -------------------
 .../reftests/floats/orthogonal-floats-1d.html | 56 -------------------
 layout/reftests/floats/reftest.list           |  4 --
 7 files changed, 8 insertions(+), 290 deletions(-)
 delete mode 100644 layout/reftests/floats/orthogonal-floats-1-ref.html
 delete mode 100644 layout/reftests/floats/orthogonal-floats-1a.html
 delete mode 100644 layout/reftests/floats/orthogonal-floats-1b.html
 delete mode 100644 layout/reftests/floats/orthogonal-floats-1c.html
 delete mode 100644 layout/reftests/floats/orthogonal-floats-1d.html

diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index dec4dd337cd..119a770dcc5 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -642,11 +642,6 @@ nsBlockReflowState::CanPlaceFloat(nscoord aFloatISize,
       aFloatISize;
 }
 
-// Return the inline-size that the float (including margins) will take up
-// in the writing mode of the containing block. If this returns
-// NS_UNCONSTRAINEDSIZE, we're dealing with an orthogonal block that
-// has block-size:auto, and we'll need to actually reflow it to find out
-// how much inline-size it will occupy in the containing block's mode.
 static nscoord
 FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
                  nscoord aFloatAvailableISize,
@@ -668,17 +663,9 @@ FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
               aFloatOffsetState.ComputedLogicalPadding().Size(wm),
               nsIFrame::ComputeSizeFlags::eShrinkWrap);
 
-  WritingMode cbwm = aCBReflowState.GetWritingMode();
-  nscoord floatISize = floatSize.ConvertTo(cbwm, wm).ISize(cbwm);
-  if (floatISize == NS_UNCONSTRAINEDSIZE) {
-    return NS_UNCONSTRAINEDSIZE; // reflow is needed to get the true size
-  }
-
-  return floatISize +
-         aFloatOffsetState.ComputedLogicalMargin().Size(wm).
-           ConvertTo(cbwm, wm).ISize(cbwm) +
-         aFloatOffsetState.ComputedLogicalBorderPadding().Size(wm).
-           ConvertTo(cbwm, wm).ISize(cbwm);
+  return floatSize.ISize(wm) +
+         aFloatOffsetState.ComputedLogicalMargin().IStartEnd(wm) +
+         aFloatOffsetState.ComputedLogicalBorderPadding().IStartEnd(wm);
 }
 
 bool
@@ -734,20 +721,14 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
   // If it's a floating first-letter, we need to reflow it before we
   // know how wide it is (since we don't compute which letters are part
   // of the first letter until reflow!).
-  // We also need to do this early reflow if FloatMarginISize returned
-  // an unconstrained inline-size, which can occur if the float had an
-  // orthogonal writing mode and 'auto' block-size (in its mode).
-  bool earlyFloatReflow =
-    aFloat->GetType() == nsGkAtoms::letterFrame ||
-    floatMarginISize == NS_UNCONSTRAINEDSIZE;
-  if (earlyFloatReflow) {
+  bool isLetter = aFloat->GetType() == nsGkAtoms::letterFrame;
+  if (isLetter) {
     mBlock->ReflowFloat(*this, adjustedAvailableSpace, aFloat, floatMargin,
                         floatOffsets, false, reflowStatus);
     floatMarginISize = aFloat->ISize(wm) + floatMargin.IStartEnd(wm);
     NS_ASSERTION(NS_FRAME_IS_COMPLETE(reflowStatus),
-                 "letter frames and orthogonal floats with auto block-size "
-                 "shouldn't break, and if they do now, then they're breaking "
-                 "at the wrong point");
+                 "letter frames shouldn't break, and if they do now, "
+                 "then they're breaking at the wrong point");
   }
 
   // Find a place to place the float. The CSS2 spec doesn't want
@@ -872,7 +853,7 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
 
   // Reflow the float after computing its vertical position so it knows
   // where to break.
-  if (!earlyFloatReflow) {
+  if (!isLetter) {
     bool pushedDown = mBCoord != saveBCoord;
     mBlock->ReflowFloat(*this, adjustedAvailableSpace, aFloat, floatMargin,
                         floatOffsets, pushedDown, reflowStatus);
diff --git a/layout/reftests/floats/orthogonal-floats-1-ref.html b/layout/reftests/floats/orthogonal-floats-1-ref.html
deleted file mode 100644
index a5ccc8a3c85..00000000000
--- a/layout/reftests/floats/orthogonal-floats-1-ref.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
-  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
-  <meta charset="utf-8">
-  <style type="text/css">
-  body {
-    margin: 8px;
-  }
-  p {
-    clear: both;
-  }
-  div#dummy {
-    height: 100px;
-    float: right;
-  }
-  div#reference {
-    background-color: green;
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    z-index: -1;
-  }
-  </style>
- </head>
-
- <body>
-
-  <div id="dummy"></div>
-
-  <div id="reference"></div>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
- </body>
-</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1a.html b/layout/reftests/floats/orthogonal-floats-1a.html
deleted file mode 100644
index 87aa34da588..00000000000
--- a/layout/reftests/floats/orthogonal-floats-1a.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
-  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
-  <meta charset="utf-8">
-  <style type="text/css">
-  body {
-    margin: 8px;
-  }
-  p {
-    clear: both;
-  }
-  div.floated-right {
-    background: green;
-    color: green;
-    inline-size: 100px;
-    block-size: 20px;
-    float: right;
-    -ah-writing-mode: vertical-rl;
-    -webkit-writing-mode: vertical-rl;
-    writing-mode: tb-rl; /* IE 11 */
-    writing-mode: vertical-rl;
-  }
-  div#reference-overlapped-red {
-    background-color: red;
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    z-index: -1;
-  }
-  </style>
- </head>
-
- <body>
-
-  <div class="floated-right">abcde</div>
-
-  <div class="floated-right">fghijk</div>
-
-  <div class="floated-right">lmnopq</div>
-
-  <div class="floated-right">rstuv</div>
-
-  <div class="floated-right">wxyz!</div>
-
-  <div id="reference-overlapped-red"></div>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
- </body>
-</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1b.html b/layout/reftests/floats/orthogonal-floats-1b.html
deleted file mode 100644
index f4890f32d1a..00000000000
--- a/layout/reftests/floats/orthogonal-floats-1b.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
-  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
-  <meta charset="utf-8">
-  <style type="text/css">
-  body {
-    margin: 8px;
-  }
-  p {
-    clear: both;
-  }
-  div.floated-right {
-    background: green;
-    color: green;
-    inline-size: 100px;
-    block-size: 20px;
-    float: right;
-    -ah-writing-mode: vertical-lr;
-    -webkit-writing-mode: vertical-lr;
-    writing-mode: tb-lr; /* IE 11 */
-    writing-mode: vertical-lr;
-  }
-  div#reference-overlapped-red {
-    background-color: red;
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    z-index: -1;
-  }
-  </style>
- </head>
-
- <body>
-
-  <div class="floated-right">abcde</div>
-
-  <div class="floated-right">fghijk</div>
-
-  <div class="floated-right">lmnopq</div>
-
-  <div class="floated-right">rstuv</div>
-
-  <div class="floated-right">wxyz!</div>
-
-  <div id="reference-overlapped-red"></div>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
- </body>
-</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1c.html b/layout/reftests/floats/orthogonal-floats-1c.html
deleted file mode 100644
index 4d8f77b032c..00000000000
--- a/layout/reftests/floats/orthogonal-floats-1c.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
-  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
-  <style type="text/css">
-  <meta charset="utf-8">
-  @font-face {
-    font-family: Ahem;
-    src: url(../fonts/Ahem.ttf);
-  }
-  body {
-    margin: 8px;
-  }
-  p {
-    clear: both;
-  }
-  div.floated-right {
-    color: green;
-    float: right;
-    -ah-writing-mode: vertical-rl;
-    -webkit-writing-mode: vertical-rl;
-    writing-mode: tb-rl; /* IE 11 */
-    writing-mode: vertical-rl;
-    font: 20px/20px Ahem;
-  }
-  div#reference-overlapped-red {
-    background-color: red;
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    z-index: -1;
-  }
-  </style>
- </head>
-
- <body>
-
-  <div class="floated-right">abcde</div>
-
-  <div class="floated-right">fghij</div>
-
-  <div class="floated-right">klmno</div>
-
-  <div class="floated-right">qrstu</div>
-
-  <div class="floated-right">vwxyz</div>
-
-  <div id="reference-overlapped-red"></div>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
- </body>
-</html>
diff --git a/layout/reftests/floats/orthogonal-floats-1d.html b/layout/reftests/floats/orthogonal-floats-1d.html
deleted file mode 100644
index 97a22e1a666..00000000000
--- a/layout/reftests/floats/orthogonal-floats-1d.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Bug 1141867 - Contiguous right-floating boxes with vertical writing mode</title>
-  <!-- based on testcases from Gérard Talbot, see https://bugzilla.mozilla.org/show_bug.cgi?id=1141867 -->
-  <meta charset="utf-8">
-  <style type="text/css">
-  @font-face {
-    font-family: Ahem;
-    src: url(../fonts/Ahem.ttf);
-  }
-  body {
-    margin: 8px;
-  }
-  p {
-    clear: both;
-  }
-  div.floated-right {
-    color: green;
-    float: right;
-    -ah-writing-mode: vertical-lr;
-    -webkit-writing-mode: vertical-lr;
-    writing-mode: tb-lr; /* IE 11 */
-    writing-mode: vertical-lr;
-    font: 20px/20px Ahem;
-  }
-  div#reference-overlapped-red {
-    background-color: red;
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    z-index: -1;
-  }
-  </style>
- </head>
-
- <body>
-
-  <div class="floated-right">abcde</div>
-
-  <div class="floated-right">fghij</div>
-
-  <div class="floated-right">klmno</div>
-
-  <div class="floated-right">qrstu</div>
-
-  <div class="floated-right">vwxyz</div>
-
-  <div id="reference-overlapped-red"></div>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
- </body>
-</html>
diff --git a/layout/reftests/floats/reftest.list b/layout/reftests/floats/reftest.list
index fb7a8fa0c33..c915e365d5b 100644
--- a/layout/reftests/floats/reftest.list
+++ b/layout/reftests/floats/reftest.list
@@ -35,7 +35,3 @@ fails == 345369-2.html 345369-2-ref.html
 == float-in-rtl-4b.html float-in-rtl-4-ref.html
 == float-in-rtl-4c.html float-in-rtl-4-ref.html
 == float-in-rtl-4d.html float-in-rtl-4-ref.html
-fuzzy-if(Android,16,2) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
-== orthogonal-floats-1b.html orthogonal-floats-1-ref.html
-fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1c.html orthogonal-floats-1-ref.html
-fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1d.html orthogonal-floats-1-ref.html

From 75a0893034a38a33400237299574f52b17d6ca85 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Mon, 6 Apr 2015 23:48:55 +0100
Subject: [PATCH 25/80] Bug 1149990 - Support replaying of finished CSS
 transitions by supporting setting of currentTime/startTime. r=birtles

---
 dom/animation/AnimationPlayer.cpp    | 3 +++
 dom/animation/KeyframeEffect.h       | 4 ++--
 layout/style/nsTransitionManager.cpp | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dom/animation/AnimationPlayer.cpp b/dom/animation/AnimationPlayer.cpp
index 6ac038b75ab..5e3037247d9 100644
--- a/dom/animation/AnimationPlayer.cpp
+++ b/dom/animation/AnimationPlayer.cpp
@@ -697,6 +697,9 @@ AnimationPlayer::UpdateFinishedState(bool aSeekFlag)
   } else if (!currentFinishedState && mIsPreviousStateFinished) {
     // Clear finished promise. We'll create a new one lazily.
     mFinished = nullptr;
+    if (mEffect->AsTransition()) {
+      mEffect->SetIsFinishedTransition(false);
+    }
   }
   mIsPreviousStateFinished = currentFinishedState;
   // We must recalculate the current time to take account of any mHoldTime
diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
index 24f71f12f47..2531b41452b 100644
--- a/dom/animation/KeyframeEffect.h
+++ b/dom/animation/KeyframeEffect.h
@@ -300,10 +300,10 @@ public:
     return mIsFinishedTransition;
   }
 
-  void SetIsFinishedTransition() {
+  void SetIsFinishedTransition(bool aIsFinished) {
     MOZ_ASSERT(AsTransition(),
                "Calling SetIsFinishedTransition but it's not a transition");
-    mIsFinishedTransition = true;
+    mIsFinishedTransition = aIsFinished;
   }
 
   bool IsInPlay(const AnimationPlayer& aPlayer) const;
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 6061e8e4400..63eaae79e06 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -831,7 +831,7 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
             // a non-animation style change that would affect it, we need
             // to know not to start a new transition for the transition
             // from the almost-completed value to the final value.
-            player->GetEffect()->SetIsFinishedTransition();
+            player->GetEffect()->SetIsFinishedTransition(true);
             collection->UpdateAnimationGeneration(mPresContext);
             transitionStartedOrEnded = true;
           } else if ((computedTiming.mPhase ==

From 15f78f02f99520639fbcda6c3da6f0d332220f37 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Mon, 20 Apr 2015 08:33:10 -0700
Subject: [PATCH 26/80] Bug 1156093 - Make sure service stops when Tab Queue
 open now button is pressed (r=rnewman)

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

diff --git a/mobile/android/base/tabqueue/TabQueueService.java b/mobile/android/base/tabqueue/TabQueueService.java
index be585ecbd50..f6a2fb90d1a 100644
--- a/mobile/android/base/tabqueue/TabQueueService.java
+++ b/mobile/android/base/tabqueue/TabQueueService.java
@@ -138,6 +138,7 @@ public class TabQueueService extends Service {
                 startActivity(forwardIntent);
 
                 removeView();
+                stopSelfResult(startId);
             }
         });
 

From 3abab099e17314f49a7d5c4d333dc7f08bcadd57 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Mon, 20 Apr 2015 12:29:37 +0200
Subject: [PATCH 27/80] Bug 1129498 - Replace remove_all_bookmarks() with
 .eraseEverything() r=mak

---
 .../unit/test_leftpane_corruption_handling.js |  24 +-
 .../test_417228-exclude-from-backup.js        |   2 +-
 .../components/places/tests/head_common.js    |  14 --
 .../places/tests/inline/head_autocomplete.js  |   6 +-
 .../places/tests/queries/test_async.js        |   4 +-
 .../places/tests/queries/test_redirects.js    |   4 +-
 .../places/tests/queries/test_sorting.js      |   2 +-
 .../places/tests/queries/test_tags.js         |   2 +-
 .../unifiedcomplete/head_autocomplete.js      |   2 +-
 .../places/tests/unit/test_412132.js          |   8 +-
 .../tests/unit/test_adaptive_bug527311.js     |   7 +-
 .../unit/test_asyncExecuteLegacyQueries.js    |   9 +-
 .../places/tests/unit/test_bookmarks_html.js  |  14 +-
 .../tests/unit/test_bookmarks_html_corrupt.js |   2 +-
 .../places/tests/unit/test_bookmarks_json.js  |   6 +-
 .../test_bookmarks_restore_notification.js    |   9 +-
 .../places/tests/unit/test_frecency.js        |   2 +-
 .../tests/unit/test_pageGuid_bookmarkGuid.js  |  12 +-
 .../unit/test_removeVisitsByTimeframe.js      |   2 +-
 .../unit/test_update_frecency_after_delete.js | 222 +++++++++---------
 .../test_utils_getURLsForContainerNode.js     |  15 +-
 21 files changed, 173 insertions(+), 195 deletions(-)

diff --git a/browser/components/places/tests/unit/test_leftpane_corruption_handling.js b/browser/components/places/tests/unit/test_leftpane_corruption_handling.js
index 144a732e03e..4d665096e57 100644
--- a/browser/components/places/tests/unit/test_leftpane_corruption_handling.js
+++ b/browser/components/places/tests/unit/test_leftpane_corruption_handling.js
@@ -8,9 +8,16 @@
  * Tests that we build a working leftpane in various corruption situations.
  */
 
-function run_test() {
+// Used to store the original leftPaneFolderId getter.
+let gLeftPaneFolderIdGetter;
+let gAllBookmarksFolderIdGetter;
+// Used to store the original left Pane status as a JSON string.
+let gReferenceHierarchy;
+let gLeftPaneFolderId;
+
+add_task(function* () {
   // We want empty roots.
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 
   // Sanity check.
   Assert.ok(!!PlacesUIUtils);
@@ -21,17 +28,8 @@ function run_test() {
   gAllBookmarksFolderIdGetter = Object.getOwnPropertyDescriptor(PlacesUIUtils, "allBookmarksFolderId");
   Assert.equal(typeof(gAllBookmarksFolderIdGetter.get), "function");
 
-  run_next_test();
-}
-
-do_register_cleanup(remove_all_bookmarks);
-
-// Used to store the original leftPaneFolderId getter.
-let gLeftPaneFolderIdGetter;
-let gAllBookmarksFolderIdGetter;
-// Used to store the original left Pane status as a JSON string.
-let gReferenceHierarchy;
-let gLeftPaneFolderId;
+  do_register_cleanup(() => PlacesUtils.bookmarks.eraseEverything());
+});
 
 add_task(function* () {
   // Add a third party bogus annotated item.  Should not be removed.
diff --git a/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js b/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
index 48c597a9c8d..7e155b15cf0 100644
--- a/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
+++ b/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
@@ -127,7 +127,7 @@ add_task(function() {
   test.validate(false);
 
   // cleanup
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   // manually remove the excluded root
   PlacesUtils.bookmarks.removeItem(test._excludeRootId);
   // restore json file
diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js
index 9e27e30c72e..238687b10f2 100644
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -330,20 +330,6 @@ function visits_in_database(aURI)
   }
 }
 
-/**
- * Removes all bookmarks and checks for correct cleanup
- */
-function remove_all_bookmarks() {
-  let PU = PlacesUtils;
-  // Clear all bookmarks
-  PU.bookmarks.removeFolderChildren(PU.bookmarks.bookmarksMenuFolder);
-  PU.bookmarks.removeFolderChildren(PU.bookmarks.toolbarFolder);
-  PU.bookmarks.removeFolderChildren(PU.bookmarks.unfiledBookmarksFolder);
-  // Check for correct cleanup
-  check_no_bookmarks();
-}
-
-
 /**
  * Checks that we don't have any bookmark
  */
diff --git a/toolkit/components/places/tests/inline/head_autocomplete.js b/toolkit/components/places/tests/inline/head_autocomplete.js
index 71c44183456..787902cc0b2 100644
--- a/toolkit/components/places/tests/inline/head_autocomplete.js
+++ b/toolkit/components/places/tests/inline/head_autocomplete.js
@@ -140,8 +140,10 @@ function ensure_results(aSearchString, aExpectedValue) {
       }
 
       // Cleanup.
-      remove_all_bookmarks();
-      PlacesTestUtils.clearHistory().then(resolve);
+      Promise.all([
+        PlacesUtils.bookmarks.eraseEverything(),
+        PlacesTestUtils.clearHistory()
+      ]).then(resolve);
     };
   });
 
diff --git a/toolkit/components/places/tests/queries/test_async.js b/toolkit/components/places/tests/queries/test_async.js
index b3eeba1a790..a419664ea42 100644
--- a/toolkit/components/places/tests/queries/test_async.js
+++ b/toolkit/components/places/tests/queries/test_async.js
@@ -353,7 +353,7 @@ function run_test()
 add_task(function* test_async()
 {
   for (let [, test] in Iterator(tests)) {
-    remove_all_bookmarks();
+    yield PlacesUtils.bookmarks.eraseEverything();
 
     test.__proto__ = new Test();
     yield test.setup();
@@ -362,6 +362,6 @@ add_task(function* test_async()
     yield test.run();
   }
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   print("All tests done, exiting");
 });
diff --git a/toolkit/components/places/tests/queries/test_redirects.js b/toolkit/components/places/tests/queries/test_redirects.js
index 1abf152b9bc..597de8e4b9c 100644
--- a/toolkit/components/places/tests/queries/test_redirects.js
+++ b/toolkit/components/places/tests/queries/test_redirects.js
@@ -187,7 +187,7 @@ function run_test()
  */
 add_task(function test_add_visits_to_database()
 {
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 
   // We don't really bother on this, but we need a time to add visits.
   let timeInMicroseconds = Date.now() * 1000;
@@ -298,7 +298,7 @@ add_task(function test_redirects()
   cartProd([includeHidden_options, maxResults_options, sorting_options],
            check_results_callback);
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 
   yield PlacesTestUtils.clearHistory();
 });
diff --git a/toolkit/components/places/tests/queries/test_sorting.js b/toolkit/components/places/tests/queries/test_sorting.js
index a5ca67586ce..c92f2524568 100644
--- a/toolkit/components/places/tests/queries/test_sorting.js
+++ b/toolkit/components/places/tests/queries/test_sorting.js
@@ -1278,7 +1278,7 @@ add_task(function test_sorting()
     // sorting reversed, usually SORT_BY have ASC and DESC
     test.check_reverse();
     // Execute cleanup tasks
-    remove_all_bookmarks();
+    yield PlacesUtils.bookmarks.eraseEverything();
     yield PlacesTestUtils.clearHistory();
   }
 });
diff --git a/toolkit/components/places/tests/queries/test_tags.js b/toolkit/components/places/tests/queries/test_tags.js
index b4d2b8c75c1..7974ae26aa1 100644
--- a/toolkit/components/places/tests/queries/test_tags.js
+++ b/toolkit/components/places/tests/queries/test_tags.js
@@ -554,7 +554,7 @@ function addBookmark(aURI) {
  * Asynchronous task that removes all pages from history and bookmarks.
  */
 function* task_cleanDatabase(aCallback) {
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 }
 
diff --git a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
index 8ade81ef3d6..7dab8e51400 100644
--- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
@@ -32,7 +32,7 @@ function* cleanup() {
   for (let type of ["history", "bookmark", "history.onlyTyped", "openpage"]) {
     Services.prefs.clearUserPref("browser.urlbar.suggest." + type);
   }
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 }
 do_register_cleanup(cleanup);
diff --git a/toolkit/components/places/tests/unit/test_412132.js b/toolkit/components/places/tests/unit/test_412132.js
index f839904985c..7a72e97de76 100644
--- a/toolkit/components/places/tests/unit/test_412132.js
+++ b/toolkit/components/places/tests/unit/test_412132.js
@@ -33,7 +33,7 @@ add_task(function changeuri_unvisited_bookmark()
   do_print("Unvisited URI no longer bookmarked => frecency should = 0");
   do_check_eq(frecencyForUrl(TEST_URI), 0);
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 });
 
@@ -63,7 +63,7 @@ add_task(function changeuri_visited_bookmark()
   do_print("*Visited* URI no longer bookmarked => frecency should != 0");
   do_check_neq(frecencyForUrl(TEST_URI), 0);
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 });
 
@@ -94,7 +94,7 @@ add_task(function changeuri_bookmark_still_bookmarked()
   do_print("URI still bookmarked => frecency should != 0");
   do_check_neq(frecencyForUrl(TEST_URI), 0);
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 });
 
@@ -126,7 +126,7 @@ add_task(function changeuri_nonexistent_bookmark()
   PlacesUtils.bookmarks.removeItem(id);
   tryChange(id);
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 });
 
diff --git a/toolkit/components/places/tests/unit/test_adaptive_bug527311.js b/toolkit/components/places/tests/unit/test_adaptive_bug527311.js
index e8621146b3f..348add2c7b8 100644
--- a/toolkit/components/places/tests/unit/test_adaptive_bug527311.js
+++ b/toolkit/components/places/tests/unit/test_adaptive_bug527311.js
@@ -89,9 +89,10 @@ function check_results() {
                 Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH);
     do_check_eq(controller.matchCount, 0);
 
-    remove_all_bookmarks();
-    cleanup();
-    do_test_finished();
+    PlacesUtils.bookmarks.eraseEverything().then(() => {
+      cleanup();
+      do_test_finished();
+    });
  };
 
   controller.startSearch(SEARCH_STRING);
diff --git a/toolkit/components/places/tests/unit/test_asyncExecuteLegacyQueries.js b/toolkit/components/places/tests/unit/test_asyncExecuteLegacyQueries.js
index 7d76c1464d0..43f121c07f1 100644
--- a/toolkit/components/places/tests/unit/test_asyncExecuteLegacyQueries.js
+++ b/toolkit/components/places/tests/unit/test_asyncExecuteLegacyQueries.js
@@ -88,9 +88,8 @@ function run_next_test() {
     return;
   }
 
-  let test = tests.shift();
-  PlacesTestUtils.clearHistory().then(function() {
-    remove_all_bookmarks();
-    do_execute_soon(test);
-  });
+  Promise.all([
+    PlacesTestUtils.clearHistory(),
+    PlacesUtils.bookmarks.eraseEverything()
+  ]).then(tests.shift());
 }
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_html.js b/toolkit/components/places/tests/unit/test_bookmarks_html.js
index 34efc095d8a..e55f580b09e 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_html.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_html.js
@@ -104,7 +104,7 @@ add_task(function* setup() {
 
   yield BookmarkHTMLUtils.exportToFile(gBookmarksFileNew);
   yield PlacesTestUtils.promiseAsyncUpdates();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function* test_import_new()
@@ -118,7 +118,7 @@ add_task(function* test_import_new()
   yield testImportedBookmarks();
   yield PlacesTestUtils.promiseAsyncUpdates();
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function* test_emptytitle_export()
@@ -146,7 +146,7 @@ add_task(function* test_emptytitle_export()
 
   yield BookmarkHTMLUtils.exportToFile(gBookmarksFileNew);
   yield PlacesTestUtils.promiseAsyncUpdates();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 
   yield BookmarkHTMLUtils.importFromFile(gBookmarksFileNew, true);
   yield PlacesTestUtils.promiseAsyncUpdates();
@@ -158,7 +158,7 @@ add_task(function* test_emptytitle_export()
 
   yield BookmarkHTMLUtils.exportToFile(gBookmarksFileNew);
   yield PlacesTestUtils.promiseAsyncUpdates();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function* test_import_chromefavicon()
@@ -214,7 +214,7 @@ add_task(function* test_import_chromefavicon()
                                   deferred.resolve);
   yield deferred.promise;
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 
   yield BookmarkHTMLUtils.importFromFile(gBookmarksFileNew, true);
   yield PlacesTestUtils.promiseAsyncUpdates();
@@ -226,7 +226,7 @@ add_task(function* test_import_chromefavicon()
 
   yield BookmarkHTMLUtils.exportToFile(gBookmarksFileNew);
   yield PlacesTestUtils.promiseAsyncUpdates();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function* test_import_ontop()
@@ -248,7 +248,7 @@ add_task(function* test_import_ontop()
   yield PlacesTestUtils.promiseAsyncUpdates();
   yield testImportedBookmarks();
   yield PlacesTestUtils.promiseAsyncUpdates();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 function* testImportedBookmarks()
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_html_corrupt.js b/toolkit/components/places/tests/unit/test_bookmarks_html_corrupt.js
index 91ad65a28db..c302615f954 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_html_corrupt.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_html_corrupt.js
@@ -41,7 +41,7 @@ add_task(function* test_corrupt_database() {
   yield BookmarkHTMLUtils.exportToFile(bookmarksFile);
 
   // Import again and check for correctness.
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield BookmarkHTMLUtils.importFromFile(bookmarksFile, true);
   yield PlacesTestUtils.promiseAsyncUpdates();
   yield database_check();
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_json.js b/toolkit/components/places/tests/unit/test_bookmarks_json.js
index 20b121342b0..7dc490807cf 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_json.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_json.js
@@ -90,14 +90,14 @@ add_task(function test_export_bookmarks() {
 });
 
 add_task(function test_import_exported_bookmarks() {
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
   yield PlacesTestUtils.promiseAsyncUpdates();
   yield testImportedBookmarks();
 });
 
 add_task(function test_import_ontop() {
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
   yield PlacesTestUtils.promiseAsyncUpdates();
   yield BookmarkJSONUtils.exportToFile(bookmarksExportedFile);
@@ -108,7 +108,7 @@ add_task(function test_import_ontop() {
 });
 
 add_task(function test_clean() {
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 function testImportedBookmarks() {
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js b/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
index 51f2cbe3b04..11963eae0a6 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
@@ -53,7 +53,7 @@ var tests = [
         addBookmarks();
 
         yield BookmarkJSONUtils.exportToFile(this.file);
-        remove_all_bookmarks();
+        yield PlacesUtils.bookmarks.eraseEverything();
         try {
           yield BookmarkJSONUtils.importFromFile(this.file, true);
         }
@@ -114,7 +114,7 @@ var tests = [
         this.file = yield promiseFile("bookmarks-test_restoreNotification.html");
         addBookmarks();
         yield BookmarkHTMLUtils.exportToFile(this.file);
-        remove_all_bookmarks();
+        yield PlacesUtils.bookmarks.eraseEverything();
         try {
           BookmarkHTMLUtils.importFromFile(this.file, false)
                            .then(null, do_report_unexpected_exception);
@@ -174,7 +174,7 @@ var tests = [
         this.file = yield promiseFile("bookmarks-test_restoreNotification.init.html");
         addBookmarks();
         yield BookmarkHTMLUtils.exportToFile(this.file);
-        remove_all_bookmarks();
+        yield PlacesUtils.bookmarks.eraseEverything();
         try {
           BookmarkHTMLUtils.importFromFile(this.file, true)
                            .then(null, do_report_unexpected_exception);
@@ -269,8 +269,7 @@ var successAndFailedObserver = {
     else
       do_check_eq(test.folderId, null);
 
-    remove_all_bookmarks();
-    do_execute_soon(doNextTest);
+    PlacesUtils.bookmarks.eraseEverything().then(doNextTest);
   }
 };
 
diff --git a/toolkit/components/places/tests/unit/test_frecency.js b/toolkit/components/places/tests/unit/test_frecency.js
index 6fb6df245b0..edf5805e761 100644
--- a/toolkit/components/places/tests/unit/test_frecency.js
+++ b/toolkit/components/places/tests/unit/test_frecency.js
@@ -286,7 +286,7 @@ add_task(function test_frecency()
   prefs.setBoolPref("browser.urlbar.suggest.bookmark", true);
   prefs.setBoolPref("browser.urlbar.suggest.openpage", false);
   for (let [, test] in Iterator(tests)) {
-    remove_all_bookmarks();
+    yield PlacesUtils.bookmarks.eraseEverything();
     yield PlacesTestUtils.clearHistory();
 
     deferEnsureResults = Promise.defer();
diff --git a/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js b/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
index e84ac1952cf..2237441e427 100644
--- a/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
+++ b/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
@@ -56,7 +56,7 @@ add_task(function test_addBookmarksAndCheckGuids() {
 
   root.containerOpen = false;
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function test_updateBookmarksAndCheckGuids() {
@@ -85,7 +85,7 @@ add_task(function test_updateBookmarksAndCheckGuids() {
 
   root.containerOpen = false;
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function test_addVisitAndCheckGuid() {
@@ -133,7 +133,7 @@ add_task(function test_addItemsWithInvalidGUIDsFails() {
   }
   catch(ex) { }
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function test_addItemsWithGUIDs() {
@@ -154,7 +154,7 @@ add_task(function test_addItemsWithGUIDs() {
   do_check_eq(root.getChild(1).bookmarkGuid, SEPARATOR_GUID);
 
   root.containerOpen = false;
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function test_emptyGUIDIgnored() {
@@ -162,7 +162,7 @@ add_task(function test_emptyGUIDIgnored() {
                                   bmsvc.DEFAULT_INDEX, "");
   do_check_valid_places_guid(PlacesUtils.getFolderContents(folder)
                                         .root.bookmarkGuid);
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(function test_usingSameGUIDFails() {
@@ -176,5 +176,5 @@ add_task(function test_usingSameGUIDFails() {
   }
   catch(ex) { }
 
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
 });
diff --git a/toolkit/components/places/tests/unit/test_removeVisitsByTimeframe.js b/toolkit/components/places/tests/unit/test_removeVisitsByTimeframe.js
index 88d36cc0d22..261109639b5 100644
--- a/toolkit/components/places/tests/unit/test_removeVisitsByTimeframe.js
+++ b/toolkit/components/places/tests/unit/test_removeVisitsByTimeframe.js
@@ -10,7 +10,7 @@ const PLACE_URI = uri("place:queryType=0&sort=8&maxResults=10");
 
 function* cleanup() {
   yield PlacesTestUtils.clearHistory();
-  remove_all_bookmarks();
+  yield PlacesUtils.bookmarks.eraseEverything();
   // This is needed to remove place: entries.
   DBConn().executeSimpleSQL("DELETE FROM moz_places");
 }
diff --git a/toolkit/components/places/tests/unit/test_update_frecency_after_delete.js b/toolkit/components/places/tests/unit/test_update_frecency_after_delete.js
index e325a565c04..e2fa8574fbf 100644
--- a/toolkit/components/places/tests/unit/test_update_frecency_after_delete.js
+++ b/toolkit/components/places/tests/unit/test_update_frecency_after_delete.js
@@ -12,148 +12,140 @@
  * bookmark is deleted.
  */
 
-add_test(function removed_bookmark()
-{
+add_task(function* removed_bookmark() {
   do_print("After removing bookmark, frecency of bookmark's URI should be " +
            "zero if URI is unvisited and no longer bookmarked.");
   const TEST_URI = NetUtil.newURI("http://example.com/1");
-  let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                TEST_URI,
-                                                PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                "bookmark title");
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    do_print("Bookmarked => frecency of URI should be != 0");
-    do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-    PlacesUtils.bookmarks.removeItem(id);
-
-    PlacesTestUtils.promiseAsyncUpdates().then(() => {
-      do_print("Unvisited URI no longer bookmarked => frecency should = 0");
-      do_check_eq(frecencyForUrl(TEST_URI), 0);
-
-      remove_all_bookmarks();
-      PlacesTestUtils.clearHistory().then(run_next_test);
-    });
+  let bm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark title",
+    url: TEST_URI
   });
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Bookmarked => frecency of URI should be != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.remove(bm);
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Unvisited URI no longer bookmarked => frecency should = 0");
+  do_check_eq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
 });
 
-add_test(function removed_but_visited_bookmark()
-{
+add_task(function* removed_but_visited_bookmark() {
   do_print("After removing bookmark, frecency of bookmark's URI should " +
            "not be zero if URI is visited.");
   const TEST_URI = NetUtil.newURI("http://example.com/1");
-  let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                TEST_URI,
-                                                PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                "bookmark title");
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    do_print("Bookmarked => frecency of URI should be != 0");
-    do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-    PlacesTestUtils.addVisits(TEST_URI).then(function () {
-      PlacesUtils.bookmarks.removeItem(id);
-
-      PlacesTestUtils.promiseAsyncUpdates().then(() => {
-        do_print("*Visited* URI no longer bookmarked => frecency should != 0");
-        do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-        remove_all_bookmarks();
-        PlacesTestUtils.clearHistory().then(run_next_test);
-      });
-    });
+  let bm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark title",
+    url: TEST_URI
   });
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Bookmarked => frecency of URI should be != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesTestUtils.addVisits(TEST_URI);
+  yield PlacesUtils.bookmarks.remove(bm);
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("*Visited* URI no longer bookmarked => frecency should != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
 });
 
-add_test(function remove_bookmark_still_bookmarked()
-{
+add_task(function* remove_bookmark_still_bookmarked() {
   do_print("After removing bookmark, frecency of bookmark's URI should " +
            "not be zero if URI is still bookmarked.");
   const TEST_URI = NetUtil.newURI("http://example.com/1");
-  let id1 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                 TEST_URI,
-                                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                 "bookmark 1 title");
-  let id2 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                 TEST_URI,
-                                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                 "bookmark 2 title");
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    do_print("Bookmarked => frecency of URI should be != 0");
-    do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-    PlacesUtils.bookmarks.removeItem(id1);
-
-    PlacesTestUtils.promiseAsyncUpdates().then(() => {
-      do_print("URI still bookmarked => frecency should != 0");
-      do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-      remove_all_bookmarks();
-      PlacesTestUtils.clearHistory().then(run_next_test);
-    });
+  let bm1 = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark 1 title",
+    url: TEST_URI
   });
+  let bm2 = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark 2 title",
+    url: TEST_URI
+  });
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Bookmarked => frecency of URI should be != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.remove(bm1);
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("URI still bookmarked => frecency should != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
 });
 
-add_test(function cleared_parent_of_visited_bookmark()
-{
+add_task(function* cleared_parent_of_visited_bookmark() {
   do_print("After removing all children from bookmark's parent, frecency " +
            "of bookmark's URI should not be zero if URI is visited.");
   const TEST_URI = NetUtil.newURI("http://example.com/1");
-  let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                TEST_URI,
-                                                PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                "bookmark title");
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    do_print("Bookmarked => frecency of URI should be != 0");
-    do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-    PlacesTestUtils.addVisits(TEST_URI).then(function () {
-      PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
-
-      PlacesTestUtils.promiseAsyncUpdates().then(() => {
-        do_print("*Visited* URI no longer bookmarked => frecency should != 0");
-        do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-        remove_all_bookmarks();
-        PlacesTestUtils.clearHistory().then(run_next_test);
-      });
-    });
+  let bm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark title",
+    url: TEST_URI
   });
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Bookmarked => frecency of URI should be != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesTestUtils.addVisits(TEST_URI);
+  PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("*Visited* URI no longer bookmarked => frecency should != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
 });
 
-add_test(function cleared_parent_of_bookmark_still_bookmarked()
-{
+add_task(function* cleared_parent_of_bookmark_still_bookmarked() {
   do_print("After removing all children from bookmark's parent, frecency " +
            "of bookmark's URI should not be zero if URI is still " +
            "bookmarked.");
   const TEST_URI = NetUtil.newURI("http://example.com/1");
-  let id1 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.toolbarFolderId,
-                                                 TEST_URI,
-                                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                 "bookmark 1 title");
-
-  let id2 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                                TEST_URI,
-                                                PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                "bookmark 2 title");
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    do_print("Bookmarked => frecency of URI should be != 0");
-    do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-    PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
-
-    PlacesTestUtils.promiseAsyncUpdates().then(() => {
-      // URI still bookmarked => frecency should != 0.
-      do_check_neq(frecencyForUrl(TEST_URI), 0);
-
-      remove_all_bookmarks();
-      PlacesTestUtils.clearHistory().then(run_next_test);
-    });
+  let bm1 = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    title: "bookmark 1 title",
+    url: TEST_URI
   });
+
+  let folder = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    title: "bookmark 2 folder"
+  });
+  let bm2 = yield PlacesUtils.bookmarks.insert({
+    title: "bookmark 2 title",
+    parentGuid: folder.guid,
+    url: TEST_URI
+  });
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  do_print("Bookmarked => frecency of URI should be != 0");
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.remove(folder);
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  // URI still bookmarked => frecency should != 0.
+  do_check_neq(frecencyForUrl(TEST_URI), 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
 });
-
-///////////////////////////////////////////////////////////////////////////////
-
-function run_test()
-{
-  run_next_test();
-}
diff --git a/toolkit/components/places/tests/unit/test_utils_getURLsForContainerNode.js b/toolkit/components/places/tests/unit/test_utils_getURLsForContainerNode.js
index 2581ffaf6ad..27bc2010460 100644
--- a/toolkit/components/places/tests/unit/test_utils_getURLsForContainerNode.js
+++ b/toolkit/components/places/tests/unit/test_utils_getURLsForContainerNode.js
@@ -169,11 +169,12 @@ function check_uri_nodes(aQuery, aOptions, aExpectedURINodes) {
   root.containerOpen = false;
 }
 
-function run_test() {
-  tests.forEach(function(aTest) {
-                  remove_all_bookmarks();
-                  aTest();
-                });
+add_task(function* () {
+  for (let test of tests) {
+    yield PlacesUtils.bookmarks.eraseEverything();
+    test();
+  }
+
   // Cleanup.
-  remove_all_bookmarks();
-}
+  yield PlacesUtils.bookmarks.eraseEverything();
+});

From 1be8159308dc720912af98bf39cfca9726d23938 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 20 Apr 2015 08:53:00 -0700
Subject: [PATCH 28/80] Bug 1140221: Attempt to fix intermittent
 test-tabs.js.testIgnoreClosing by waiting for focus directly. r=erikvold

---
 .../source/test/tabs/test-firefox-tabs.js     | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addon-sdk/source/test/tabs/test-firefox-tabs.js b/addon-sdk/source/test/tabs/test-firefox-tabs.js
index d7c8016bbe7..b11bb20e754 100644
--- a/addon-sdk/source/test/tabs/test-firefox-tabs.js
+++ b/addon-sdk/source/test/tabs/test-firefox-tabs.js
@@ -371,29 +371,30 @@ exports.testTabMove = function(assert, done) {
 };
 
 exports.testIgnoreClosing = function(assert, done) {
-  let originalWindow = browserWindows.activeWindow;
+  let originalWindow = viewFor(browserWindows.activeWindow);
   openBrowserWindow(function(window, browser) {
-    let url = "data:text/html;charset=utf-8,foobar";
+    onFocus(window).then(() => {
+      let url = "data:text/html;charset=utf-8,foobar";
 
-    assert.equal(tabs.length, 2, "should be two windows open each with one tab");
+      assert.equal(tabs.length, 2, "should be two windows open each with one tab");
 
-    tabs.on('ready', function onReady(tab) {
-      tabs.removeListener('ready', onReady);
+      tabs.on('ready', function onReady(tab) {
+        tabs.removeListener('ready', onReady);
 
-      let win = tab.window;
-      assert.equal(win.tabs.length, 2, "should be two tabs in the new window");
-      assert.equal(tabs.length, 3, "should be three tabs in total");
+        let win = tab.window;
+        assert.equal(win.tabs.length, 2, "should be two tabs in the new window");
+        assert.equal(tabs.length, 3, "should be three tabs in total");
 
-      tab.close(function() {
-        assert.equal(win.tabs.length, 1, "should be one tab in the new window");
-        assert.equal(tabs.length, 2, "should be two tabs in total");
+        tab.close(function() {
+          assert.equal(win.tabs.length, 1, "should be one tab in the new window");
+          assert.equal(tabs.length, 2, "should be two tabs in total");
 
-        originalWindow.once("activate", done);
-        close(window);
+          close(window).then(onFocus(originalWindow)).then(done).then(null, assert.fail);
+        });
       });
-    });
 
-    tabs.open(url);
+      tabs.open(url);
+    });
   });
 };
 

From b2f4baac33f371fe2cc21cb4854abf6914765431 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@mozilla.com>
Date: Mon, 20 Apr 2015 11:09:34 -0700
Subject: [PATCH 29/80] Bug 1096908 - forward network security messages to the
 content process; r=hurley

---
 browser/devtools/webconsole/test/browser.ini |  1 -
 netwerk/protocol/http/HttpBaseChannel.h      |  2 +-
 netwerk/protocol/http/HttpChannelChild.cpp   |  8 ++++++++
 netwerk/protocol/http/HttpChannelChild.h     |  3 +++
 netwerk/protocol/http/HttpChannelParent.cpp  | 16 ++++++++++++++++
 netwerk/protocol/http/HttpChannelParent.h    |  6 +++++-
 netwerk/protocol/http/PHttpChannel.ipdl      |  4 ++++
 netwerk/protocol/http/nsHttpChannel.cpp      | 14 ++++++++++++++
 netwerk/protocol/http/nsHttpChannel.h        | 17 +++++++++++++++++
 9 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini
index ea8f809f892..e05e8ae8423 100644
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -307,7 +307,6 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent)
 [browser_webconsole_certificate_messages.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_show_subresource_security_errors.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_cached_autocomplete.js]
 [browser_webconsole_change_font_size.js]
 [browser_webconsole_chrome.js]
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index a87531fafe4..353e41dfe18 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -182,7 +182,7 @@ public:
   NS_IMETHOD GetAllowAltSvc(bool *aAllowAltSvc) override;
   NS_IMETHOD SetAllowAltSvc(bool aAllowAltSvc) override;
   NS_IMETHOD GetApiRedirectToURI(nsIURI * *aApiRedirectToURI) override;
-  nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
+  virtual nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
   NS_IMETHOD TakeAllSecurityMessages(nsCOMArray<nsISecurityConsoleMessage> &aMessages) override;
   NS_IMETHOD GetResponseTimeoutEnabled(bool *aEnable) override;
   NS_IMETHOD SetResponseTimeoutEnabled(bool aEnable) override;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index a47c1e71778..21e32f52dd0 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -991,6 +991,14 @@ HttpChannelChild::DeleteSelf()
   Send__delete__(this);
 }
 
+bool
+HttpChannelChild::RecvReportSecurityMessage(const nsString& messageTag,
+                                            const nsString& messageCategory)
+{
+  AddSecurityMessage(messageTag, messageCategory);
+  return true;
+}
+
 class Redirect1Event : public ChannelEvent
 {
  public:
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 6f54013dace..fcd61efbdea 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -140,6 +140,9 @@ protected:
   bool RecvDivertMessages() override;
   bool RecvDeleteSelf() override;
 
+  bool RecvReportSecurityMessage(const nsString& messageTag,
+                                 const nsString& messageCategory) override;
+
   bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
   virtual void DoNotifyListenerCleanup() override;
 
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index f6625084528..b2dd903d47e 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -329,6 +329,7 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
     return SendFailedAsyncOpen(rv);
 
   mChannel = static_cast<nsHttpChannel *>(channel.get());
+  mChannel->SetWarningReporter(this);
   mChannel->SetTimingEnabled(true);
   if (mPBOverride != kPBOverride_Unset) {
     mChannel->SetPrivate(mPBOverride == kPBOverride_Private ? true : false);
@@ -1264,4 +1265,19 @@ HttpChannelParent::GetAuthPrompt(uint32_t aPromptReason, const nsIID& iid,
   return NS_OK;
 }
 
+//-----------------------------------------------------------------------------
+// HttpChannelSecurityWarningReporter
+//-----------------------------------------------------------------------------
+
+nsresult
+HttpChannelParent::ReportSecurityMessage(const nsAString& aMessageTag,
+                                         const nsAString& aMessageCategory)
+{
+  if (NS_WARN_IF(!SendReportSecurityMessage(nsString(aMessageTag),
+                                            nsString(aMessageCategory)))) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  return NS_OK;
+}
+
 }} // mozilla::net
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 4f481b18dd1..c5ceb56d711 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -43,7 +43,8 @@ class HttpChannelParent final : public PHttpChannelParent
                               , public ADivertableParentChannel
                               , public nsIAuthPromptProvider
                               , public nsINetworkInterceptController
-                              , public DisconnectableParent
+                              , public DisconnectableParent,
+                              , public HttpChannelSecurityWarningReporter
 {
   virtual ~HttpChannelParent();
 
@@ -154,6 +155,9 @@ protected:
   void OfflineDisconnect() override;
   uint32_t GetAppId() override;
 
+  nsresult ReportSecurityMessage(const nsAString& aMessageTag,
+                                 const nsAString& aMessageCategory) override;
+
 private:
   nsRefPtr<nsHttpChannel>       mChannel;
   nsCOMPtr<nsICacheEntry>       mCacheEntry;
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index a0edc6a32d5..3b6db8676a0 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -139,6 +139,10 @@ child:
   // OnDataAvailable and OnStopRequest messages in the queue back to the parent.
   DivertMessages();
 
+  // Report a security message to the console associated with this
+  // channel.
+  ReportSecurityMessage(nsString messageTag, nsString messageCategory);
+
   // Tell child to delete channel (all IPDL deletes must be done from child to
   // avoid races: see bug 591708).
   DeleteSelf();
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 5fd28278dd3..3bcc7ad5672 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -244,6 +244,7 @@ nsHttpChannel::nsHttpChannel()
     , mHasAutoRedirectVetoNotifier(0)
     , mPushedStream(nullptr)
     , mLocalBlocklist(false)
+    , mWarningReporter(nullptr)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
@@ -281,6 +282,19 @@ nsHttpChannel::Init(nsIURI *uri,
 
     return rv;
 }
+
+nsresult
+nsHttpChannel::AddSecurityMessage(const nsAString& aMessageTag,
+                                  const nsAString& aMessageCategory)
+{
+    if (mWarningReporter) {
+        return mWarningReporter->ReportSecurityMessage(aMessageTag,
+                                                       aMessageCategory);
+    }
+    return HttpBaseChannel::AddSecurityMessage(aMessageTag,
+                                               aMessageCategory);
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel <private>
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 9010e4a5c55..58ee0f9c0dc 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -33,6 +33,14 @@ class nsISSLStatus;
 namespace mozilla { namespace net {
 
 class Http2PushedStream;
+
+class HttpChannelSecurityWarningReporter
+{
+public:
+  virtual nsresult ReportSecurityMessage(const nsAString& aMessageTag,
+                                         const nsAString& aMessageCategory) = 0;
+};
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
@@ -141,6 +149,12 @@ public:
     NS_IMETHOD GetResponseStart(mozilla::TimeStamp *aResponseStart) override;
     NS_IMETHOD GetResponseEnd(mozilla::TimeStamp *aResponseEnd) override;
 
+    nsresult AddSecurityMessage(const nsAString& aMessageTag,
+                                const nsAString& aMessageCategory) override;
+
+    void SetWarningReporter(HttpChannelSecurityWarningReporter* aReporter)
+      { mWarningReporter = aReporter; }
+
 public: /* internal necko use only */
 
     void InternalSetUploadStream(nsIInputStream *uploadStream)
@@ -477,6 +491,9 @@ private:
 
     nsCString mUsername;
 
+    // If non-null, warnings should be reported to this object.
+    HttpChannelSecurityWarningReporter* mWarningReporter;
+
 protected:
     virtual void DoNotifyListenerCleanup() override;
 

From a730d85efe8375a9b2a09ad98fd505b19e709b80 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Thu, 16 Apr 2015 10:17:26 +0100
Subject: [PATCH 30/80] Bug 1098374 - Telemetry: Stop all monkey patching in
 devtools telemetry tests r=harth,bgrins

---
 .../devtools/canvasdebugger/canvasdebugger.js |   4 -
 browser/devtools/shadereditor/shadereditor.js |   4 -
 browser/devtools/shared/telemetry.js          |  17 +-
 browser/devtools/shared/test/browser.ini      |   1 +
 .../shared/test/browser_observableobject.js   |   4 +-
 .../shared/test/browser_options-view-01.js    |   1 -
 .../shared/test/browser_outputparser.js       |   2 -
 .../browser_telemetry_button_eyedropper.js    |  36 +---
 .../browser_telemetry_button_paintflashing.js |  49 ++---
 .../browser_telemetry_button_responsive.js    |  49 ++---
 .../browser_telemetry_button_scratchpad.js    |  48 +----
 .../test/browser_telemetry_button_tilt.js     |  51 ++---
 .../shared/test/browser_telemetry_misc.js     |  24 +++
 .../shared/test/browser_telemetry_sidebar.js  |  51 ++---
 .../shared/test/browser_telemetry_toolbox.js  |  20 +-
 ...er_telemetry_toolboxtabs_canvasdebugger.js |  17 +-
 ...browser_telemetry_toolboxtabs_inspector.js |  20 +-
 ...rowser_telemetry_toolboxtabs_jsdebugger.js |  20 +-
 ...rowser_telemetry_toolboxtabs_jsprofiler.js |  13 +-
 ...rowser_telemetry_toolboxtabs_netmonitor.js |  13 +-
 .../browser_telemetry_toolboxtabs_options.js  |  14 +-
 ...wser_telemetry_toolboxtabs_shadereditor.js |  14 +-
 .../browser_telemetry_toolboxtabs_storage.js  |  14 +-
 ...owser_telemetry_toolboxtabs_styleeditor.js |  13 +-
 ...er_telemetry_toolboxtabs_webaudioeditor.js |  14 +-
 ...rowser_telemetry_toolboxtabs_webconsole.js |  14 +-
 browser/devtools/shared/test/head.js          | 183 +++++++++++-------
 browser/devtools/storage/ui.js                |   6 -
 browser/devtools/webaudioeditor/controller.js |   2 -
 browser/devtools/webaudioeditor/includes.js   |   5 +-
 browser/devtools/webide/test/head.js          | 113 +++++++++++
 .../devtools/webide/test/test_telemetry.html  |  91 ++-------
 32 files changed, 501 insertions(+), 426 deletions(-)
 create mode 100644 browser/devtools/shared/test/browser_telemetry_misc.js

diff --git a/browser/devtools/canvasdebugger/canvasdebugger.js b/browser/devtools/canvasdebugger/canvasdebugger.js
index aaa9ae00985..537cda761e5 100644
--- a/browser/devtools/canvasdebugger/canvasdebugger.js
+++ b/browser/devtools/canvasdebugger/canvasdebugger.js
@@ -17,8 +17,6 @@ const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { CallWatcherFront } = require("devtools/server/actors/call-watcher");
 const { CanvasFront } = require("devtools/server/actors/canvas");
-const Telemetry = require("devtools/shared/telemetry");
-const telemetry = new Telemetry();
 
 const CANVAS_ACTOR_RECORDING_ATTEMPT = gDevTools.testing ? 500 : 5000;
 
@@ -129,7 +127,6 @@ let EventsHandler = {
    * Listen for events emitted by the current tab target.
    */
   initialize: function() {
-    telemetry.toolOpened("canvasdebugger");
     this._onTabNavigated = this._onTabNavigated.bind(this);
     gTarget.on("will-navigate", this._onTabNavigated);
     gTarget.on("navigate", this._onTabNavigated);
@@ -139,7 +136,6 @@ let EventsHandler = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
-    telemetry.toolClosed("canvasdebugger");
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
   },
diff --git a/browser/devtools/shadereditor/shadereditor.js b/browser/devtools/shadereditor/shadereditor.js
index 93019876eb2..c28a2246b64 100644
--- a/browser/devtools/shadereditor/shadereditor.js
+++ b/browser/devtools/shadereditor/shadereditor.js
@@ -17,8 +17,6 @@ const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {Tooltip} = require("devtools/shared/widgets/Tooltip");
 const Editor = require("devtools/sourceeditor/editor");
-const Telemetry = require("devtools/shared/telemetry");
-const telemetry = new Telemetry();
 
 // The panel's window global is an EventEmitter firing the following events:
 const EVENTS = {
@@ -86,7 +84,6 @@ let EventsHandler = {
    * Listen for events emitted by the current tab target.
    */
   initialize: function() {
-    telemetry.toolOpened("shadereditor");
     this._onHostChanged = this._onHostChanged.bind(this);
     this._onTabNavigated = this._onTabNavigated.bind(this);
     this._onProgramLinked = this._onProgramLinked.bind(this);
@@ -102,7 +99,6 @@ let EventsHandler = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
-    telemetry.toolClosed("shadereditor");
     gToolbox.off("host-changed", this._onHostChanged);
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
diff --git a/browser/devtools/shared/telemetry.js b/browser/devtools/shared/telemetry.js
index 0193ccee19a..05118aa6c7d 100644
--- a/browser/devtools/shared/telemetry.js
+++ b/browser/devtools/shared/telemetry.js
@@ -19,17 +19,8 @@
  *      timerHistogram: "DEVTOOLS_MYTOOLNAME_TIME_ACTIVE_SECONDS"
  *    },
  *
- * 3. Include this module at the top of your tool. Use:
- *      let Telemetry = require("devtools/shared/telemetry")
- *
- * 4. Create a telemetry instance in your tool's constructor:
- *      this._telemetry = new Telemetry();
- *
- * 5. When your tool is opened call:
- *      this._telemetry.toolOpened("mytoolname");
- *
- * 6. When your tool is closed call:
- *      this._telemetry.toolClosed("mytoolname");
+ * 3. toolbox.js will automatically ping telemetry with your tools opening and
+ *    timing information.
  *
  * Note:
  * You can view telemetry stats for your local Firefox instance via
@@ -303,6 +294,10 @@ Telemetry.prototype = {
     }
   },
 
+  clearToolsOpenedPref: function() {
+    Services.prefs.clearUserPref(TOOLS_OPENED_PREF);
+  },
+
   destroy: function() {
     for (let histogramId of this._timers.keys()) {
       this.stopTimer(histogramId);
diff --git a/browser/devtools/shared/test/browser.ini b/browser/devtools/shared/test/browser.ini
index b5da569d968..4d352ac3bf5 100644
--- a/browser/devtools/shared/test/browser.ini
+++ b/browser/devtools/shared/test/browser.ini
@@ -90,6 +90,7 @@ skip-if = e10s # Bug 1067145 - e10s responsiveview
 [browser_telemetry_button_tilt.js]
 skip-if = e10s # Bug 1086492 - Disable tilt for e10s
                # Bug 937166 - Make tilt work in E10S mode
+[browser_telemetry_misc.js]
 [browser_telemetry_sidebar.js]
 [browser_telemetry_toolbox.js]
 [browser_telemetry_toolboxtabs_canvasdebugger.js]
diff --git a/browser/devtools/shared/test/browser_observableobject.js b/browser/devtools/shared/test/browser_observableobject.js
index 8bd1d516944..5c1cdc69acc 100644
--- a/browser/devtools/shared/test/browser_observableobject.js
+++ b/browser/devtools/shared/test/browser_observableobject.js
@@ -2,9 +2,7 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  let tmp = {};
-  Cu.import("resource://gre/modules/devtools/Loader.jsm", tmp);
-  let ObservableObject = tmp.devtools.require("devtools/shared/observable-object");
+  let ObservableObject = devtools.require("devtools/shared/observable-object");
 
   let rawObject = {};
   let oe = new ObservableObject(rawObject);
diff --git a/browser/devtools/shared/test/browser_options-view-01.js b/browser/devtools/shared/test/browser_options-view-01.js
index b64cce36841..147da903403 100644
--- a/browser/devtools/shared/test/browser_options-view-01.js
+++ b/browser/devtools/shared/test/browser_options-view-01.js
@@ -4,7 +4,6 @@
 // Tests that options-view OptionsView responds to events correctly.
 
 const {OptionsView} = devtools.require("devtools/shared/options-view");
-const {Services} = devtools.require("resource://gre/modules/Services.jsm");
 
 const BRANCH = "devtools.debugger.";
 const BLACK_BOX_PREF = "auto-black-box";
diff --git a/browser/devtools/shared/test/browser_outputparser.js b/browser/devtools/shared/test/browser_outputparser.js
index 583f74fad4f..47fe9685a00 100644
--- a/browser/devtools/shared/test/browser_outputparser.js
+++ b/browser/devtools/shared/test/browser_outputparser.js
@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-let {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
 let {OutputParser} = devtools.require("devtools/output-parser");
 
 add_task(function*() {
diff --git a/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js b/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
index 946e4174ebf..ca429ea02bc 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
@@ -8,50 +8,34 @@ let {EyedropperManager} = require("devtools/eyedropper/eyedropper");
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the eyedropper button");
-  testButton(toolbox, Telemetry);
+  testButton(toolbox);
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function testButton(toolbox, Telemetry) {
+function testButton(toolbox) {
   let button = toolbox.doc.querySelector("#command-button-eyedropper");
   ok(button, "Captain, we have the eyedropper button");
 
   info("clicking the button to open the eyedropper");
   button.click();
 
-  checkResults("_EYEDROPPER_", Telemetry);
+  checkResults();
 }
 
-function checkResults(histIdFocus, Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
 
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
-        !histId.contains(histIdFocus)) {
-      // Inspector stats are tested in
-      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
-      // because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      is(value.length, 1, histId + " has one entry");
-
-      let okay = value.every(element => element === true);
-      ok(okay, "All " + histId + " entries are === true");
-    }
-  }
+  checkTelemetry("DEVTOOLS_EYEDROPPER_OPENED_BOOLEAN", [0,1,0]);
+  checkTelemetry("DEVTOOLS_EYEDROPPER_OPENED_PER_USER_FLAG", [0,1,0]);
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js b/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
index 692df44c457..d05b9d15fbf 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the paintflashing button");
-  yield testButton(toolbox, Telemetry);
+  yield testButton(toolbox);
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox, Telemetry) {
+function* testButton(toolbox) {
   info("Testing command-button-paintflashing");
 
   let button = toolbox.doc.querySelector("#command-button-paintflashing");
   ok(button, "Captain, we have the button");
 
   yield delayedClicks(button, 4);
-  checkResults("_PAINTFLASHING_", Telemetry);
+  checkResults();
 }
 
 function delayedClicks(node, clicks) {
@@ -53,37 +53,10 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults(histIdFocus, Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
-
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
-        !histId.contains(histIdFocus)) {
-      // Inspector stats are tested in
-      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
-      // because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
-    }
-  }
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_PAINTFLASHING_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_PAINTFLASHING_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_PAINTFLASHING_TIME_ACTIVE_SECONDS", null, "hasentries");
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_responsive.js b/browser/devtools/shared/test/browser_telemetry_button_responsive.js
index fd9a33460cb..bb5598d8337 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_responsive.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_responsive.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the responsivedesign button");
-  yield testButton(toolbox, Telemetry);
+  yield testButton(toolbox);
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox, Telemetry) {
+function* testButton(toolbox) {
   info("Testing command-button-responsive");
 
   let button = toolbox.doc.querySelector("#command-button-responsive");
   ok(button, "Captain, we have the button");
 
   yield delayedClicks(button, 4);
-  checkResults("_RESPONSIVE_", Telemetry);
+  checkResults();
 }
 
 function delayedClicks(node, clicks) {
@@ -53,37 +53,10 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults(histIdFocus, Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
-
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
-        !histId.contains(histIdFocus)) {
-      // Inspector stats are tested in
-      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
-      // because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
-    }
-  }
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_RESPONSIVE_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_RESPONSIVE_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_RESPONSIVE_TIME_ACTIVE_SECONDS", null, "hasentries");
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js b/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
index f96755fcf8e..e1a5b137fc6 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
@@ -10,7 +10,8 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
@@ -19,12 +20,11 @@ add_task(function*() {
   let onAllWindowsOpened = trackScratchpadWindows();
 
   info("testing the scratchpad button");
-  yield testButton(toolbox, Telemetry);
+  yield testButton(toolbox);
   yield onAllWindowsOpened;
 
-  checkResults("_SCRATCHPAD_", Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
@@ -64,7 +64,7 @@ function trackScratchpadWindows() {
   });
 }
 
-function* testButton(toolbox, Telemetry) {
+function* testButton(toolbox) {
   info("Testing command-button-scratchpad");
   let button = toolbox.doc.querySelector("#command-button-scratchpad");
   ok(button, "Captain, we have the button");
@@ -91,37 +91,9 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults(histIdFocus, Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
-
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
-        !histId.contains(histIdFocus)) {
-      // Inspector stats are tested in
-      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
-      // because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
-    }
-  }
+function checkResults(histIdFocus) {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_SCRATCHPAD_OPENED_BOOLEAN", [0,4,0]);
+  checkTelemetry("DEVTOOLS_SCRATCHPAD_OPENED_PER_USER_FLAG", [0,1,0]);
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_tilt.js b/browser/devtools/shared/test/browser_telemetry_button_tilt.js
index 4e36618ca5e..b5cd3b30c70 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_tilt.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_tilt.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the tilt button");
-  yield testButton(toolbox, Telemetry);
+  yield testButton(toolbox);
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox, Telemetry) {
+function* testButton(toolbox) {
   info("Testing command-button-tilt");
 
   let button = toolbox.doc.querySelector("#command-button-tilt");
   ok(button, "Captain, we have the button");
 
-  yield delayedClicks(button, 4)
-  checkResults("_TILT_", Telemetry);
+  yield delayedClicks(button, 4);
+  checkResults();
 }
 
 function delayedClicks(node, clicks) {
@@ -53,37 +53,10 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults(histIdFocus, Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
-
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
-        !histId.contains(histIdFocus)) {
-      // Inspector stats are tested in
-      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
-      // because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
-    }
-  }
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_TILT_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_TILT_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_TILT_TIME_ACTIVE_SECONDS", null, "hasentries");
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_misc.js b/browser/devtools/shared/test/browser_telemetry_misc.js
new file mode 100644
index 00000000000..f5859d5629d
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_misc.js
@@ -0,0 +1,24 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_misc.js</p>";
+const TOOL_DELAY = 0;
+
+add_task(function*() {
+  yield promiseTab(TEST_URI);
+
+  startTelemetry();
+
+  yield openAndCloseToolbox(1, TOOL_DELAY, "inspector");
+  checkResults();
+
+  gBrowser.removeCurrentTab();
+});
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_OS_ENUMERATED_PER_USER", null, "hasentries");
+  checkTelemetry("DEVTOOLS_OS_IS_64_BITS_PER_USER", null, "hasentries");
+  checkTelemetry("DEVTOOLS_SCREEN_RESOLUTION_ENUMERATED_PER_USER", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_sidebar.js b/browser/devtools/shared/test/browser_telemetry_sidebar.js
index b80930e0e6c..a975090ec0b 100644
--- a/browser/devtools/shared/test/browser_telemetry_sidebar.js
+++ b/browser/devtools/shared/test/browser_telemetry_sidebar.js
@@ -9,16 +9,16 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   yield testSidebar(toolbox);
-  checkResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
@@ -49,37 +49,16 @@ function* testSidebar(toolbox) {
   });
 }
 
-function checkResults(Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
-
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.startsWith("DEVTOOLS_INSPECTOR_")) {
-      // Inspector stats are tested in browser_telemetry_toolboxtabs.js so we
-      // skip them here because we only open the inspector once for this test.
-      continue;
-    }
-
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId === "DEVTOOLS_TOOLBOX_OPENED_BOOLEAN") {
-      is(value.length, 1, histId + " has only one entry");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
-    }
-  }
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_FONTINSPECTOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_FONTINSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_FONTINSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_toolbox.js b/browser/devtools/shared/test/browser_telemetry_toolbox.js
index 366f64699ab..724fdd129e5 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolbox.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolbox.js
@@ -10,11 +10,25 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(3, TOOL_DELAY, "inspector");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_BOOLEAN", [0,3,0]);
+  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_BOOLEAN", [0,3,0]);
+  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_RULEVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,3,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
index c9c07099a59..bae88ab26c0 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
@@ -14,14 +14,25 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.canvasdebugger.enabled", true);
 
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "canvasdebugger");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activate the canvasdebugger");
   Services.prefs.setBoolPref("devtools.canvasdebugger.enabled", originalPref);
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
index 61dff980af2..236faf6e469 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
@@ -10,11 +10,25 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "inspector");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_RULEVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
index a8625518351..cc70eda3e39 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
@@ -10,11 +10,25 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "jsdebugger");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RECONFIGURETAB_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RECONFIGURETHREAD_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RESUME_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_SOURCES_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_TABDETACH_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_THREADDETACH_MS", null, "hasentries");
+  checkTelemetry("DEVTOOLS_JSDEBUGGER_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_JSDEBUGGER_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_JSDEBUGGER_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
index e2131feb2df..d3db7fad406 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
@@ -9,11 +9,18 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "performance");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_JSPROFILER_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_JSPROFILER_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_JSPROFILER_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
index e7554e5492a..a0fa1abd97a 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
@@ -9,12 +9,19 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "netmonitor");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
 
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_NETMONITOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_NETMONITOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_NETMONITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
index 14256814e49..b0ed00e6266 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
@@ -9,11 +9,19 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "options");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_OPTIONS_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_OPTIONS_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_OPTIONS_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
index 476fbd320d9..7f25e08a4c3 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
@@ -20,14 +20,22 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.shadereditor.enabled", true);
 
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "shadereditor");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activate the sharer editor");
   Services.prefs.setBoolPref("devtools.shadereditor.enabled", originalPref);
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_SHADEREDITOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_SHADEREDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_SHADEREDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
index 93348b96df7..b935204c68c 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
@@ -12,14 +12,22 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.storage.enabled", true);
 
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "storage");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activating the storage inspector");
   Services.prefs.clearUserPref("devtools.storage.enabled");
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_STORAGE_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_STORAGE_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_STORAGE_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
index 15c4a9c08ac..968b328eecf 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
@@ -9,12 +9,19 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "styleeditor");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
 
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_STYLEEDITOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_STYLEEDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_STYLEEDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
index 033791a7235..435b5711563 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
@@ -13,14 +13,22 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.webaudioeditor.enabled", true);
 
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "webaudioeditor");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activating the webaudioeditor");
   Services.prefs.setBoolPref("devtools.webaudioeditor.enabled", originalPref);
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
index b989a14269a..693790522fd 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
@@ -9,11 +9,19 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  let Telemetry = loadTelemetryAndRecordLogs();
+
+  startTelemetry();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "webconsole");
-  checkTelemetryResults(Telemetry);
+  checkResults();
 
-  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
+
+function checkResults() {
+  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+  // here.
+  checkTelemetry("DEVTOOLS_WEBCONSOLE_OPENED_BOOLEAN", [0,2,0]);
+  checkTelemetry("DEVTOOLS_WEBCONSOLE_OPENED_PER_USER_FLAG", [0,1,0]);
+  checkTelemetry("DEVTOOLS_WEBCONSOLE_TIME_ACTIVE_SECONDS", null, "hasentries");
+}
diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
index 121f75f6900..a6542217f82 100644
--- a/browser/devtools/shared/test/head.js
+++ b/browser/devtools/shared/test/head.js
@@ -6,12 +6,22 @@ let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory, require} = devtools;
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 const {DOMHelpers} = Cu.import("resource:///modules/devtools/DOMHelpers.jsm", {});
 const {Hosts} = require("devtools/framework/toolbox-hosts");
 
+let oldCanRecord = Services.telemetry.canRecordExtended;
+
 gDevTools.testing = true;
-SimpleTest.registerCleanupFunction(() => {
+registerCleanupFunction(() => {
+  _stopTelemetry();
   gDevTools.testing = false;
+
+  while (gBrowser.tabs.length > 1) {
+    gBrowser.removeCurrentTab();
+  }
+
+  console = undefined;
 });
 
 const TEST_URI_ROOT = "http://example.com/browser/browser/devtools/shared/test/";
@@ -43,14 +53,6 @@ function promiseTab(aURL) {
     addTab(aURL, resolve));
 }
 
-registerCleanupFunction(function tearDown() {
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-
-  console = undefined;
-});
-
 function catchFail(func) {
   return function() {
     try {
@@ -150,75 +152,126 @@ let createHost = Task.async(function*(type = "bottom", src = "data:text/html;cha
   return [host, iframe.contentWindow, iframe.contentDocument];
 });
 
-/**
- * Load the Telemetry utils, then stub Telemetry.prototype.log in order to
- * record everything that's logged in it.
- * Store all recordings on Telemetry.telemetryInfo.
- * @return {Telemetry}
- */
-function loadTelemetryAndRecordLogs() {
-  info("Mock the Telemetry log function to record logged information");
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
 
-  let Telemetry = require("devtools/shared/telemetry");
-  Telemetry.prototype.telemetryInfo = {};
-  Telemetry.prototype._oldlog = Telemetry.prototype.log;
-  Telemetry.prototype.log = function(histogramId, value) {
-    if (!this.telemetryInfo) {
-      // Can be removed when Bug 992911 lands (see Bug 1011652 Comment 10)
-      return;
-    }
-    if (histogramId) {
-      if (!this.telemetryInfo[histogramId]) {
-        this.telemetryInfo[histogramId] = [];
-      }
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
 
-      this.telemetryInfo[histogramId].push(value);
-    }
-  };
+  if (finishUp) {
+    finishUp();
+  }
+}
 
-  return Telemetry;
+function startTelemetry() {
+  Services.telemetry.canRecordExtended = true;
 }
 
 /**
- * Stop recording the Telemetry logs and put back the utils as it was before.
+ * This method is automatically called on teardown.
  */
-function stopRecordingTelemetryLogs(Telemetry) {
-  Telemetry.prototype.log = Telemetry.prototype._oldlog;
-  delete Telemetry.prototype._oldlog;
-  delete Telemetry.prototype.telemetryInfo;
-}
+function _stopTelemetry() {
+  let Telemetry = devtools.require("devtools/shared/telemetry");
+  let telemetry = new Telemetry();
 
-/**
- * Check the correctness of the data recorded in Telemetry after
- * loadTelemetryAndRecordLogs was called.
- */
-function checkTelemetryResults(Telemetry) {
-  let result = Telemetry.prototype.telemetryInfo;
+  telemetry.clearToolsOpenedPref();
 
-  for (let [histId, value] of Iterator(result)) {
-    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-      ok(value.length === 1 && value[0] === true,
-         "Per user value " + histId + " has a single value of true");
-    } else if (histId.endsWith("OPENED_BOOLEAN")) {
-      ok(value.length > 1, histId + " has more than one entry");
+  Services.telemetry.canRecordExtended = oldCanRecord;
 
-      let okay = value.every(function(element) {
-        return element === true;
-      });
-
-      ok(okay, "All " + histId + " entries are === true");
-    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-      ok(value.length > 1, histId + " has more than one entry");
-
-      let okay = value.every(function(element) {
-        return element > 0;
-      });
-
-      ok(okay, "All " + histId + " entries have time > 0");
+  // Clean up telemetry histogram changes
+  for (let histId in Services.telemetry.histogramSnapshots) {
+    try {
+      let histogram = Services.telemetry.getHistogramById(histId);
+      histogram.clear();
+    } catch(e) {
+      // Histograms is not listed in histograms.json, do nothing.
     }
   }
 }
 
+/**
+ * Check the value of a given telemetry histogram.
+ *
+ * @param  {String} histId
+ *         Histogram id
+ * @param  {Array|Number} expected
+ *         Expected value
+ * @param  {String} checkType
+ *         "array" (default) - Check that an array matches the histogram data.
+ *         "hasentries"  - For non-enumerated linear and exponential
+ *                             histograms. This checks for at least one entry.
+ */
+function checkTelemetry(histId, expected, checkType="array") {
+  let actual = Services.telemetry.getHistogramById(histId).snapshot().counts;
+
+  switch (checkType) {
+    case "array":
+      is(JSON.stringify(actual), JSON.stringify(expected), histId + " correct.");
+    break;
+    case "hasentries":
+      let hasEntry = actual.some(num => num > 0);
+      ok(hasEntry, histId + " has at least one entry.");
+    break;
+  }
+}
+
+/**
+ * Generate telemetry tests. You should call generateTelemetryTests("DEVTOOLS_")
+ * from your result checking code in telemetry tests. It logs checkTelemetry
+ * calls for all changed telemetry values.
+ *
+ * @param  {String} prefix
+ *         Optionally limits results to histogram ids starting with prefix.
+ */
+function generateTelemetryTests(prefix="") {
+  dump("=".repeat(80) + "\n");
+  for (let histId in Services.telemetry.histogramSnapshots) {
+    if (!histId.startsWith(prefix)) {
+      continue;
+    }
+
+    let snapshot = Services.telemetry.histogramSnapshots[histId];
+    let actual = snapshot.counts;
+
+    switch (snapshot.histogram_type) {
+      case Services.telemetry.HISTOGRAM_EXPONENTIAL:
+      case Services.telemetry.HISTOGRAM_LINEAR:
+        let total = 0;
+        for (let val of actual) {
+          total += val;
+        }
+
+        if (histId.endsWith("_ENUMERATED")) {
+          if (total > 0) {
+            dump("checkTelemetry(\"" + histId + "\", " + JSON.stringify(actual) + ");\n");
+          }
+          continue;
+        }
+
+        dump("checkTelemetry(\"" + histId + "\", null, \"hasentries\");\n");
+      break;
+      case Services.telemetry.HISTOGRAM_BOOLEAN:
+        actual = JSON.stringify(actual);
+
+        if (actual !== "[0,0,0]") {
+          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+        }
+      break;
+      case Services.telemetry.HISTOGRAM_FLAG:
+        actual = JSON.stringify(actual);
+
+        if (actual !== "[1,0,0]") {
+          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+        }
+      break;
+      case Services.telemetry.HISTOGRAM_COUNT:
+        dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+      break;
+    }
+  }
+  dump("=".repeat(80) + "\n");
+}
+
 /**
  * Open and close the toolbox in the current browser tab, several times, waiting
  * some amount of time in between.
@@ -230,7 +283,7 @@ function* openAndCloseToolbox(nbOfTimes, usageTime, toolId) {
   for (let i = 0; i < nbOfTimes; i ++) {
     info("Opening toolbox " + (i + 1));
     let target = TargetFactory.forTab(gBrowser.selectedTab);
-    yield gDevTools.showToolbox(target, toolId)
+    yield gDevTools.showToolbox(target, toolId);
 
     // We use a timeout to check the toolbox's active time
     yield new Promise(resolve => setTimeout(resolve, usageTime));
diff --git a/browser/devtools/storage/ui.js b/browser/devtools/storage/ui.js
index 52a0ca12b3d..1e1ee0ce974 100644
--- a/browser/devtools/storage/ui.js
+++ b/browser/devtools/storage/ui.js
@@ -21,8 +21,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "ViewHelpers",
 XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
   "resource:///modules/devtools/VariablesView.jsm");
 
-let Telemetry = require("devtools/shared/telemetry");
-
 /**
  * Localization convenience methods.
  */
@@ -87,9 +85,6 @@ this.StorageUI = function StorageUI(front, target, panelWin) {
 
   this.handleKeypress = this.handleKeypress.bind(this);
   this._panelDoc.addEventListener("keypress", this.handleKeypress);
-
-  this._telemetry = new Telemetry();
-  this._telemetry.toolOpened("storage");
 }
 
 exports.StorageUI = StorageUI;
@@ -102,7 +97,6 @@ StorageUI.prototype = {
   destroy: function() {
     this.front.off("stores-update", this.onUpdate);
     this._panelDoc.removeEventListener("keypress", this.handleKeypress);
-    this._telemetry.toolClosed("storage");
   },
 
   /**
diff --git a/browser/devtools/webaudioeditor/controller.js b/browser/devtools/webaudioeditor/controller.js
index 544650a9104..5f9755f4832 100644
--- a/browser/devtools/webaudioeditor/controller.js
+++ b/browser/devtools/webaudioeditor/controller.js
@@ -42,7 +42,6 @@ let WebAudioEditorController = {
    * Listen for events emitted by the current tab target.
    */
   initialize: Task.async(function* () {
-    telemetry.toolOpened("webaudioeditor");
     this._onTabNavigated = this._onTabNavigated.bind(this);
     this._onThemeChange = this._onThemeChange.bind(this);
 
@@ -76,7 +75,6 @@ let WebAudioEditorController = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
-    telemetry.toolClosed("webaudioeditor");
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
     gFront.off("start-context", this._onStartContext);
diff --git a/browser/devtools/webaudioeditor/includes.js b/browser/devtools/webaudioeditor/includes.js
index 2e6b8ece4ea..acfbe87278c 100644
--- a/browser/devtools/webaudioeditor/includes.js
+++ b/browser/devtools/webaudioeditor/includes.js
@@ -19,10 +19,9 @@ let { EventTarget } = require("sdk/event/target");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 const { Class } = require("sdk/core/heritage");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const STRINGS_URI = "chrome://browser/locale/devtools/webaudioeditor.properties"
+const STRINGS_URI = "chrome://browser/locale/devtools/webaudioeditor.properties";
 const L10N = new ViewHelpers.L10N(STRINGS_URI);
-const Telemetry = require("devtools/shared/telemetry");
-const telemetry = new Telemetry();
+
 devtools.lazyImporter(this, "LineGraphWidget",
   "resource:///modules/devtools/Graphs.jsm");
 
diff --git a/browser/devtools/webide/test/head.js b/browser/devtools/webide/test/head.js
index 71d6697c863..309dbc61262 100644
--- a/browser/devtools/webide/test/head.js
+++ b/browser/devtools/webide/test/head.js
@@ -14,6 +14,8 @@ const {require} = devtools;
 const promise = require("promise");
 const {AppProjects} = require("devtools/app-manager/app-projects");
 
+let oldCanRecord = Services.telemetry.canRecordExtended;
+
 let TEST_BASE;
 if (window.location === "chrome://browser/content/browser.xul") {
   TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/webide/test/";
@@ -33,6 +35,8 @@ Services.prefs.setCharPref("devtools.webide.templatesURL", TEST_BASE + "template
 Services.prefs.setCharPref("devtools.devices.url", TEST_BASE + "browser_devices.json");
 
 SimpleTest.registerCleanupFunction(() => {
+  _stopTelemetry();
+
   Services.prefs.clearUserPref("devtools.webide.enabled");
   Services.prefs.clearUserPref("devtools.webide.enableLocalRuntime");
   Services.prefs.clearUserPref("devtools.webide.autoinstallADBHelper");
@@ -207,3 +211,112 @@ function handleError(aError) {
   ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
   finish();
 }
+
+function startTelemetry() {
+  Services.telemetry.canRecordExtended = true;
+}
+
+/**
+ * This method is automatically called on teardown.
+ */
+function _stopTelemetry() {
+  let Telemetry = devtools.require("devtools/shared/telemetry");
+  let telemetry = new Telemetry();
+
+  telemetry.clearToolsOpenedPref();
+
+  Services.telemetry.canRecordExtended = oldCanRecord;
+
+  // Clean up telemetry histogram changes
+  for (let histId in Services.telemetry.histogramSnapshots) {
+    try {
+      let histogram = Services.telemetry.getHistogramById(histId);
+      histogram.clear();
+    } catch(e) {
+      // Histograms is not listed in histograms.json, do nothing.
+    }
+  }
+}
+
+/**
+ * Check the value of a given telemetry histogram.
+ *
+ * @param  {String} histId
+ *         Histogram id
+ * @param  {Array|Number} expected
+ *         Expected value
+ * @param  {String} checkType
+ *         "array" (default) - Check that an array matches the histogram data.
+ *         "hasentries"  - For non-enumerated linear and exponential
+ *                             histograms. This checks for at least one entry.
+ */
+function checkTelemetry(histId, expected, checkType="array") {
+  let actual = Services.telemetry.getHistogramById(histId).snapshot().counts;
+
+  switch (checkType) {
+    case "array":
+      is(JSON.stringify(actual), JSON.stringify(expected), histId + " correct.");
+    break;
+    case "hasentries":
+      let hasEntry = actual.some(num => num > 0);
+      ok(hasEntry, histId + " has at least one entry.");
+    break;
+  }
+}
+
+/**
+ * Generate telemetry tests. You should call generateTelemetryTests("DEVTOOLS_")
+ * from your result checking code in telemetry tests. It logs checkTelemetry
+ * calls for all changed telemetry values.
+ *
+ * @param  {String} prefix
+ *         Optionally limits results to histogram ids starting with prefix.
+ */
+function generateTelemetryTests(prefix="") {
+  dump("=".repeat(80) + "\n");
+  for (let histId in Services.telemetry.histogramSnapshots) {
+    if (!histId.startsWith(prefix)) {
+      continue;
+    }
+
+    let snapshot = Services.telemetry.histogramSnapshots[histId];
+    let actual = snapshot.counts;
+
+    switch (snapshot.histogram_type) {
+      case Services.telemetry.HISTOGRAM_EXPONENTIAL:
+      case Services.telemetry.HISTOGRAM_LINEAR:
+        let total = 0;
+        for (let val of actual) {
+          total += val;
+        }
+
+        if (histId.endsWith("_ENUMERATED")) {
+          if (total > 0) {
+            dump("checkTelemetry(\"" + histId + "\", " + JSON.stringify(actual) + ");\n");
+          }
+          continue;
+        }
+
+        dump("checkTelemetry(\"" + histId + "\", null, \"hasentries\");\n");
+      break;
+      case Services.telemetry.HISTOGRAM_BOOLEAN:
+        actual = JSON.stringify(actual);
+
+        if (actual !== "[0,0,0]") {
+          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+        }
+      break;
+      case Services.telemetry.HISTOGRAM_FLAG:
+        actual = JSON.stringify(actual);
+
+        if (actual !== "[1,0,0]") {
+          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+        }
+      break;
+      case Services.telemetry.HISTOGRAM_COUNT:
+        dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
+      break;
+    }
+  }
+  dump("=".repeat(80) + "\n");
+}
diff --git a/browser/devtools/webide/test/test_telemetry.html b/browser/devtools/webide/test/test_telemetry.html
index 72eb4d51fed..4133cb65831 100644
--- a/browser/devtools/webide/test/test_telemetry.html
+++ b/browser/devtools/webide/test/test_telemetry.html
@@ -15,7 +15,6 @@
   <body>
 
     <script type="application/javascript;version=1.8">
-      const Telemetry = require("devtools/shared/telemetry");
       const { _DeprecatedUSBRuntime, _WiFiRuntime, _SimulatorRuntime,
               _gRemoteRuntime, _gLocalRuntime, RuntimeTypes }
             = require("devtools/webide/runtimes");
@@ -24,25 +23,6 @@
       // been opened we make use of setTimeout() to create tool active times.
       const TOOL_DELAY = 200;
 
-      function patchTelemetry() {
-        Telemetry.prototype.telemetryInfo = {};
-        Telemetry.prototype._oldlog = Telemetry.prototype.log;
-        Telemetry.prototype.log = function(histogramId, value) {
-          if (histogramId) {
-            if (!this.telemetryInfo[histogramId]) {
-              this.telemetryInfo[histogramId] = [];
-            }
-            this.telemetryInfo[histogramId].push(value);
-          }
-        }
-      }
-
-      function resetTelemetry() {
-        Telemetry.prototype.log = Telemetry.prototype._oldlog;
-        delete Telemetry.prototype._oldlog;
-        delete Telemetry.prototype.telemetryInfo;
-      }
-
       function cycleWebIDE() {
         return Task.spawn(function*() {
           let win = yield openWebIDE();
@@ -150,58 +130,22 @@
       }
 
       function checkResults() {
-        let result = Telemetry.prototype.telemetryInfo;
-        for (let [histId, value] of Iterator(result)) {
-          if (histId.endsWith("OPENED_PER_USER_FLAG")) {
-            ok(value.length === 1 && !!value[0],
-               "Per user value " + histId + " has a single value of true");
-          } else if (histId.endsWith("OPENED_BOOLEAN")) {
-            ok(value.length > 1, histId + " has more than one entry");
-
-            let okay = value.every(function(element) {
-              return !!element;
-            });
-
-            ok(okay, "All " + histId + " entries are true");
-          } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
-            ok(value.length > 1, histId + " has more than one entry");
-
-            let okay = value.every(function(element) {
-              return element > 0;
-            });
-
-            ok(okay, "All " + histId + " entries have time > 0");
-          } else if (histId === "DEVTOOLS_WEBIDE_CONNECTION_RESULT") {
-            ok(value.length === 6, histId + " has 6 connection results");
-
-            let okay = value.every(function(element) {
-              return !!element;
-            });
-
-            ok(okay, "All " + histId + " connections succeeded");
-          } else if (histId.endsWith("CONNECTION_RESULT")) {
-            ok(value.length === 1 && !!value[0],
-               histId + " has 1 successful connection");
-          } else if (histId === "DEVTOOLS_WEBIDE_CONNECTION_TIME_SECONDS") {
-            ok(value.length === 6, histId + " has 6 connection results");
-
-            let okay = value.every(function(element) {
-              return element > 0;
-            });
-
-            ok(okay, "All " + histId + " connections have time > 0");
-          } else if (histId.endsWith("USED")) {
-            ok(value.length === 6, histId + " has 6 connection actions");
-
-            let okay = value.every(function(element) {
-              return !element;
-            });
-
-            ok(okay, "All " + histId + " actions were skipped");
-          } else {
-            ok(false, "Unexpected " + histId + " was logged");
-          }
-        }
+        // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
+        // here.
+        checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_LISTTABS_MS", null, "hasentries");
+        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_DEBUG_USED", [6,0,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_PLAY_USED", [6,0,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_RESULT", [0,6,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_TIME_SECONDS", null, "hasentries");
+        checkTelemetry("DEVTOOLS_WEBIDE_LOCAL_CONNECTION_RESULT", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_OPENED_BOOLEAN", [0,2,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_OPENED_PER_USER_FLAG", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_OTHER_CONNECTION_RESULT", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_REMOTE_CONNECTION_RESULT", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_SIMULATOR_CONNECTION_RESULT", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS", null, "hasentries");
+        checkTelemetry("DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT", [0,1,0]);
+        checkTelemetry("DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT", [0,1,0]);
       }
 
       window.onload = function() {
@@ -216,7 +160,6 @@
             }
             DebuggerServer.destroy();
             yield removeAllProjects();
-            resetTelemetry();
           });
         });
 
@@ -228,7 +171,7 @@
             DebuggerServer.addBrowserActors();
           }
 
-          patchTelemetry();
+          startTelemetry();
 
           // Cycle once, so we can test for multiple opens
           yield cycleWebIDE();

From b55c81ae3150b80477ee5c16c42c0ab23852f738 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Fri, 17 Apr 2015 16:08:11 +0100
Subject: [PATCH 31/80] Bug 1136155 - Alpha-sort events in the events popup
 r=pbrosset

---
 .../browser_markupview_events_jquery_1.0.js   | 20 ++---
 .../browser_markupview_events_jquery_1.1.js   | 20 ++---
 ...browser_markupview_events_jquery_1.11.1.js | 50 +++++------
 .../browser_markupview_events_jquery_1.2.js   | 20 ++---
 .../browser_markupview_events_jquery_1.3.js   | 46 +++++-----
 .../browser_markupview_events_jquery_1.4.js   | 42 ++++-----
 .../browser_markupview_events_jquery_1.6.js   | 90 +++++++++----------
 .../browser_markupview_events_jquery_1.7.js   | 58 ++++++------
 .../browser_markupview_events_jquery_2.1.1.js | 50 +++++------
 toolkit/devtools/server/actors/inspector.js   |  4 +
 10 files changed, 202 insertions(+), 198 deletions(-)

diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js
index f9d4cd85129..09b1bca3eae 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js
@@ -157,16 +157,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":894",
@@ -197,6 +187,16 @@ const TEST_DATA = [
                  "  return returnValue;\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":894",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js
index 38de987f21e..8473fcbfda4 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js
@@ -171,16 +171,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":1224",
@@ -221,6 +211,16 @@ const TEST_DATA = [
                  "  return returnValue;\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":1224",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js
index 6073c4c65f9..74e003d3da2 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js
@@ -103,16 +103,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -124,6 +114,16 @@ const TEST_DATA = [
                  "  return typeof m === K || a && m.event.triggered === a.type ? void 0 : m.event.dispatch.apply(k.elem, arguments)\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -141,17 +141,6 @@ const TEST_DATA = [
   {
     selector: "#livediv",
     expected: [
-      {
-        type: "dragleave",
-        filename: TEST_URL + ":30",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler3 = function liveDivDragLeave() {\n" +
-                 "  alert(3);\n" +
-                 "}"
-      },
       {
         type: "dragend",
         filename: TEST_URL + ":31",
@@ -164,14 +153,14 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "drop",
-        filename: TEST_URL + ":32",
+        type: "dragleave",
+        filename: TEST_URL + ":30",
         attributes: [
           "jQuery",
           "Live"
         ],
-        handler: "var handler5 = function liveDivDrop() {\n" +
-                 "  alert(5);\n" +
+        handler: "var handler3 = function liveDivDragLeave() {\n" +
+                 "  alert(3);\n" +
                  "}"
       },
       {
@@ -184,6 +173,17 @@ const TEST_DATA = [
         handler: "var handler6 = function liveDivDragOver() {\n" +
                  "  alert(6);\n" +
                  "}"
+      },
+      {
+        type: "drop",
+        filename: TEST_URL + ":32",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler5 = function liveDivDrop() {\n" +
+                 "  alert(5);\n" +
+                 "}"
       }
     ]
   },
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js
index eb20d02c567..2f0a01715a3 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js
@@ -142,16 +142,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":24",
@@ -166,6 +156,16 @@ const TEST_DATA = [
                  "  return val;\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":24",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js
index 925f2e58015..46206a98ce6 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js
@@ -16,17 +16,6 @@ const TEST_DATA = [
   {
     selector: "html",
     expected: [
-      {
-        type: "unload",
-        filename: TEST_URL_ROOT + TEST_LIB + ":19",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "function(H) {\n" +
-                 "  n(this).unbind(H, D);\n" +
-                 "  return (E || G).apply(this, arguments)\n" +
-                 "}"
-      },
       {
         type: "load",
         filename: TEST_URL_ROOT + TEST_LIB + ":19",
@@ -108,7 +97,7 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "unload",
+        type: "load",
         filename: TEST_URL_ROOT + TEST_LIB + ":19",
         attributes: [
           "Bubbling",
@@ -119,7 +108,18 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "load",
+        type: "unload",
+        filename: TEST_URL_ROOT + TEST_LIB + ":19",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "function(H) {\n" +
+                 "  n(this).unbind(H, D);\n" +
+                 "  return (E || G).apply(this, arguments)\n" +
+                 "}"
+      },
+      {
+        type: "unload",
         filename: TEST_URL_ROOT + TEST_LIB + ":19",
         attributes: [
           "Bubbling",
@@ -154,16 +154,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":19",
@@ -175,6 +165,16 @@ const TEST_DATA = [
                  "  return typeof n !== \"undefined\" && !n.event.triggered ? n.event.handle.apply(arguments.callee.elem, arguments) : g\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":19",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js
index 2265a15f479..c312a676b2f 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js
@@ -121,16 +121,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":48",
@@ -142,6 +132,16 @@ const TEST_DATA = [
                  "  return typeof c !== \"undefined\" && !c.event.triggered ? c.event.handle.apply(j.elem, arguments) : w\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":48",
@@ -169,17 +169,6 @@ const TEST_DATA = [
                  "  alert(1);\n" +
                  "}"
       },
-      {
-        type: "dragstart",
-        filename: TEST_URL + ":29",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler2 = function liveDivDragStart() {\n" +
-                 "  alert(2);\n" +
-                 "}"
-      },
       {
         type: "dblclick",
         filename: TEST_URL_ROOT + TEST_LIB + ":17",
@@ -228,6 +217,17 @@ const TEST_DATA = [
                  "  return b\n" +
                  "}"
       },
+      {
+        type: "dragstart",
+        filename: TEST_URL + ":29",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler2 = function liveDivDragStart() {\n" +
+                 "  alert(2);\n" +
+                 "}"
+      },
       {
         type: "dragstart",
         filename: TEST_URL_ROOT + TEST_LIB + ":17",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js
index 9ffc7c26048..78ecb01216e 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js
@@ -118,16 +118,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
@@ -139,6 +129,16 @@ const TEST_DATA = [
                  "  return typeof f != \"undefined\" && (!a || f.event.triggered !== a.type) ? f.event.handle.apply(k.elem, arguments) : b\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
@@ -166,39 +166,6 @@ const TEST_DATA = [
                  "  alert(1);\n" +
                  "}"
       },
-      {
-        type: "dragstart",
-        filename: TEST_URL + ":29",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler2 = function liveDivDragStart() {\n" +
-                 "  alert(2);\n" +
-                 "}"
-      },
-      {
-        type: "dragleave",
-        filename: TEST_URL + ":30",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler3 = function liveDivDragLeave() {\n" +
-                 "  alert(3);\n" +
-                 "}"
-      },
-      {
-        type: "dragend",
-        filename: TEST_URL + ":31",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler4 = function liveDivDragEnd() {\n" +
-                 "  alert(4);\n" +
-                 "}"
-      },
       {
         type: "dblclick",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
@@ -244,7 +211,18 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "dragstart",
+        type: "dragend",
+        filename: TEST_URL + ":31",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler4 = function liveDivDragEnd() {\n" +
+                 "  alert(4);\n" +
+                 "}"
+      },
+      {
+        type: "dragend",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
         attributes: [
           "jQuery",
@@ -287,6 +265,17 @@ const TEST_DATA = [
                  "  }\n" +
                  "}"
       },
+      {
+        type: "dragleave",
+        filename: TEST_URL + ":30",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler3 = function liveDivDragLeave() {\n" +
+                 "  alert(3);\n" +
+                 "}"
+      },
       {
         type: "dragleave",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
@@ -332,7 +321,18 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "dragend",
+        type: "dragstart",
+        filename: TEST_URL + ":29",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler2 = function liveDivDragStart() {\n" +
+                 "  alert(2);\n" +
+                 "}"
+      },
+      {
+        type: "dragstart",
         filename: TEST_URL_ROOT + TEST_LIB + ":16",
         attributes: [
           "jQuery",
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js
index 1a28e6ae527..a1c316fba2e 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js
@@ -118,16 +118,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -139,6 +129,16 @@ const TEST_DATA = [
                  "  return typeof f != \"undefined\" && (!a || f.event.triggered !== a.type) ? f.event.dispatch.apply(i.elem, arguments) : b\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -167,14 +167,14 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "dragstart",
-        filename: TEST_URL + ":29",
+        type: "dragend",
+        filename: TEST_URL + ":31",
         attributes: [
           "jQuery",
           "Live"
         ],
-        handler: "var handler2 = function liveDivDragStart() {\n" +
-                 "  alert(2);\n" +
+        handler: "var handler4 = function liveDivDragEnd() {\n" +
+                 "  alert(4);\n" +
                  "}"
       },
       {
@@ -189,14 +189,25 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "dragend",
-        filename: TEST_URL + ":31",
+        type: "dragover",
+        filename: TEST_URL + ":33",
         attributes: [
           "jQuery",
           "Live"
         ],
-        handler: "var handler4 = function liveDivDragEnd() {\n" +
-                 "  alert(4);\n" +
+        handler: "var handler6 = function liveDivDragOver() {\n" +
+                 "  alert(6);\n" +
+                 "}"
+      },
+      {
+        type: "dragstart",
+        filename: TEST_URL + ":29",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler2 = function liveDivDragStart() {\n" +
+                 "  alert(2);\n" +
                  "}"
       },
       {
@@ -209,17 +220,6 @@ const TEST_DATA = [
         handler: "var handler5 = function liveDivDrop() {\n" +
                  "  alert(5);\n" +
                  "}"
-      },
-      {
-        type: "dragover",
-        filename: TEST_URL + ":33",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler6 = function liveDivDragOver() {\n" +
-                 "  alert(6);\n" +
-                 "}"
       }
     ]
   },
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js b/browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js
index 062f729f39c..a43adb5a2e0 100644
--- a/browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js
+++ b/browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js
@@ -102,16 +102,6 @@ const TEST_DATA = [
                  "  alert(8);\n" +
                  "}"
       },
-      {
-        type: "keydown",
-        filename: TEST_URL + ":36",
-        attributes: [
-          "jQuery"
-        ],
-        handler: "var handler9 = function divKeyDown() {\n" +
-                 "  alert(9);\n" +
-                 "}"
-      },
       {
         type: "click",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -123,6 +113,16 @@ const TEST_DATA = [
                  "  return typeof n !== U && n.event.triggered !== b.type ? n.event.dispatch.apply(a, arguments) : void 0\n" +
                  "}"
       },
+      {
+        type: "keydown",
+        filename: TEST_URL + ":36",
+        attributes: [
+          "jQuery"
+        ],
+        handler: "var handler9 = function divKeyDown() {\n" +
+                 "  alert(9);\n" +
+                 "}"
+      },
       {
         type: "keydown",
         filename: TEST_URL_ROOT + TEST_LIB + ":3",
@@ -139,17 +139,6 @@ const TEST_DATA = [
   {
     selector: "#livediv",
     expected: [
-      {
-        type: "dragleave",
-        filename: TEST_URL + ":30",
-        attributes: [
-          "jQuery",
-          "Live"
-        ],
-        handler: "var handler3 = function liveDivDragLeave() {\n" +
-                 "  alert(3);\n" +
-                 "}"
-      },
       {
         type: "dragend",
         filename: TEST_URL + ":31",
@@ -162,14 +151,14 @@ const TEST_DATA = [
                  "}"
       },
       {
-        type: "drop",
-        filename: TEST_URL + ":32",
+        type: "dragleave",
+        filename: TEST_URL + ":30",
         attributes: [
           "jQuery",
           "Live"
         ],
-        handler: "var handler5 = function liveDivDrop() {\n" +
-                 "  alert(5);\n" +
+        handler: "var handler3 = function liveDivDragLeave() {\n" +
+                 "  alert(3);\n" +
                  "}"
       },
       {
@@ -182,6 +171,17 @@ const TEST_DATA = [
         handler: "var handler6 = function liveDivDragOver() {\n" +
                  "  alert(6);\n" +
                  "}"
+      },
+      {
+        type: "drop",
+        filename: TEST_URL + ":32",
+        attributes: [
+          "jQuery",
+          "Live"
+        ],
+        handler: "var handler5 = function liveDivDrop() {\n" +
+                 "  alert(5);\n" +
+                 "}"
       }
     ]
   },
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index 12cc7fb0935..01ff79207f8 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -413,6 +413,10 @@ var NodeActor = exports.NodeActor = protocol.ActorClass({
       }
     }
 
+    events.sort((a, b) => {
+      return a.type.localeCompare(b.type);
+    });
+
     return events;
   },
 

From c71c722a7a6c52d5d4203903dada81f2aac0547d Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Fri, 17 Apr 2015 11:53:06 +0100
Subject: [PATCH 32/80] Bug 1136257 - Shift-click to switch between color unit
 format in place r=bgrins

---
 .../devtools/shared/test/browser_css_color.js | 15 +---
 browser/devtools/shared/widgets/Tooltip.js    |  5 ++
 .../devtools/styleinspector/computed-view.js  | 75 ++++++++++++++++++-
 .../styleinspector/computedview.xhtml         | 33 --------
 .../devtools/styleinspector/test/browser.ini  |  2 +
 .../test/browser_computedview_cycle_color.js  | 68 +++++++++++++++++
 .../test/browser_ruleview_cycle-color.js      | 60 +++++++++++++++
 toolkit/devtools/css-color.js                 | 36 ++++++++-
 toolkit/devtools/output-parser.js             | 21 +++++-
 9 files changed, 264 insertions(+), 51 deletions(-)
 create mode 100644 browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
 create mode 100644 browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js

diff --git a/browser/devtools/shared/test/browser_css_color.js b/browser/devtools/shared/test/browser_css_color.js
index 4f4f29be5f0..f1dd1d53744 100644
--- a/browser/devtools/shared/test/browser_css_color.js
+++ b/browser/devtools/shared/test/browser_css_color.js
@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const COLOR_UNIT_PREF = "devtools.defaultColorUnit";
 const TEST_URI = "data:text/html;charset=utf-8,browser_css_color.js";
 let {colorUtils} = devtools.require("devtools/css-color");
 let origColorUnit;
@@ -9,7 +8,6 @@ let origColorUnit;
 add_task(function*() {
   yield promiseTab("about:blank");
   let [host, win, doc] = yield createHost("bottom", TEST_URI);
-  origColorUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
 
   info("Creating a test canvas element to test colors");
   let canvas = createTestCanvas(doc);
@@ -49,23 +47,19 @@ function testColorUtils(canvas) {
 }
 
 function testToString(color, name, hex, hsl, rgb) {
-  switchColorUnit(colorUtils.CssColor.COLORUNIT.name);
+  color.colorUnit = colorUtils.CssColor.COLORUNIT.name;
   is(color.toString(), name, "toString() with authored type");
 
-  switchColorUnit(colorUtils.CssColor.COLORUNIT.hex);
+  color.colorUnit = colorUtils.CssColor.COLORUNIT.hex;
   is(color.toString(), hex, "toString() with hex type");
 
-  switchColorUnit(colorUtils.CssColor.COLORUNIT.hsl);
+  color.colorUnit = colorUtils.CssColor.COLORUNIT.hsl;
   is(color.toString(), hsl, "toString() with hsl type");
 
-  switchColorUnit(colorUtils.CssColor.COLORUNIT.rgb);
+  color.colorUnit = colorUtils.CssColor.COLORUNIT.rgb;
   is(color.toString(), rgb, "toString() with rgb type");
 }
 
-function switchColorUnit(unit) {
-  Services.prefs.setCharPref(COLOR_UNIT_PREF, unit);
-}
-
 function testColorMatch(name, hex, hsl, rgb, rgba, canvas) {
   let target;
   let ctx = canvas.getContext("2d");
@@ -110,7 +104,6 @@ function testColorMatch(name, hex, hsl, rgb, rgba, canvas) {
   test(hex, "hex");
   test(hsl, "hsl");
   test(rgb, "rgb");
-  switchColorUnit(origColorUnit);
 }
 
 function testProcessCSSString() {
diff --git a/browser/devtools/shared/widgets/Tooltip.js b/browser/devtools/shared/widgets/Tooltip.js
index bc58325e73c..abe8a818c85 100644
--- a/browser/devtools/shared/widgets/Tooltip.js
+++ b/browser/devtools/shared/widgets/Tooltip.js
@@ -1020,6 +1020,11 @@ SwatchBasedEditorTooltip.prototype = {
 
   _onSwatchClick: function(event) {
     let swatch = this.swatches.get(event.target);
+
+    if (event.shiftKey) {
+      event.stopPropagation();
+      return;
+    }
     if (swatch) {
       this.activeSwatch = event.target;
       this.show();
diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js
index 2cc5a7747bc..07eb0cad159 100644
--- a/browser/devtools/styleinspector/computed-view.js
+++ b/browser/devtools/styleinspector/computed-view.js
@@ -980,7 +980,6 @@ function PropertyView(aTree, aName)
 
   this.link = "https://developer.mozilla.org/CSS/" + aName;
 
-  this.templateMatchedSelectors = aTree.styleDocument.getElementById("templateMatchedSelectors");
   this._propertyInfo = new PropertyInfo(aTree, aName);
 }
 
@@ -1192,6 +1191,7 @@ PropertyView.prototype = {
       this.propertyInfo.value,
       {
         colorSwatchClass: "computedview-colorswatch",
+        colorClass: "computedview-color",
         urlClass: "theme-link"
         // No need to use baseURI here as computed URIs are never relative.
       });
@@ -1222,9 +1222,10 @@ PropertyView.prototype = {
         }
 
         this._matchedSelectorResponse = matched;
-        CssHtmlTree.processTemplate(this.templateMatchedSelectors,
-          this.matchedSelectorsContainer, this);
+
+        this._buildMatchedSelectors();
         this.matchedExpander.setAttribute("open", "");
+
         this.tree.inspector.emit("computed-view-property-expanded");
       }).then(null, console.error);
     } else {
@@ -1240,6 +1241,40 @@ PropertyView.prototype = {
     return this._matchedSelectorResponse;
   },
 
+  _buildMatchedSelectors: function() {
+    let frag = this.element.ownerDocument.createDocumentFragment();
+
+    for (let selector of this.matchedSelectorViews) {
+      let p = createChild(frag, "p");
+      let span = createChild(p, "span", {
+        class: "rule-link"
+      });
+      let link = createChild(span, "a", {
+        target: "_blank",
+        class: "link theme-link",
+        title: selector.href,
+        sourcelocation: selector.source,
+        tabindex: "0",
+        textContent: selector.source
+      });
+      link.addEventListener("click", selector.openStyleEditor, false);
+      link.addEventListener("keydown", selector.maybeOpenStyleEditor, false);
+
+      let status = createChild(p, "span", {
+        dir: "ltr",
+        class: "rule-text theme-fg-color3 " + selector.statusClass,
+        title: selector.statusText,
+        textContent: selector.sourceText
+      });
+      let valueSpan = createChild(status, "span", {
+        class: "other-property-value theme-fg-color1"
+      });
+      valueSpan.appendChild(selector.outputFragment);
+    }
+
+    this.matchedSelectorsContainer.appendChild(frag);
+  },
+
   /**
    * Provide access to the matched SelectorViews that we are currently
    * displaying.
@@ -1279,6 +1314,9 @@ PropertyView.prototype = {
    */
   onMatchedToggle: function PropertyView_onMatchedToggle(aEvent)
   {
+    if (aEvent.shiftKey) {
+      return;
+    }
     this.matchedExpanded = !this.matchedExpanded;
     this.refreshMatchedSelectors();
     aEvent.preventDefault();
@@ -1328,6 +1366,9 @@ function SelectorView(aTree, aSelectorInfo)
   this.selectorInfo = aSelectorInfo;
   this._cacheStatusNames();
 
+  this.openStyleEditor = this.openStyleEditor.bind(this);
+  this.maybeOpenStyleEditor = this.maybeOpenStyleEditor.bind(this);
+
   this.updateSourceLink();
 }
 
@@ -1418,6 +1459,7 @@ SelectorView.prototype = {
       this.selectorInfo.name,
       this.selectorInfo.value, {
       colorSwatchClass: "computedview-colorswatch",
+      colorClass: "computedview-color",
       urlClass: "theme-link",
       baseURI: this.selectorInfo.rule.href
     });
@@ -1540,5 +1582,32 @@ SelectorView.prototype = {
   }
 };
 
+/**
+ * Create a child element with a set of attributes.
+ *
+ * @param {Element} aParent
+ *        The parent node.
+ * @param {string} aTag
+ *        The tag name.
+ * @param {object} aAttributes
+ *        A set of attributes to set on the node.
+ */
+function createChild(aParent, aTag, aAttributes={}) {
+  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
+  for (let attr in aAttributes) {
+    if (aAttributes.hasOwnProperty(attr)) {
+      if (attr === "textContent") {
+        elt.textContent = aAttributes[attr];
+      } else if(attr === "child") {
+        elt.appendChild(aAttributes[attr]);
+      } else {
+        elt.setAttribute(attr, aAttributes[attr]);
+      }
+    }
+  }
+  aParent.appendChild(elt);
+  return elt;
+}
+
 exports.CssHtmlTree = CssHtmlTree;
 exports.PropertyView = PropertyView;
diff --git a/browser/devtools/styleinspector/computedview.xhtml b/browser/devtools/styleinspector/computedview.xhtml
index c922f3979a7..121475537c5 100644
--- a/browser/devtools/styleinspector/computedview.xhtml
+++ b/browser/devtools/styleinspector/computedview.xhtml
@@ -72,38 +72,5 @@
       &noPropertiesFound;
     </div>
 
-    <!--
-    To visually debug the templates without running firefox, alter the display:none
-    -->
-    <div style="display:none;">
-      <!--
-      A templateMatchedSelectors sits inside each templateProperties showing the
-      list of selectors that affect that property. Each needs data like this:
-      {
-        matchedSelectorViews: ..., // from cssHtmlTree.propertyViews[name].matchedSelectorViews
-      }
-      This is a template so the parent does not need to be a table, except that
-      using a div as the parent causes the DOM to muck with the tr elements
-      -->
-      <div id="templateMatchedSelectors">
-        <loop foreach="selector in ${matchedSelectorViews}">
-          <p>
-            <span class="rule-link">
-              <a target="_blank" class="link theme-link"
-                  onclick="${selector.openStyleEditor}"
-                  onkeydown="${selector.maybeOpenStyleEditor}"
-                  title="${selector.href}"
-                  sourcelocation="${selector.source}"
-                  tabindex="0">${selector.source}</a>
-            </span>
-            <span dir="ltr" class="rule-text ${selector.statusClass} theme-fg-color3" title="${selector.statusText}">
-              ${selector.sourceText}
-              <span class="other-property-value theme-fg-color1">${selector.outputFragment}</span>
-            </span>
-          </p>
-        </loop>
-      </div>
-    </div>
-
   </body>
 </html>
diff --git a/browser/devtools/styleinspector/test/browser.ini b/browser/devtools/styleinspector/test/browser.ini
index ff074ef9df8..824fd85bfbd 100644
--- a/browser/devtools/styleinspector/test/browser.ini
+++ b/browser/devtools/styleinspector/test/browser.ini
@@ -27,6 +27,7 @@ support-files =
   head.js
 
 [browser_computedview_browser-styles.js]
+[browser_computedview_cycle_color.js]
 [browser_computedview_getNodeInfo.js]
 [browser_computedview_keybindings_01.js]
 [browser_computedview_keybindings_02.js]
@@ -99,6 +100,7 @@ skip-if = (os == "win" && debug) || e10s # bug 963492: win. bug 1040653: e10s.
 [browser_ruleview_multiple_properties_01.js]
 [browser_ruleview_multiple_properties_02.js]
 [browser_ruleview_original-source-link.js]
+[browser_ruleview_cycle-color.js]
 [browser_ruleview_override.js]
 [browser_ruleview_pseudo-element_01.js]
 [browser_ruleview_pseudo-element_02.js]
diff --git a/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js b/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
new file mode 100644
index 00000000000..9aef6629b6c
--- /dev/null
+++ b/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
@@ -0,0 +1,68 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Computed view color cycling test.
+
+const PAGE_CONTENT = [
+  "<style type=\"text/css\">",
+  ".matches {color: #F00;}</style>",
+  "<span id=\"matches\" class=\"matches\">Some styled text</span>",
+  "</div>"
+].join("\n");
+
+add_task(function*() {
+  yield addTab("data:text/html;charset=utf-8," +
+               "Computed view color cycling test.");
+  content.document.body.innerHTML = PAGE_CONTENT;
+
+  info("Opening the computed view");
+  let {toolbox, inspector, view} = yield openComputedView();
+
+  info("Selecting the test node");
+  yield selectNode("#matches", inspector);
+
+  info("Checking the property itself");
+  let container = getComputedViewPropertyView(view, "color").valueNode;
+  checkColorCycling(container, inspector);
+
+  info("Checking matched selectors");
+  container = yield getComputedViewMatchedRules(view, "color");
+  checkColorCycling(container, inspector);
+});
+
+function checkColorCycling(container, inspector) {
+  let swatch = container.querySelector(".computedview-colorswatch");
+  let valueNode = container.querySelector(".computedview-color");
+  let win = inspector.sidebar.getWindowForTab("computedview");
+
+  // Hex (default)
+  is(valueNode.textContent, "#F00", "Color displayed as a hex value.");
+
+  // HSL
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "hsl(0, 100%, 50%)",
+                            "Color displayed as an HSL value.");
+
+  // RGB
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "rgb(255, 0, 0)",
+                            "Color displayed as an RGB value.");
+
+  // Color name
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "red",
+                            "Color displayed as a color name.");
+
+  // "Authored" (currently the computed value)
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "rgb(255, 0, 0)",
+                            "Color displayed as an RGB value.");
+
+  // Back to hex
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "#F00",
+                            "Color displayed as hex again.");
+}
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js b/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js
new file mode 100644
index 00000000000..1124cfe02b2
--- /dev/null
+++ b/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js
@@ -0,0 +1,60 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test cycling color types in the rule view.
+
+const PAGE_CONTENT = [
+  "<style type=\"text/css\">",
+  "  body {",
+  "    color: #F00;",
+  "  }",
+  "</style>",
+  "Test cycling color types in the rule view!"
+].join("\n");
+
+add_task(function*() {
+  yield addTab("data:text/html;charset=utf-8,Test cycling color types in the " +
+               "rule view.");
+  content.document.body.innerHTML = PAGE_CONTENT;
+  let {toolbox, inspector, view} = yield openRuleView();
+
+  let container = getRuleViewProperty(view, "body", "color").valueSpan;
+  checkColorCycling(container, inspector);
+});
+
+function checkColorCycling(container, inspector) {
+  let swatch = container.querySelector(".ruleview-colorswatch");
+  let valueNode = container.querySelector(".ruleview-color");
+  let win = inspector.sidebar.getWindowForTab("ruleview");
+
+  // Hex (default)
+  is(valueNode.textContent, "#F00", "Color displayed as a hex value.");
+
+  // HSL
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "hsl(0, 100%, 50%)",
+                            "Color displayed as an HSL value.");
+
+  // RGB
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "rgb(255, 0, 0)",
+                            "Color displayed as an RGB value.");
+
+  // Color name
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "red",
+                            "Color displayed as a color name.");
+
+  // "Authored" (currently the computed value)
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "rgb(255, 0, 0)",
+                            "Color displayed as an RGB value.");
+
+  // Back to hex
+  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
+  is(valueNode.textContent, "#F00",
+                            "Color displayed as hex again.");
+}
diff --git a/toolkit/devtools/css-color.js b/toolkit/devtools/css-color.js
index 4cfabd66711..4451ecb4f51 100644
--- a/toolkit/devtools/css-color.js
+++ b/toolkit/devtools/css-color.js
@@ -95,8 +95,22 @@ CssColor.COLORUNIT = {
 };
 
 CssColor.prototype = {
+  _colorUnit: null,
+
   authored: null,
 
+  get colorUnit() {
+    if (this._colorUnit === null) {
+      let defaultUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
+      this._colorUnit = CssColor.COLORUNIT[defaultUnit];
+    }
+    return this._colorUnit;
+  },
+
+  set colorUnit(unit) {
+    this._colorUnit = unit;
+  },
+
   get hasAlpha() {
     if (!this.valid) {
       return false;
@@ -269,15 +283,31 @@ CssColor.prototype = {
     return this;
   },
 
+  nextColorUnit: function() {
+    // Reorder the formats array to have the current format at the
+    // front so we can cycle through.
+    let formats = ["authored", "hex", "hsl", "rgb", "name"];
+    let putOnEnd = formats.splice(0, formats.indexOf(this.colorUnit));
+    formats = formats.concat(putOnEnd);
+    let currentDisplayedColor = this[formats[0]];
+
+    for (let format of formats) {
+      if (this[format].toLowerCase() !== currentDisplayedColor.toLowerCase()) {
+        this.colorUnit = CssColor.COLORUNIT[format];
+        break;
+      }
+    }
+
+    return this.toString();
+  },
+
   /**
    * Return a string representing a color of type defined in COLOR_UNIT_PREF.
    */
   toString: function() {
     let color;
-    let defaultUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
-    let unit = CssColor.COLORUNIT[defaultUnit];
 
-    switch(unit) {
+    switch(this.colorUnit) {
       case CssColor.COLORUNIT.authored:
         color = this.authored;
         break;
diff --git a/toolkit/devtools/output-parser.js b/toolkit/devtools/output-parser.js
index fa501c33279..0ed2e2ded18 100644
--- a/toolkit/devtools/output-parser.js
+++ b/toolkit/devtools/output-parser.js
@@ -77,6 +77,8 @@ loader.lazyGetter(this, "REGEX_ALL_CSS_PROPERTIES", function () {
  */
 function OutputParser() {
   this.parsed = [];
+  this.colorSwatches = new WeakMap();
+  this._onSwatchMouseDown = this._onSwatchMouseDown.bind(this);
 }
 
 exports.OutputParser = OutputParser;
@@ -396,12 +398,14 @@ OutputParser.prototype = {
           class: options.colorSwatchClass,
           style: "background-color:" + color
         });
+        this.colorSwatches.set(swatch, colorObj);
+        swatch.addEventListener("mousedown", this._onSwatchMouseDown, false);
         container.appendChild(swatch);
       }
 
       if (options.defaultColorType) {
         color = colorObj.toString();
-        container.dataset["color"] = color;
+        container.dataset.color = color;
       }
 
       let value = this._createNode("span", {
@@ -435,6 +439,21 @@ OutputParser.prototype = {
     this.parsed.push(container);
   },
 
+  _onSwatchMouseDown: function(event) {
+    // Prevent text selection in the case of shift-click or double-click.
+    event.preventDefault();
+
+    if (!event.shiftKey) {
+      return;
+    }
+
+    let swatch = event.target;
+    let color = this.colorSwatches.get(swatch);
+    let val = color.nextColorUnit();
+
+    swatch.nextElementSibling.textContent = val;
+  },
+
    /**
     * Append a URL to the output.
     *

From 1ba364eb2a4d1cabcb10f06982e0c989fa969f84 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Mon, 20 Apr 2015 11:10:05 -0700
Subject: [PATCH 33/80] Bug 1150697 - Add IP address to the Network Monitor
 domain tooltip. r=bgrins

---
 browser/devtools/netmonitor/netmonitor-view.js | 6 ++++++
 browser/devtools/netmonitor/test/head.js       | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/browser/devtools/netmonitor/netmonitor-view.js
index 9eff49e60bb..7f540a16362 100644
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -1230,6 +1230,7 @@ RequestsMenuView.prototype = Heritage.extend(WidgetMethods, {
             break;
           case "remoteAddress":
             requestItem.attachment.remoteAddress = value;
+            this.updateMenuView(requestItem, key, value);
             break;
           case "remotePort":
             requestItem.attachment.remotePort = value;
@@ -1382,6 +1383,11 @@ RequestsMenuView.prototype = Heritage.extend(WidgetMethods, {
         domain.setAttribute("tooltiptext", hostPort);
         break;
       }
+      case "remoteAddress":
+        let domain = $(".requests-menu-domain", target);
+        let tooltip = domain.getAttribute("value") + " (" + aValue + ")";
+        domain.setAttribute("tooltiptext", tooltip);
+        break;
       case "securityState": {
         let tooltip = L10N.getStr("netmonitor.security.state." + aValue);
         let icon = $(".requests-security-state-icon", target);
diff --git a/browser/devtools/netmonitor/test/head.js b/browser/devtools/netmonitor/test/head.js
index 3f1b0898ba5..d3551c95354 100644
--- a/browser/devtools/netmonitor/test/head.js
+++ b/browser/devtools/netmonitor/test/head.js
@@ -275,6 +275,7 @@ function verifyRequestItemTarget(aRequestItem, aMethod, aUrl, aData = {}) {
   let name = uri.fileName || "/";
   let query = uri.query;
   let hostPort = uri.hostPort;
+  let remoteAddress = attachment.remoteAddress;
 
   if (fuzzyUrl) {
     ok(attachment.method.startsWith(aMethod), "The attached method is incorrect.");
@@ -301,8 +302,10 @@ function verifyRequestItemTarget(aRequestItem, aMethod, aUrl, aData = {}) {
 
   is(target.querySelector(".requests-menu-domain").getAttribute("value"),
     hostPort, "The displayed domain is incorrect.");
+
+  let domainTooltip = hostPort + (remoteAddress ? " (" + remoteAddress + ")" : "");
   is(target.querySelector(".requests-menu-domain").getAttribute("tooltiptext"),
-    hostPort, "The tooltip domain is incorrect.");
+    domainTooltip, "The tooltip domain is incorrect.");
 
   if (status !== undefined) {
     let value = target.querySelector(".requests-menu-status").getAttribute("code");

From 88e7bde76816adc98eb185ae488af64b3395d5f2 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Mon, 20 Apr 2015 11:10:09 -0700
Subject: [PATCH 34/80] Bug 1150697 - Fix confusing messages in Network Monitor
 tests. r=bgrins

---
 browser/devtools/netmonitor/test/head.js | 52 ++++++++++++------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/browser/devtools/netmonitor/test/head.js b/browser/devtools/netmonitor/test/head.js
index d3551c95354..a70799f435e 100644
--- a/browser/devtools/netmonitor/test/head.js
+++ b/browser/devtools/netmonitor/test/head.js
@@ -278,34 +278,34 @@ function verifyRequestItemTarget(aRequestItem, aMethod, aUrl, aData = {}) {
   let remoteAddress = attachment.remoteAddress;
 
   if (fuzzyUrl) {
-    ok(attachment.method.startsWith(aMethod), "The attached method is incorrect.");
-    ok(attachment.url.startsWith(aUrl), "The attached url is incorrect.");
+    ok(attachment.method.startsWith(aMethod), "The attached method is correct.");
+    ok(attachment.url.startsWith(aUrl), "The attached url is correct.");
   } else {
-    is(attachment.method, aMethod, "The attached method is incorrect.");
-    is(attachment.url, aUrl, "The attached url is incorrect.");
+    is(attachment.method, aMethod, "The attached method is correct.");
+    is(attachment.url, aUrl, "The attached url is correct.");
   }
 
   is(target.querySelector(".requests-menu-method").getAttribute("value"),
-    aMethod, "The displayed method is incorrect.");
+    aMethod, "The displayed method is correct.");
 
   if (fuzzyUrl) {
     ok(target.querySelector(".requests-menu-file").getAttribute("value").startsWith(
-      name + (query ? "?" + query : "")), "The displayed file is incorrect.");
+      name + (query ? "?" + query : "")), "The displayed file is correct.");
     ok(target.querySelector(".requests-menu-file").getAttribute("tooltiptext").startsWith(
-      name + (query ? "?" + query : "")), "The tooltip file is incorrect.");
+      name + (query ? "?" + query : "")), "The tooltip file is correct.");
   } else {
     is(target.querySelector(".requests-menu-file").getAttribute("value"),
-      name + (query ? "?" + query : ""), "The displayed file is incorrect.");
+      name + (query ? "?" + query : ""), "The displayed file is correct.");
     is(target.querySelector(".requests-menu-file").getAttribute("tooltiptext"),
-      name + (query ? "?" + query : ""), "The tooltip file is incorrect.");
+      name + (query ? "?" + query : ""), "The tooltip file is correct.");
   }
 
   is(target.querySelector(".requests-menu-domain").getAttribute("value"),
-    hostPort, "The displayed domain is incorrect.");
+    hostPort, "The displayed domain is correct.");
 
   let domainTooltip = hostPort + (remoteAddress ? " (" + remoteAddress + ")" : "");
   is(target.querySelector(".requests-menu-domain").getAttribute("tooltiptext"),
-    domainTooltip, "The tooltip domain is incorrect.");
+    domainTooltip, "The tooltip domain is correct.");
 
   if (status !== undefined) {
     let value = target.querySelector(".requests-menu-status").getAttribute("code");
@@ -314,54 +314,54 @@ function verifyRequestItemTarget(aRequestItem, aMethod, aUrl, aData = {}) {
     info("Displayed status: " + value);
     info("Displayed code: " + codeValue);
     info("Tooltip status: " + tooltip);
-    is(value, status, "The displayed status is incorrect.");
-    is(codeValue, status, "The displayed status code is incorrect.");
-    is(tooltip, status + " " + statusText, "The tooltip status is incorrect.");
+    is(value, status, "The displayed status is correct.");
+    is(codeValue, status, "The displayed status code is correct.");
+    is(tooltip, status + " " + statusText, "The tooltip status is correct.");
   }
   if (type !== undefined) {
     let value = target.querySelector(".requests-menu-type").getAttribute("value");
     let tooltip = target.querySelector(".requests-menu-type").getAttribute("tooltiptext");
     info("Displayed type: " + value);
     info("Tooltip type: " + tooltip);
-    is(value, type, "The displayed type is incorrect.");
-    is(tooltip, fullMimeType, "The tooltip type is incorrect.");
+    is(value, type, "The displayed type is correct.");
+    is(tooltip, fullMimeType, "The tooltip type is correct.");
   }
   if (transferred !== undefined) {
     let value = target.querySelector(".requests-menu-transferred").getAttribute("value");
     let tooltip = target.querySelector(".requests-menu-transferred").getAttribute("tooltiptext");
     info("Displayed transferred size: " + value);
     info("Tooltip transferred size: " + tooltip);
-    is(value, transferred, "The displayed transferred size is incorrect.");
-    is(tooltip, transferred, "The tooltip transferred size is incorrect.");
+    is(value, transferred, "The displayed transferred size is correct.");
+    is(tooltip, transferred, "The tooltip transferred size is correct.");
   }
   if (size !== undefined) {
     let value = target.querySelector(".requests-menu-size").getAttribute("value");
     let tooltip = target.querySelector(".requests-menu-size").getAttribute("tooltiptext");
     info("Displayed size: " + value);
     info("Tooltip size: " + tooltip);
-    is(value, size, "The displayed size is incorrect.");
-    is(tooltip, size, "The tooltip size is incorrect.");
+    is(value, size, "The displayed size is correct.");
+    is(tooltip, size, "The tooltip size is correct.");
   }
   if (time !== undefined) {
     let value = target.querySelector(".requests-menu-timings-total").getAttribute("value");
     let tooltip = target.querySelector(".requests-menu-timings-total").getAttribute("tooltiptext");
     info("Displayed time: " + value);
     info("Tooltip time: " + tooltip);
-    ok(~~(value.match(/[0-9]+/)) >= 0, "The displayed time is incorrect.");
-    ok(~~(tooltip.match(/[0-9]+/)) >= 0, "The tooltip time is incorrect.");
+    ok(~~(value.match(/[0-9]+/)) >= 0, "The displayed time is correct.");
+    ok(~~(tooltip.match(/[0-9]+/)) >= 0, "The tooltip time is correct.");
   }
 
   if (visibleIndex != -1) {
     if (visibleIndex % 2 == 0) {
       ok(aRequestItem.target.hasAttribute("even"),
-        "Unexpected 'even' attribute for " + aRequestItem.value);
+        aRequestItem.value + " should have 'even' attribute.");
       ok(!aRequestItem.target.hasAttribute("odd"),
-        "Unexpected 'odd' attribute for " + aRequestItem.value);
+        aRequestItem.value + " shouldn't have 'odd' attribute.");
     } else {
       ok(!aRequestItem.target.hasAttribute("even"),
-        "Unexpected 'even' attribute for " + aRequestItem.value);
+        aRequestItem.value + " shouldn't have 'even' attribute.");
       ok(aRequestItem.target.hasAttribute("odd"),
-        "Unexpected 'odd' attribute for " + aRequestItem.value);
+        aRequestItem.value + " should have 'odd' attribute.");
     }
   }
 }

From 7ac70178c326aea202513ca7c87092f618eaa1a3 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 20 Apr 2015 11:22:21 -0700
Subject: [PATCH 35/80] Backed out changeset dbee7cf7e96f (bug 1096908) for
 bustage

---
 browser/devtools/webconsole/test/browser.ini |  1 +
 netwerk/protocol/http/HttpBaseChannel.h      |  2 +-
 netwerk/protocol/http/HttpChannelChild.cpp   |  8 --------
 netwerk/protocol/http/HttpChannelChild.h     |  3 ---
 netwerk/protocol/http/HttpChannelParent.cpp  | 16 ----------------
 netwerk/protocol/http/HttpChannelParent.h    |  6 +-----
 netwerk/protocol/http/PHttpChannel.ipdl      |  4 ----
 netwerk/protocol/http/nsHttpChannel.cpp      | 14 --------------
 netwerk/protocol/http/nsHttpChannel.h        | 17 -----------------
 9 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini
index e05e8ae8423..ea8f809f892 100644
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -307,6 +307,7 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent)
 [browser_webconsole_certificate_messages.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_show_subresource_security_errors.js]
+skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_cached_autocomplete.js]
 [browser_webconsole_change_font_size.js]
 [browser_webconsole_chrome.js]
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 353e41dfe18..a87531fafe4 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -182,7 +182,7 @@ public:
   NS_IMETHOD GetAllowAltSvc(bool *aAllowAltSvc) override;
   NS_IMETHOD SetAllowAltSvc(bool aAllowAltSvc) override;
   NS_IMETHOD GetApiRedirectToURI(nsIURI * *aApiRedirectToURI) override;
-  virtual nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
+  nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
   NS_IMETHOD TakeAllSecurityMessages(nsCOMArray<nsISecurityConsoleMessage> &aMessages) override;
   NS_IMETHOD GetResponseTimeoutEnabled(bool *aEnable) override;
   NS_IMETHOD SetResponseTimeoutEnabled(bool aEnable) override;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 21e32f52dd0..a47c1e71778 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -991,14 +991,6 @@ HttpChannelChild::DeleteSelf()
   Send__delete__(this);
 }
 
-bool
-HttpChannelChild::RecvReportSecurityMessage(const nsString& messageTag,
-                                            const nsString& messageCategory)
-{
-  AddSecurityMessage(messageTag, messageCategory);
-  return true;
-}
-
 class Redirect1Event : public ChannelEvent
 {
  public:
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index fcd61efbdea..6f54013dace 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -140,9 +140,6 @@ protected:
   bool RecvDivertMessages() override;
   bool RecvDeleteSelf() override;
 
-  bool RecvReportSecurityMessage(const nsString& messageTag,
-                                 const nsString& messageCategory) override;
-
   bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
   virtual void DoNotifyListenerCleanup() override;
 
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index b2dd903d47e..f6625084528 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -329,7 +329,6 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
     return SendFailedAsyncOpen(rv);
 
   mChannel = static_cast<nsHttpChannel *>(channel.get());
-  mChannel->SetWarningReporter(this);
   mChannel->SetTimingEnabled(true);
   if (mPBOverride != kPBOverride_Unset) {
     mChannel->SetPrivate(mPBOverride == kPBOverride_Private ? true : false);
@@ -1265,19 +1264,4 @@ HttpChannelParent::GetAuthPrompt(uint32_t aPromptReason, const nsIID& iid,
   return NS_OK;
 }
 
-//-----------------------------------------------------------------------------
-// HttpChannelSecurityWarningReporter
-//-----------------------------------------------------------------------------
-
-nsresult
-HttpChannelParent::ReportSecurityMessage(const nsAString& aMessageTag,
-                                         const nsAString& aMessageCategory)
-{
-  if (NS_WARN_IF(!SendReportSecurityMessage(nsString(aMessageTag),
-                                            nsString(aMessageCategory)))) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  return NS_OK;
-}
-
 }} // mozilla::net
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index c5ceb56d711..4f481b18dd1 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -43,8 +43,7 @@ class HttpChannelParent final : public PHttpChannelParent
                               , public ADivertableParentChannel
                               , public nsIAuthPromptProvider
                               , public nsINetworkInterceptController
-                              , public DisconnectableParent,
-                              , public HttpChannelSecurityWarningReporter
+                              , public DisconnectableParent
 {
   virtual ~HttpChannelParent();
 
@@ -155,9 +154,6 @@ protected:
   void OfflineDisconnect() override;
   uint32_t GetAppId() override;
 
-  nsresult ReportSecurityMessage(const nsAString& aMessageTag,
-                                 const nsAString& aMessageCategory) override;
-
 private:
   nsRefPtr<nsHttpChannel>       mChannel;
   nsCOMPtr<nsICacheEntry>       mCacheEntry;
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 3b6db8676a0..a0edc6a32d5 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -139,10 +139,6 @@ child:
   // OnDataAvailable and OnStopRequest messages in the queue back to the parent.
   DivertMessages();
 
-  // Report a security message to the console associated with this
-  // channel.
-  ReportSecurityMessage(nsString messageTag, nsString messageCategory);
-
   // Tell child to delete channel (all IPDL deletes must be done from child to
   // avoid races: see bug 591708).
   DeleteSelf();
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 3bcc7ad5672..5fd28278dd3 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -244,7 +244,6 @@ nsHttpChannel::nsHttpChannel()
     , mHasAutoRedirectVetoNotifier(0)
     , mPushedStream(nullptr)
     , mLocalBlocklist(false)
-    , mWarningReporter(nullptr)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
@@ -282,19 +281,6 @@ nsHttpChannel::Init(nsIURI *uri,
 
     return rv;
 }
-
-nsresult
-nsHttpChannel::AddSecurityMessage(const nsAString& aMessageTag,
-                                  const nsAString& aMessageCategory)
-{
-    if (mWarningReporter) {
-        return mWarningReporter->ReportSecurityMessage(aMessageTag,
-                                                       aMessageCategory);
-    }
-    return HttpBaseChannel::AddSecurityMessage(aMessageTag,
-                                               aMessageCategory);
-}
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel <private>
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 58ee0f9c0dc..9010e4a5c55 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -33,14 +33,6 @@ class nsISSLStatus;
 namespace mozilla { namespace net {
 
 class Http2PushedStream;
-
-class HttpChannelSecurityWarningReporter
-{
-public:
-  virtual nsresult ReportSecurityMessage(const nsAString& aMessageTag,
-                                         const nsAString& aMessageCategory) = 0;
-};
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
@@ -149,12 +141,6 @@ public:
     NS_IMETHOD GetResponseStart(mozilla::TimeStamp *aResponseStart) override;
     NS_IMETHOD GetResponseEnd(mozilla::TimeStamp *aResponseEnd) override;
 
-    nsresult AddSecurityMessage(const nsAString& aMessageTag,
-                                const nsAString& aMessageCategory) override;
-
-    void SetWarningReporter(HttpChannelSecurityWarningReporter* aReporter)
-      { mWarningReporter = aReporter; }
-
 public: /* internal necko use only */
 
     void InternalSetUploadStream(nsIInputStream *uploadStream)
@@ -491,9 +477,6 @@ private:
 
     nsCString mUsername;
 
-    // If non-null, warnings should be reported to this object.
-    HttpChannelSecurityWarningReporter* mWarningReporter;
-
 protected:
     virtual void DoNotifyListenerCleanup() override;
 

From d0777bbdf74bde30ff8e2cb1c3b646f24ff94fce Mon Sep 17 00:00:00 2001
From: Patrick Brosset <pbrosset@mozilla.com>
Date: Mon, 20 Apr 2015 17:49:11 +0200
Subject: [PATCH 36/80] Bug 1153635 - Focus first focusable element in
 MarkupContainer when line is clicked; r=bgrins

---
 browser/devtools/markupview/markup-view.js    |  1 +
 browser/devtools/markupview/test/browser.ini  |  1 +
 .../browser_markupview_dragdrop_isDragging.js |  3 +-
 .../browser_markupview_dragdrop_reorder.js    |  3 +-
 .../test/browser_markupview_keybindings_03.js | 34 +++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 browser/devtools/markupview/test/browser_markupview_keybindings_03.js

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index 155900df887..29b47fb15b6 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -1829,6 +1829,7 @@ MarkupContainer.prototype = {
     this.hovered = false;
     this.markup.navigate(this);
     event.stopPropagation();
+    event.preventDefault();
 
     // Start dragging the container after a delay.
     this.markup._dragStartEl = target;
diff --git a/browser/devtools/markupview/test/browser.ini b/browser/devtools/markupview/test/browser.ini
index 1f0f182d29f..6c1ff3346dd 100644
--- a/browser/devtools/markupview/test/browser.ini
+++ b/browser/devtools/markupview/test/browser.ini
@@ -74,6 +74,7 @@ skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 [browser_markupview_image_tooltip.js]
 [browser_markupview_keybindings_01.js]
 [browser_markupview_keybindings_02.js]
+[browser_markupview_keybindings_03.js]
 [browser_markupview_mutation_01.js]
 [browser_markupview_mutation_02.js]
 [browser_markupview_navigation.js]
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js b/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js
index 05dc5e76aad..d5bddff08e9 100644
--- a/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js
+++ b/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js
@@ -21,7 +21,8 @@ add_task(function*() {
     target: el.tagLine,
     pageX: rect.x,
     pageY: rect.y,
-    stopPropagation: function() {}
+    stopPropagation: function() {},
+    preventDefault: function() {}
   });
 
   is(el.isDragging, false, "isDragging should not be set to true immedietly");
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js b/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js
index 5ef868fb6ef..ba1528f3b8e 100644
--- a/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js
+++ b/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js
@@ -64,7 +64,8 @@ function* dragContainer(selector, targetOffset, inspector) {
     target: container.tagLine,
     pageX: rect.x,
     pageY: rect.y,
-    stopPropagation: function() {}
+    stopPropagation: function() {},
+    preventDefault: function() {}
   });
 
   let targetX = rect.x + targetOffset.x,
diff --git a/browser/devtools/markupview/test/browser_markupview_keybindings_03.js b/browser/devtools/markupview/test/browser_markupview_keybindings_03.js
new file mode 100644
index 00000000000..d72267587cf
--- /dev/null
+++ b/browser/devtools/markupview/test/browser_markupview_keybindings_03.js
@@ -0,0 +1,34 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that selecting a node with the mouse (by clicking on the line) focuses
+// the first focusable element in the corresponding MarkupContainer so that the
+// keyboard can be used immediately.
+
+const TEST_URL = "data:text/html;charset=utf8,<div></div>Text node";
+
+add_task(function*() {
+  let {inspector, toolbox} = yield addTab(TEST_URL).then(openInspector);
+  let {walker} = inspector;
+
+  info("Select the test node to have the 2 test containers visible");
+  yield selectNode("div", inspector);
+
+  let divFront = yield walker.querySelector(walker.rootNode, "div");
+  let textFront = yield walker.nextSibling(divFront);
+
+  info("Click on the MarkupContainer element for the text node");
+  yield clickContainer(textFront, inspector);
+  is(inspector.markup.doc.activeElement,
+     getContainerForNodeFront(textFront, inspector).editor.value,
+     "The currently focused element is the node's text content");
+
+  info("Click on the MarkupContainer element for the <div> node");
+  yield clickContainer(divFront, inspector);
+  is(inspector.markup.doc.activeElement,
+     getContainerForNodeFront(divFront, inspector).editor.tag,
+     "The currently focused element is the div's tagname");
+});

From 1a1dbab640142db4fed16aa8deb7cb5c6077ae8f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@mozilla.com>
Date: Mon, 20 Apr 2015 11:42:09 -0700
Subject: [PATCH 37/80] Bug 1096908 - forward network security messages to the
 content process; r=hurley

---
 browser/devtools/webconsole/test/browser.ini |  1 -
 netwerk/protocol/http/HttpBaseChannel.h      |  2 +-
 netwerk/protocol/http/HttpChannelChild.cpp   |  8 ++++++++
 netwerk/protocol/http/HttpChannelChild.h     |  3 +++
 netwerk/protocol/http/HttpChannelParent.cpp  | 16 ++++++++++++++++
 netwerk/protocol/http/HttpChannelParent.h    |  4 ++++
 netwerk/protocol/http/PHttpChannel.ipdl      |  4 ++++
 netwerk/protocol/http/nsHttpChannel.cpp      | 14 ++++++++++++++
 netwerk/protocol/http/nsHttpChannel.h        | 17 +++++++++++++++++
 9 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini
index ea8f809f892..e05e8ae8423 100644
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -307,7 +307,6 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent)
 [browser_webconsole_certificate_messages.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_show_subresource_security_errors.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_cached_autocomplete.js]
 [browser_webconsole_change_font_size.js]
 [browser_webconsole_chrome.js]
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index a87531fafe4..353e41dfe18 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -182,7 +182,7 @@ public:
   NS_IMETHOD GetAllowAltSvc(bool *aAllowAltSvc) override;
   NS_IMETHOD SetAllowAltSvc(bool aAllowAltSvc) override;
   NS_IMETHOD GetApiRedirectToURI(nsIURI * *aApiRedirectToURI) override;
-  nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
+  virtual nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
   NS_IMETHOD TakeAllSecurityMessages(nsCOMArray<nsISecurityConsoleMessage> &aMessages) override;
   NS_IMETHOD GetResponseTimeoutEnabled(bool *aEnable) override;
   NS_IMETHOD SetResponseTimeoutEnabled(bool aEnable) override;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index a47c1e71778..21e32f52dd0 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -991,6 +991,14 @@ HttpChannelChild::DeleteSelf()
   Send__delete__(this);
 }
 
+bool
+HttpChannelChild::RecvReportSecurityMessage(const nsString& messageTag,
+                                            const nsString& messageCategory)
+{
+  AddSecurityMessage(messageTag, messageCategory);
+  return true;
+}
+
 class Redirect1Event : public ChannelEvent
 {
  public:
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 6f54013dace..fcd61efbdea 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -140,6 +140,9 @@ protected:
   bool RecvDivertMessages() override;
   bool RecvDeleteSelf() override;
 
+  bool RecvReportSecurityMessage(const nsString& messageTag,
+                                 const nsString& messageCategory) override;
+
   bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
   virtual void DoNotifyListenerCleanup() override;
 
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index f6625084528..b2dd903d47e 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -329,6 +329,7 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
     return SendFailedAsyncOpen(rv);
 
   mChannel = static_cast<nsHttpChannel *>(channel.get());
+  mChannel->SetWarningReporter(this);
   mChannel->SetTimingEnabled(true);
   if (mPBOverride != kPBOverride_Unset) {
     mChannel->SetPrivate(mPBOverride == kPBOverride_Private ? true : false);
@@ -1264,4 +1265,19 @@ HttpChannelParent::GetAuthPrompt(uint32_t aPromptReason, const nsIID& iid,
   return NS_OK;
 }
 
+//-----------------------------------------------------------------------------
+// HttpChannelSecurityWarningReporter
+//-----------------------------------------------------------------------------
+
+nsresult
+HttpChannelParent::ReportSecurityMessage(const nsAString& aMessageTag,
+                                         const nsAString& aMessageCategory)
+{
+  if (NS_WARN_IF(!SendReportSecurityMessage(nsString(aMessageTag),
+                                            nsString(aMessageCategory)))) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  return NS_OK;
+}
+
 }} // mozilla::net
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 4f481b18dd1..8de15f187e1 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -44,6 +44,7 @@ class HttpChannelParent final : public PHttpChannelParent
                               , public nsIAuthPromptProvider
                               , public nsINetworkInterceptController
                               , public DisconnectableParent
+                              , public HttpChannelSecurityWarningReporter
 {
   virtual ~HttpChannelParent();
 
@@ -154,6 +155,9 @@ protected:
   void OfflineDisconnect() override;
   uint32_t GetAppId() override;
 
+  nsresult ReportSecurityMessage(const nsAString& aMessageTag,
+                                 const nsAString& aMessageCategory) override;
+
 private:
   nsRefPtr<nsHttpChannel>       mChannel;
   nsCOMPtr<nsICacheEntry>       mCacheEntry;
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index a0edc6a32d5..3b6db8676a0 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -139,6 +139,10 @@ child:
   // OnDataAvailable and OnStopRequest messages in the queue back to the parent.
   DivertMessages();
 
+  // Report a security message to the console associated with this
+  // channel.
+  ReportSecurityMessage(nsString messageTag, nsString messageCategory);
+
   // Tell child to delete channel (all IPDL deletes must be done from child to
   // avoid races: see bug 591708).
   DeleteSelf();
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 5fd28278dd3..3bcc7ad5672 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -244,6 +244,7 @@ nsHttpChannel::nsHttpChannel()
     , mHasAutoRedirectVetoNotifier(0)
     , mPushedStream(nullptr)
     , mLocalBlocklist(false)
+    , mWarningReporter(nullptr)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
@@ -281,6 +282,19 @@ nsHttpChannel::Init(nsIURI *uri,
 
     return rv;
 }
+
+nsresult
+nsHttpChannel::AddSecurityMessage(const nsAString& aMessageTag,
+                                  const nsAString& aMessageCategory)
+{
+    if (mWarningReporter) {
+        return mWarningReporter->ReportSecurityMessage(aMessageTag,
+                                                       aMessageCategory);
+    }
+    return HttpBaseChannel::AddSecurityMessage(aMessageTag,
+                                               aMessageCategory);
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel <private>
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 9010e4a5c55..58ee0f9c0dc 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -33,6 +33,14 @@ class nsISSLStatus;
 namespace mozilla { namespace net {
 
 class Http2PushedStream;
+
+class HttpChannelSecurityWarningReporter
+{
+public:
+  virtual nsresult ReportSecurityMessage(const nsAString& aMessageTag,
+                                         const nsAString& aMessageCategory) = 0;
+};
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
@@ -141,6 +149,12 @@ public:
     NS_IMETHOD GetResponseStart(mozilla::TimeStamp *aResponseStart) override;
     NS_IMETHOD GetResponseEnd(mozilla::TimeStamp *aResponseEnd) override;
 
+    nsresult AddSecurityMessage(const nsAString& aMessageTag,
+                                const nsAString& aMessageCategory) override;
+
+    void SetWarningReporter(HttpChannelSecurityWarningReporter* aReporter)
+      { mWarningReporter = aReporter; }
+
 public: /* internal necko use only */
 
     void InternalSetUploadStream(nsIInputStream *uploadStream)
@@ -477,6 +491,9 @@ private:
 
     nsCString mUsername;
 
+    // If non-null, warnings should be reported to this object.
+    HttpChannelSecurityWarningReporter* mWarningReporter;
+
 protected:
     virtual void DoNotifyListenerCleanup() override;
 

From be6a1e92c815b3a6beefcf56a7571820c5273f92 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Mon, 20 Apr 2015 11:42:49 -0700
Subject: [PATCH 38/80] Bug 1155766 - Fix a bad assertion r=jfkthame

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

diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 99be7a4f803..b78ee1c71e9 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -990,7 +990,7 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame*              aBlockFrame,
     if (frame->IsFrameOfType(nsIFrame::eBidiInlineContainer)) {
       if (!(frame->GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
         nsContainerFrame* c = static_cast<nsContainerFrame*>(frame);
-        MOZ_ASSERT(c = do_QueryFrame(frame),
+        MOZ_ASSERT(c == do_QueryFrame(frame),
                    "eBidiInlineContainer must be a nsContainerFrame subclass");
         c->DrainSelfOverflowList();
       }

From 049ae5d2b1279bf6125b753388706c28a8a3943d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Mon, 20 Apr 2015 11:43:06 -0700
Subject: [PATCH 39/80] Bug 1155766 - Fix a bad assertion r=dbaron

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

diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index 7753edb0135..b85fde02791 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -205,7 +205,7 @@ nsHTMLCSSStyleSheet::EvictStyleAttr(const nsAString& aSerialized,
 {
 #ifdef DEBUG
   {
-    NS_ASSERTION(aValue = mCachedStyleAttrs.Get(aSerialized),
+    NS_ASSERTION(aValue == mCachedStyleAttrs.Get(aSerialized),
                  "Cached value does not match?!");
   }
 #endif

From 74c8410fae58d74f3847a8f9f2650e406dddab00 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Mon, 20 Apr 2015 11:43:21 -0700
Subject: [PATCH 40/80] Bug 1155766 - Fix a bad assertion r=bent

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

diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp
index 426906f9468..c29c9afb30a 100644
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -5002,7 +5002,7 @@ OriginParser::HandleToken(const nsDependentCSubstring& aToken)
 void
 OriginParser::HandleTrailingSeparator()
 {
-  MOZ_ASSERT(mState = eComplete);
+  MOZ_ASSERT(mState == eComplete);
   MOZ_ASSERT(mSchemaType == eFile);
 
   mPathnameComponents.AppendElement(EmptyCString());

From 6b599e76b554219ca68628b477c35240544355cc Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 20 Apr 2015 11:43:34 -0700
Subject: [PATCH 41/80] Bug 1156114 - Properly escape regex for the
 readerViewTrigger.

---
 browser/app/profile/firefox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index c9879777813..ac3512fb668 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -252,7 +252,7 @@ pref("browser.uitour.requireSecure", true);
 pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
 pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
 // This is used as a regexp match against the page's URL.
-pref("browser.uitour.readerViewTrigger", "^https:\/\/www\.mozilla\.org\/[^\/]+\/firefox\/reading\/start");
+pref("browser.uitour.readerViewTrigger", "^https:\\/\\/www\\.mozilla\\.org\\/[^\\/]+\\/firefox\\/reading\\/start");
 
 pref("browser.customizemode.tip0.shown", false);
 pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");

From 207cfe188327f282749fa2440a51658ca0f1b689 Mon Sep 17 00:00:00 2001
From: Matt King <mking@mking.me>
Date: Mon, 13 Apr 2015 16:05:40 +0200
Subject: [PATCH 42/80] Bug 1150621 - Set TabsPanel.TabsPanelToolbar attributes
 in xml, rather than code r=mcomella

---
 .../android/base/resources/layout/tabs_panel_default.xml | 2 +-
 mobile/android/base/resources/layout/tabs_panel_view.xml | 1 +
 mobile/android/base/tabs/TabsPanel.java                  | 9 ---------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/resources/layout/tabs_panel_default.xml b/mobile/android/base/resources/layout/tabs_panel_default.xml
index 297cff31617..552e949bdc1 100644
--- a/mobile/android/base/resources/layout/tabs_panel_default.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -15,7 +15,7 @@
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="@dimen/browser_toolbar_height"
               android:background="@color/background_tabs">
 
             <ViewStub android:id="@+id/nav_back_stub"
diff --git a/mobile/android/base/resources/layout/tabs_panel_view.xml b/mobile/android/base/resources/layout/tabs_panel_view.xml
index a7dde94434d..03fae7260e0 100644
--- a/mobile/android/base/resources/layout/tabs_panel_view.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_view.xml
@@ -10,4 +10,5 @@
                                   android:layout_width="match_parent"
                                   android:layout_height="match_parent"
                                   android:background="@color/background_tabs"
+                                  android:orientation="vertical"
                                   android:visibility="invisible"/>
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 53593688f02..c546540486f 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -102,10 +102,6 @@ public class TabsPanel extends LinearLayout
         mActivity = (GeckoApp) context;
         mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
 
-        setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
-                                                      LinearLayout.LayoutParams.MATCH_PARENT));
-        setOrientation(LinearLayout.VERTICAL);
-
         mCurrentPanel = Panel.NORMAL_TABS;
 
         mPopupMenu = new GeckoPopupMenu(context);
@@ -332,11 +328,6 @@ public class TabsPanel extends LinearLayout
         public TabsPanelToolbar(Context context, AttributeSet attrs) {
             super(context, attrs);
             mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
-
-            setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
-                                                          (int) context.getResources().getDimension(R.dimen.browser_toolbar_height)));
-
-            setOrientation(LinearLayout.HORIZONTAL);
         }
 
         @Override

From d75f0c5969916ec1694d601065c1269063017c07 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Wed, 15 Apr 2015 13:49:00 +0200
Subject: [PATCH 43/80] Bug 1036324 - Adds option to walker.parents() to not
 traverse DocShellTreeItems of different types

This option helps avoiding blank inspector situations when trying to use the right-click ctx
menu in the browser to inspect an element *while* the page is reloading.
---
 browser/devtools/markupview/markup-view.js    | 10 +--
 browser/devtools/markupview/test/browser.ini  |  1 +
 .../test/browser_markupview_load_01.js        | 70 +++++++++++++++++++
 browser/devtools/markupview/test/head.js      | 38 ++++++++++
 browser/devtools/shared/frame-script-utils.js | 56 ++++++++++++++-
 toolkit/devtools/server/actors/inspector.js   | 25 ++++++-
 toolkit/devtools/server/actors/styles.js      |  5 +-
 7 files changed, 194 insertions(+), 11 deletions(-)
 create mode 100644 browser/devtools/markupview/test/browser_markupview_load_01.js

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index 29b47fb15b6..adaaacb9847 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -2146,7 +2146,7 @@ MarkupElementContainer.prototype = Heritage.extend(MarkupContainer.prototype, {
           this.tooltipData.data = promise.resolve(res);
         });
       }, () => {
-        this.tooltipData.data = promise.reject();
+        this.tooltipData.data = promise.resolve({});
       });
     }
   },
@@ -2166,9 +2166,11 @@ MarkupElementContainer.prototype = Heritage.extend(MarkupContainer.prototype, {
     }
 
     return this.tooltipData.data.then(({data, size}) => {
-      tooltip.setImageContent(data, size);
-    }, () => {
-      tooltip.setBrokenImageContent();
+      if (data && size) {
+        tooltip.setImageContent(data, size);
+      } else {
+        tooltip.setBrokenImageContent();
+      }
     });
   },
 
diff --git a/browser/devtools/markupview/test/browser.ini b/browser/devtools/markupview/test/browser.ini
index 6c1ff3346dd..e13446f7f45 100644
--- a/browser/devtools/markupview/test/browser.ini
+++ b/browser/devtools/markupview/test/browser.ini
@@ -68,6 +68,7 @@ skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 [browser_markupview_events_jquery_2.1.1.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_load_01.js]
 [browser_markupview_html_edit_01.js]
 [browser_markupview_html_edit_02.js]
 [browser_markupview_html_edit_03.js]
diff --git a/browser/devtools/markupview/test/browser_markupview_load_01.js b/browser/devtools/markupview/test/browser_markupview_load_01.js
new file mode 100644
index 00000000000..f40ced9f587
--- /dev/null
+++ b/browser/devtools/markupview/test/browser_markupview_load_01.js
@@ -0,0 +1,70 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that selecting an element with the 'Inspect Element' context
+// menu during a page reload doesn't cause the markup view to become empty.
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=1036324
+
+const server = createTestHTTPServer();
+
+// Register a slow image handler so we can simulate a long time between
+// a reload and the load event firing.
+server.registerContentType("gif", "image/gif");
+server.registerPathHandler("/slow.gif", function (metadata, response) {
+  info ("Image has been requested");
+  response.processAsync();
+  setTimeout(() => {
+    info ("Image is responding");
+    response.finish();
+  }, 500);
+});
+
+// Test page load events.
+const TEST_URL = "data:text/html," +
+  "<!DOCTYPE html>" +
+  "<head><meta charset='utf-8' /></head>" +
+  "<body>" +
+  "<p>Slow script</p>" +
+  "<img src='http://localhost:" + server.identity.primaryPort + "/slow.gif' /></script>" +
+  "</body>" +
+  "</html>";
+
+add_task(function*() {
+  let tab = yield addTab(TEST_URL);
+  let {inspector} = yield openInspector();
+  let domContentLoaded = waitForLinkedBrowserEvent(tab, "DOMContentLoaded");
+  let pageLoaded = waitForLinkedBrowserEvent(tab, "load");
+
+  ok (inspector.markup, "There is a markup view");
+
+  // Select an element while the tab is in the middle of a slow reload.
+  reloadTab();
+  yield domContentLoaded;
+  yield chooseWithInspectElementContextMenu("img");
+  yield pageLoaded;
+
+  yield inspector.once("markuploaded");
+  ok (inspector.markup, "There is a markup view");
+  is (inspector.markup._elt.children.length, 1, "The markup view is rendering");
+});
+
+function* chooseWithInspectElementContextMenu(selector) {
+  yield executeInContent("Test:SynthesizeMouse", {
+    center: true,
+    selector: selector,
+    options: {type: "contextmenu", button: 2}
+  });
+  executeInContent("Test:SynthesizeKey", {key: "Q", options: {}});
+}
+
+function waitForLinkedBrowserEvent(tab, event) {
+  let def = promise.defer();
+  tab.linkedBrowser.addEventListener(event, function cb() {
+    tab.linkedBrowser.removeEventListener(event, cb, true);
+    def.resolve();
+  }, true);
+  return def.promise;
+}
diff --git a/browser/devtools/markupview/test/head.js b/browser/devtools/markupview/test/head.js
index a79c1e165e8..2ee7e4976aa 100644
--- a/browser/devtools/markupview/test/head.js
+++ b/browser/devtools/markupview/test/head.js
@@ -172,6 +172,13 @@ function executeInContent(name, data={}, objects={}, expectResponse=true) {
   }
 }
 
+/**
+ * Reload the current tab location.
+ */
+function reloadTab() {
+  return executeInContent("devtools:test:reload", {}, {}, false);
+}
+
 /**
  * Simple DOM node accesor function that takes either a node or a string css
  * selector as argument and returns the corresponding node
@@ -647,3 +654,34 @@ function* waitForMultipleChildrenUpdates(inspector) {
     return yield waitForMultipleChildrenUpdates(inspector);
   }
 }
+
+/**
+ * Create an HTTP server that can be used to simulate custom requests within
+ * a test.  It is automatically cleaned up when the test ends, so no need to
+ * call `destroy`.
+ *
+ * See https://developer.mozilla.org/en-US/docs/Httpd.js/HTTP_server_for_unit_tests
+ * for more information about how to register handlers.
+ *
+ * The server can be accessed like:
+ *
+ *   const server = createTestHTTPServer();
+ *   let url = "http://localhost: " + server.identity.primaryPort + "/path";
+ *
+ * @returns {HttpServer}
+ */
+function createTestHTTPServer() {
+  const {HttpServer} = Cu.import("resource://testing-common/httpd.js", {});
+  let server = new HttpServer();
+
+  registerCleanupFunction(function* cleanup() {
+    let destroyed = promise.defer();
+    server.stop(() => {
+      destroyed.resolve();
+    });
+    yield destroyed.promise;
+  });
+
+  server.start(-1);
+  return server;
+}
diff --git a/browser/devtools/shared/frame-script-utils.js b/browser/devtools/shared/frame-script-utils.js
index 4c0f1d4850d..aeee2a63c8c 100644
--- a/browser/devtools/shared/frame-script-utils.js
+++ b/browser/devtools/shared/frame-script-utils.js
@@ -3,11 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const Cu = Components.utils;
-
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 devtools.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise");
 devtools.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm", "Task");
+const loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+            .getService(Ci.mozIJSSubScriptLoader);
+let EventUtils = {};
+loader.loadSubScript("chrome://marionette/content/EventUtils.js", EventUtils);
 
 addMessageListener("devtools:test:history", function ({ data }) {
   content.history[data.direction]();
@@ -189,6 +192,55 @@ addMessageListener("devtools:test:setAttribute", function(msg) {
   sendAsyncMessage("devtools:test:setAttribute");
 });
 
+/**
+ * Synthesize a mouse event on an element. This handler doesn't send a message
+ * back. Consumers should listen to specific events on the inspector/highlighter
+ * to know when the event got synthesized.
+ * @param {Object} msg The msg.data part expects the following properties:
+ * - {Number} x
+ * - {Number} y
+ * - {Boolean} center If set to true, x/y will be ignored and
+ *             synthesizeMouseAtCenter will be used instead
+ * - {Object} options Other event options
+ * - {String} selector An optional selector that will be used to find the node to
+ *            synthesize the event on, if msg.objects doesn't contain the CPOW.
+ * The msg.objects part should be the element.
+ * @param {Object} data Event detail properties:
+ */
+addMessageListener("Test:SynthesizeMouse", function(msg) {
+  let {x, y, center, options, selector} = msg.data;
+  let {node} = msg.objects;
+
+  if (!node && selector) {
+    node = superQuerySelector(selector);
+  }
+
+  if (center) {
+    EventUtils.synthesizeMouseAtCenter(node, options, node.ownerDocument.defaultView);
+  } else {
+    EventUtils.synthesizeMouse(node, x, y, options, node.ownerDocument.defaultView);
+  }
+
+  // Most consumers won't need to listen to this message, unless they want to
+  // wait for the mouse event to be synthesized and don't have another event
+  // to listen to instead.
+  sendAsyncMessage("Test:SynthesizeMouse");
+});
+
+/**
+ * Synthesize a key event for an element. This handler doesn't send a message
+ * back. Consumers should listen to specific events on the inspector/highlighter
+ * to know when the event got synthesized.
+ * @param  {Object} msg The msg.data part expects the following properties:
+ * - {String} key
+ * - {Object} options
+ */
+addMessageListener("Test:SynthesizeKey", function(msg) {
+  let {key, options} = msg.data;
+
+  EventUtils.synthesizeKey(key, options, content);
+});
+
 /**
  * Like document.querySelector but can go into iframes too.
  * ".container iframe || .sub-container div" will first try to find the node
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index 01ff79207f8..29dd47f5ca4 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -1410,6 +1410,8 @@ var WalkerActor = protocol.ActorClass({
    *    Named options, including:
    *    `sameDocument`: If true, parents will be restricted to the same
    *      document as the node.
+   *    `sameTypeRootTreeItem`: If true, this will not traverse across
+   *     different types of docshells.
    */
   parents: method(function(node, options={}) {
     if (isNodeDead(node)) {
@@ -1420,16 +1422,23 @@ var WalkerActor = protocol.ActorClass({
     let parents = [];
     let cur;
     while((cur = walker.parentNode())) {
-      if (options.sameDocument && cur.ownerDocument != node.rawNode.ownerDocument) {
+      if (options.sameDocument && nodeDocument(cur) != nodeDocument(node.rawNode)) {
         break;
       }
+
+      if (options.sameTypeRootTreeItem &&
+          nodeDocshell(cur).sameTypeRootTreeItem != nodeDocshell(node.rawNode).sameTypeRootTreeItem) {
+        break;
+      }
+
       parents.push(this._ref(cur));
     }
     return parents;
   }, {
     request: {
       node: Arg(0, "domnode"),
-      sameDocument: Option(1)
+      sameDocument: Option(1),
+      sameTypeRootTreeItem: Option(1)
     },
     response: {
       nodes: RetVal("array:domnode")
@@ -3226,7 +3235,7 @@ var WalkerFront = exports.WalkerFront = protocol.FrontClass(WalkerActor, {
     let nodeType = types.getType("domnode");
     let returnNode = nodeType.read(nodeType.write(nodeActor, walkerActor), this);
     let top = returnNode;
-    let extras = walkerActor.parents(nodeActor);
+    let extras = walkerActor.parents(nodeActor, {sameTypeRootTreeItem: true});
     for (let extraActor of extras) {
       top = nodeType.read(nodeType.write(extraActor, walkerActor), this);
     }
@@ -3519,6 +3528,16 @@ function nodeDocument(node) {
   return node.ownerDocument || (node.nodeType == Ci.nsIDOMNode.DOCUMENT_NODE ? node : null);
 }
 
+function nodeDocshell(node) {
+  let doc = node ? nodeDocument(node) : null;
+  let win = doc ? doc.defaultView : null;
+  if (win) {
+    return win.
+           QueryInterface(Ci.nsIInterfaceRequestor).
+           getInterface(Ci.nsIDocShell);
+  }
+}
+
 function isNodeDead(node) {
   return !node || !node.rawNode || Cu.isDeadWrapper(node.rawNode);
 }
diff --git a/toolkit/devtools/server/actors/styles.js b/toolkit/devtools/server/actors/styles.js
index 5e4b28cc366..39a6da7aa2f 100644
--- a/toolkit/devtools/server/actors/styles.js
+++ b/toolkit/devtools/server/actors/styles.js
@@ -1020,7 +1020,8 @@ var StyleRuleActor = protocol.ActorClass({
         // Elements don't have a parent stylesheet, and therefore
         // don't have an associated URI.  Provide a URI for
         // those.
-        form.href = this.rawNode.ownerDocument.location.href;
+        let doc = this.rawNode.ownerDocument;
+        form.href = doc.location ? doc.location.href : "";
         form.cssText = this.rawStyle.cssText || "";
         break;
       case Ci.nsIDOMCSSRule.CHARSET_RULE:
@@ -1231,7 +1232,7 @@ var StyleRuleFront = protocol.FrontClass(StyleRuleActor, {
       return this._form.href;
     }
     let sheet = this.parentStyleSheet;
-    return sheet.href;
+    return sheet ? sheet.href : "";
   },
 
   get nodeHref() {

From 95d0e9c971e8f7c26dc64b6e613194251ed79125 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 20 Apr 2015 13:28:17 -0700
Subject: [PATCH 44/80] Backed out changeset 0352b6fb976f (bug 1155766) because
 the newly fixed assertion is busting xpcshell tests

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

diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp
index c29c9afb30a..426906f9468 100644
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -5002,7 +5002,7 @@ OriginParser::HandleToken(const nsDependentCSubstring& aToken)
 void
 OriginParser::HandleTrailingSeparator()
 {
-  MOZ_ASSERT(mState == eComplete);
+  MOZ_ASSERT(mState = eComplete);
   MOZ_ASSERT(mSchemaType == eFile);
 
   mPathnameComponents.AppendElement(EmptyCString());

From a5feb8f0c5f5e5384b7923d2c14f03e9c238f7d9 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 20 Apr 2015 13:42:48 -0700
Subject: [PATCH 45/80] Backed out changeset d321fbee8cd8 (bug 1136257) for
 being the probably cause of e10s-dt orange

---
 .../devtools/shared/test/browser_css_color.js | 15 +++-
 browser/devtools/shared/widgets/Tooltip.js    |  5 --
 .../devtools/styleinspector/computed-view.js  | 75 +------------------
 .../styleinspector/computedview.xhtml         | 33 ++++++++
 .../devtools/styleinspector/test/browser.ini  |  2 -
 .../test/browser_computedview_cycle_color.js  | 68 -----------------
 .../test/browser_ruleview_cycle-color.js      | 60 ---------------
 toolkit/devtools/css-color.js                 | 36 +--------
 toolkit/devtools/output-parser.js             | 21 +-----
 9 files changed, 51 insertions(+), 264 deletions(-)
 delete mode 100644 browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
 delete mode 100644 browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js

diff --git a/browser/devtools/shared/test/browser_css_color.js b/browser/devtools/shared/test/browser_css_color.js
index f1dd1d53744..4f4f29be5f0 100644
--- a/browser/devtools/shared/test/browser_css_color.js
+++ b/browser/devtools/shared/test/browser_css_color.js
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+const COLOR_UNIT_PREF = "devtools.defaultColorUnit";
 const TEST_URI = "data:text/html;charset=utf-8,browser_css_color.js";
 let {colorUtils} = devtools.require("devtools/css-color");
 let origColorUnit;
@@ -8,6 +9,7 @@ let origColorUnit;
 add_task(function*() {
   yield promiseTab("about:blank");
   let [host, win, doc] = yield createHost("bottom", TEST_URI);
+  origColorUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
 
   info("Creating a test canvas element to test colors");
   let canvas = createTestCanvas(doc);
@@ -47,19 +49,23 @@ function testColorUtils(canvas) {
 }
 
 function testToString(color, name, hex, hsl, rgb) {
-  color.colorUnit = colorUtils.CssColor.COLORUNIT.name;
+  switchColorUnit(colorUtils.CssColor.COLORUNIT.name);
   is(color.toString(), name, "toString() with authored type");
 
-  color.colorUnit = colorUtils.CssColor.COLORUNIT.hex;
+  switchColorUnit(colorUtils.CssColor.COLORUNIT.hex);
   is(color.toString(), hex, "toString() with hex type");
 
-  color.colorUnit = colorUtils.CssColor.COLORUNIT.hsl;
+  switchColorUnit(colorUtils.CssColor.COLORUNIT.hsl);
   is(color.toString(), hsl, "toString() with hsl type");
 
-  color.colorUnit = colorUtils.CssColor.COLORUNIT.rgb;
+  switchColorUnit(colorUtils.CssColor.COLORUNIT.rgb);
   is(color.toString(), rgb, "toString() with rgb type");
 }
 
+function switchColorUnit(unit) {
+  Services.prefs.setCharPref(COLOR_UNIT_PREF, unit);
+}
+
 function testColorMatch(name, hex, hsl, rgb, rgba, canvas) {
   let target;
   let ctx = canvas.getContext("2d");
@@ -104,6 +110,7 @@ function testColorMatch(name, hex, hsl, rgb, rgba, canvas) {
   test(hex, "hex");
   test(hsl, "hsl");
   test(rgb, "rgb");
+  switchColorUnit(origColorUnit);
 }
 
 function testProcessCSSString() {
diff --git a/browser/devtools/shared/widgets/Tooltip.js b/browser/devtools/shared/widgets/Tooltip.js
index abe8a818c85..bc58325e73c 100644
--- a/browser/devtools/shared/widgets/Tooltip.js
+++ b/browser/devtools/shared/widgets/Tooltip.js
@@ -1020,11 +1020,6 @@ SwatchBasedEditorTooltip.prototype = {
 
   _onSwatchClick: function(event) {
     let swatch = this.swatches.get(event.target);
-
-    if (event.shiftKey) {
-      event.stopPropagation();
-      return;
-    }
     if (swatch) {
       this.activeSwatch = event.target;
       this.show();
diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js
index 07eb0cad159..2cc5a7747bc 100644
--- a/browser/devtools/styleinspector/computed-view.js
+++ b/browser/devtools/styleinspector/computed-view.js
@@ -980,6 +980,7 @@ function PropertyView(aTree, aName)
 
   this.link = "https://developer.mozilla.org/CSS/" + aName;
 
+  this.templateMatchedSelectors = aTree.styleDocument.getElementById("templateMatchedSelectors");
   this._propertyInfo = new PropertyInfo(aTree, aName);
 }
 
@@ -1191,7 +1192,6 @@ PropertyView.prototype = {
       this.propertyInfo.value,
       {
         colorSwatchClass: "computedview-colorswatch",
-        colorClass: "computedview-color",
         urlClass: "theme-link"
         // No need to use baseURI here as computed URIs are never relative.
       });
@@ -1222,10 +1222,9 @@ PropertyView.prototype = {
         }
 
         this._matchedSelectorResponse = matched;
-
-        this._buildMatchedSelectors();
+        CssHtmlTree.processTemplate(this.templateMatchedSelectors,
+          this.matchedSelectorsContainer, this);
         this.matchedExpander.setAttribute("open", "");
-
         this.tree.inspector.emit("computed-view-property-expanded");
       }).then(null, console.error);
     } else {
@@ -1241,40 +1240,6 @@ PropertyView.prototype = {
     return this._matchedSelectorResponse;
   },
 
-  _buildMatchedSelectors: function() {
-    let frag = this.element.ownerDocument.createDocumentFragment();
-
-    for (let selector of this.matchedSelectorViews) {
-      let p = createChild(frag, "p");
-      let span = createChild(p, "span", {
-        class: "rule-link"
-      });
-      let link = createChild(span, "a", {
-        target: "_blank",
-        class: "link theme-link",
-        title: selector.href,
-        sourcelocation: selector.source,
-        tabindex: "0",
-        textContent: selector.source
-      });
-      link.addEventListener("click", selector.openStyleEditor, false);
-      link.addEventListener("keydown", selector.maybeOpenStyleEditor, false);
-
-      let status = createChild(p, "span", {
-        dir: "ltr",
-        class: "rule-text theme-fg-color3 " + selector.statusClass,
-        title: selector.statusText,
-        textContent: selector.sourceText
-      });
-      let valueSpan = createChild(status, "span", {
-        class: "other-property-value theme-fg-color1"
-      });
-      valueSpan.appendChild(selector.outputFragment);
-    }
-
-    this.matchedSelectorsContainer.appendChild(frag);
-  },
-
   /**
    * Provide access to the matched SelectorViews that we are currently
    * displaying.
@@ -1314,9 +1279,6 @@ PropertyView.prototype = {
    */
   onMatchedToggle: function PropertyView_onMatchedToggle(aEvent)
   {
-    if (aEvent.shiftKey) {
-      return;
-    }
     this.matchedExpanded = !this.matchedExpanded;
     this.refreshMatchedSelectors();
     aEvent.preventDefault();
@@ -1366,9 +1328,6 @@ function SelectorView(aTree, aSelectorInfo)
   this.selectorInfo = aSelectorInfo;
   this._cacheStatusNames();
 
-  this.openStyleEditor = this.openStyleEditor.bind(this);
-  this.maybeOpenStyleEditor = this.maybeOpenStyleEditor.bind(this);
-
   this.updateSourceLink();
 }
 
@@ -1459,7 +1418,6 @@ SelectorView.prototype = {
       this.selectorInfo.name,
       this.selectorInfo.value, {
       colorSwatchClass: "computedview-colorswatch",
-      colorClass: "computedview-color",
       urlClass: "theme-link",
       baseURI: this.selectorInfo.rule.href
     });
@@ -1582,32 +1540,5 @@ SelectorView.prototype = {
   }
 };
 
-/**
- * Create a child element with a set of attributes.
- *
- * @param {Element} aParent
- *        The parent node.
- * @param {string} aTag
- *        The tag name.
- * @param {object} aAttributes
- *        A set of attributes to set on the node.
- */
-function createChild(aParent, aTag, aAttributes={}) {
-  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
-  for (let attr in aAttributes) {
-    if (aAttributes.hasOwnProperty(attr)) {
-      if (attr === "textContent") {
-        elt.textContent = aAttributes[attr];
-      } else if(attr === "child") {
-        elt.appendChild(aAttributes[attr]);
-      } else {
-        elt.setAttribute(attr, aAttributes[attr]);
-      }
-    }
-  }
-  aParent.appendChild(elt);
-  return elt;
-}
-
 exports.CssHtmlTree = CssHtmlTree;
 exports.PropertyView = PropertyView;
diff --git a/browser/devtools/styleinspector/computedview.xhtml b/browser/devtools/styleinspector/computedview.xhtml
index 121475537c5..c922f3979a7 100644
--- a/browser/devtools/styleinspector/computedview.xhtml
+++ b/browser/devtools/styleinspector/computedview.xhtml
@@ -72,5 +72,38 @@
       &noPropertiesFound;
     </div>
 
+    <!--
+    To visually debug the templates without running firefox, alter the display:none
+    -->
+    <div style="display:none;">
+      <!--
+      A templateMatchedSelectors sits inside each templateProperties showing the
+      list of selectors that affect that property. Each needs data like this:
+      {
+        matchedSelectorViews: ..., // from cssHtmlTree.propertyViews[name].matchedSelectorViews
+      }
+      This is a template so the parent does not need to be a table, except that
+      using a div as the parent causes the DOM to muck with the tr elements
+      -->
+      <div id="templateMatchedSelectors">
+        <loop foreach="selector in ${matchedSelectorViews}">
+          <p>
+            <span class="rule-link">
+              <a target="_blank" class="link theme-link"
+                  onclick="${selector.openStyleEditor}"
+                  onkeydown="${selector.maybeOpenStyleEditor}"
+                  title="${selector.href}"
+                  sourcelocation="${selector.source}"
+                  tabindex="0">${selector.source}</a>
+            </span>
+            <span dir="ltr" class="rule-text ${selector.statusClass} theme-fg-color3" title="${selector.statusText}">
+              ${selector.sourceText}
+              <span class="other-property-value theme-fg-color1">${selector.outputFragment}</span>
+            </span>
+          </p>
+        </loop>
+      </div>
+    </div>
+
   </body>
 </html>
diff --git a/browser/devtools/styleinspector/test/browser.ini b/browser/devtools/styleinspector/test/browser.ini
index 824fd85bfbd..ff074ef9df8 100644
--- a/browser/devtools/styleinspector/test/browser.ini
+++ b/browser/devtools/styleinspector/test/browser.ini
@@ -27,7 +27,6 @@ support-files =
   head.js
 
 [browser_computedview_browser-styles.js]
-[browser_computedview_cycle_color.js]
 [browser_computedview_getNodeInfo.js]
 [browser_computedview_keybindings_01.js]
 [browser_computedview_keybindings_02.js]
@@ -100,7 +99,6 @@ skip-if = (os == "win" && debug) || e10s # bug 963492: win. bug 1040653: e10s.
 [browser_ruleview_multiple_properties_01.js]
 [browser_ruleview_multiple_properties_02.js]
 [browser_ruleview_original-source-link.js]
-[browser_ruleview_cycle-color.js]
 [browser_ruleview_override.js]
 [browser_ruleview_pseudo-element_01.js]
 [browser_ruleview_pseudo-element_02.js]
diff --git a/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js b/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
deleted file mode 100644
index 9aef6629b6c..00000000000
--- a/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Computed view color cycling test.
-
-const PAGE_CONTENT = [
-  "<style type=\"text/css\">",
-  ".matches {color: #F00;}</style>",
-  "<span id=\"matches\" class=\"matches\">Some styled text</span>",
-  "</div>"
-].join("\n");
-
-add_task(function*() {
-  yield addTab("data:text/html;charset=utf-8," +
-               "Computed view color cycling test.");
-  content.document.body.innerHTML = PAGE_CONTENT;
-
-  info("Opening the computed view");
-  let {toolbox, inspector, view} = yield openComputedView();
-
-  info("Selecting the test node");
-  yield selectNode("#matches", inspector);
-
-  info("Checking the property itself");
-  let container = getComputedViewPropertyView(view, "color").valueNode;
-  checkColorCycling(container, inspector);
-
-  info("Checking matched selectors");
-  container = yield getComputedViewMatchedRules(view, "color");
-  checkColorCycling(container, inspector);
-});
-
-function checkColorCycling(container, inspector) {
-  let swatch = container.querySelector(".computedview-colorswatch");
-  let valueNode = container.querySelector(".computedview-color");
-  let win = inspector.sidebar.getWindowForTab("computedview");
-
-  // Hex (default)
-  is(valueNode.textContent, "#F00", "Color displayed as a hex value.");
-
-  // HSL
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "hsl(0, 100%, 50%)",
-                            "Color displayed as an HSL value.");
-
-  // RGB
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "rgb(255, 0, 0)",
-                            "Color displayed as an RGB value.");
-
-  // Color name
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "red",
-                            "Color displayed as a color name.");
-
-  // "Authored" (currently the computed value)
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "rgb(255, 0, 0)",
-                            "Color displayed as an RGB value.");
-
-  // Back to hex
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "#F00",
-                            "Color displayed as hex again.");
-}
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js b/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js
deleted file mode 100644
index 1124cfe02b2..00000000000
--- a/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Test cycling color types in the rule view.
-
-const PAGE_CONTENT = [
-  "<style type=\"text/css\">",
-  "  body {",
-  "    color: #F00;",
-  "  }",
-  "</style>",
-  "Test cycling color types in the rule view!"
-].join("\n");
-
-add_task(function*() {
-  yield addTab("data:text/html;charset=utf-8,Test cycling color types in the " +
-               "rule view.");
-  content.document.body.innerHTML = PAGE_CONTENT;
-  let {toolbox, inspector, view} = yield openRuleView();
-
-  let container = getRuleViewProperty(view, "body", "color").valueSpan;
-  checkColorCycling(container, inspector);
-});
-
-function checkColorCycling(container, inspector) {
-  let swatch = container.querySelector(".ruleview-colorswatch");
-  let valueNode = container.querySelector(".ruleview-color");
-  let win = inspector.sidebar.getWindowForTab("ruleview");
-
-  // Hex (default)
-  is(valueNode.textContent, "#F00", "Color displayed as a hex value.");
-
-  // HSL
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "hsl(0, 100%, 50%)",
-                            "Color displayed as an HSL value.");
-
-  // RGB
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "rgb(255, 0, 0)",
-                            "Color displayed as an RGB value.");
-
-  // Color name
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "red",
-                            "Color displayed as a color name.");
-
-  // "Authored" (currently the computed value)
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "rgb(255, 0, 0)",
-                            "Color displayed as an RGB value.");
-
-  // Back to hex
-  EventUtils.synthesizeMouseAtCenter(swatch, {type: "mousedown", shiftKey: true}, win);
-  is(valueNode.textContent, "#F00",
-                            "Color displayed as hex again.");
-}
diff --git a/toolkit/devtools/css-color.js b/toolkit/devtools/css-color.js
index 4451ecb4f51..4cfabd66711 100644
--- a/toolkit/devtools/css-color.js
+++ b/toolkit/devtools/css-color.js
@@ -95,22 +95,8 @@ CssColor.COLORUNIT = {
 };
 
 CssColor.prototype = {
-  _colorUnit: null,
-
   authored: null,
 
-  get colorUnit() {
-    if (this._colorUnit === null) {
-      let defaultUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
-      this._colorUnit = CssColor.COLORUNIT[defaultUnit];
-    }
-    return this._colorUnit;
-  },
-
-  set colorUnit(unit) {
-    this._colorUnit = unit;
-  },
-
   get hasAlpha() {
     if (!this.valid) {
       return false;
@@ -283,31 +269,15 @@ CssColor.prototype = {
     return this;
   },
 
-  nextColorUnit: function() {
-    // Reorder the formats array to have the current format at the
-    // front so we can cycle through.
-    let formats = ["authored", "hex", "hsl", "rgb", "name"];
-    let putOnEnd = formats.splice(0, formats.indexOf(this.colorUnit));
-    formats = formats.concat(putOnEnd);
-    let currentDisplayedColor = this[formats[0]];
-
-    for (let format of formats) {
-      if (this[format].toLowerCase() !== currentDisplayedColor.toLowerCase()) {
-        this.colorUnit = CssColor.COLORUNIT[format];
-        break;
-      }
-    }
-
-    return this.toString();
-  },
-
   /**
    * Return a string representing a color of type defined in COLOR_UNIT_PREF.
    */
   toString: function() {
     let color;
+    let defaultUnit = Services.prefs.getCharPref(COLOR_UNIT_PREF);
+    let unit = CssColor.COLORUNIT[defaultUnit];
 
-    switch(this.colorUnit) {
+    switch(unit) {
       case CssColor.COLORUNIT.authored:
         color = this.authored;
         break;
diff --git a/toolkit/devtools/output-parser.js b/toolkit/devtools/output-parser.js
index 0ed2e2ded18..fa501c33279 100644
--- a/toolkit/devtools/output-parser.js
+++ b/toolkit/devtools/output-parser.js
@@ -77,8 +77,6 @@ loader.lazyGetter(this, "REGEX_ALL_CSS_PROPERTIES", function () {
  */
 function OutputParser() {
   this.parsed = [];
-  this.colorSwatches = new WeakMap();
-  this._onSwatchMouseDown = this._onSwatchMouseDown.bind(this);
 }
 
 exports.OutputParser = OutputParser;
@@ -398,14 +396,12 @@ OutputParser.prototype = {
           class: options.colorSwatchClass,
           style: "background-color:" + color
         });
-        this.colorSwatches.set(swatch, colorObj);
-        swatch.addEventListener("mousedown", this._onSwatchMouseDown, false);
         container.appendChild(swatch);
       }
 
       if (options.defaultColorType) {
         color = colorObj.toString();
-        container.dataset.color = color;
+        container.dataset["color"] = color;
       }
 
       let value = this._createNode("span", {
@@ -439,21 +435,6 @@ OutputParser.prototype = {
     this.parsed.push(container);
   },
 
-  _onSwatchMouseDown: function(event) {
-    // Prevent text selection in the case of shift-click or double-click.
-    event.preventDefault();
-
-    if (!event.shiftKey) {
-      return;
-    }
-
-    let swatch = event.target;
-    let color = this.colorSwatches.get(swatch);
-    let val = color.nextColorUnit();
-
-    swatch.nextElementSibling.textContent = val;
-  },
-
    /**
     * Append a URL to the output.
     *

From 7931411ee64afe2566254e80ead2ff8ab92b6b19 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Fri, 17 Apr 2015 17:08:26 -0700
Subject: [PATCH 46/80] Bug 1155819 - Clean up phone code more. r=ally

---
 mobile/android/base/widget/AnchoredPopup.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/widget/AnchoredPopup.java b/mobile/android/base/widget/AnchoredPopup.java
index 699d07c9f4f..05631b56845 100644
--- a/mobile/android/base/widget/AnchoredPopup.java
+++ b/mobile/android/base/widget/AnchoredPopup.java
@@ -102,11 +102,9 @@ public abstract class AnchoredPopup extends PopupWindow {
 
         // If the anchor is null or out of the window bounds, just show the popup at the top of the
         // root view.
-        if (mAnchor == null || anchorLocation[1] < 0) {
-            showAtLocation(decorView, Gravity.NO_GRAVITY, 0, offsetY);
-            return;
-        }
+        final boolean validAnchor = (mAnchor != null) && (anchorLocation[1] > 0);
+        final View anchor = validAnchor ? mAnchor : decorView;
 
-        showAtLocation(mAnchor, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, offsetY);
+        showAtLocation(anchor, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, offsetY);
     }
 }

From 7a461140589a029d2a90b9075ff9df5a2500aff7 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Fri, 17 Apr 2015 17:56:10 -0700
Subject: [PATCH 47/80] Bug 1155819 - Set anchor as back button for tablets.
 r=ally

---
 .../base/toolbar/BrowserToolbarTabletBase.java     |  5 +++++
 mobile/android/base/widget/AnchoredPopup.java      | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index 0fdf665412a..b80bb2173fc 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -127,6 +127,11 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         }
     }
 
+    @Override
+    public View getDoorHangerAnchor() {
+        return backButton;
+    }
+
     protected boolean canDoBack(final Tab tab) {
         return (tab.canDoBack() && !isEditing());
     }
diff --git a/mobile/android/base/widget/AnchoredPopup.java b/mobile/android/base/widget/AnchoredPopup.java
index 05631b56845..6cfee365577 100644
--- a/mobile/android/base/widget/AnchoredPopup.java
+++ b/mobile/android/base/widget/AnchoredPopup.java
@@ -100,11 +100,15 @@ public abstract class AnchoredPopup extends PopupWindow {
             return;
         }
 
-        // If the anchor is null or out of the window bounds, just show the popup at the top of the
-        // root view.
-        final boolean validAnchor = (mAnchor != null) && (anchorLocation[1] > 0);
-        final View anchor = validAnchor ? mAnchor : decorView;
+        if (HardwareUtils.isTablet()) {
+            showAsDropDown(mAnchor, 0, 0);
+        } else {
+            // If the anchor is null or out of the window bounds, just show the popup at the top of the
+            // root view.
+            final boolean validAnchor = (mAnchor != null) && (anchorLocation[1] > 0);
+            final View anchor = validAnchor ? mAnchor : decorView;
 
-        showAtLocation(anchor, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, offsetY);
+            showAtLocation(anchor, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, offsetY);
+        }
     }
 }

From c2f1cb6182e37b1313daefd1b52fde293086536e Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 20 Apr 2015 15:40:48 -0700
Subject: [PATCH 48/80] Backed out changeset b09423cfc86b (bug 1098374) for dt
 orange

---
 .../devtools/canvasdebugger/canvasdebugger.js |   4 +
 browser/devtools/shadereditor/shadereditor.js |   4 +
 browser/devtools/shared/telemetry.js          |  17 +-
 browser/devtools/shared/test/browser.ini      |   1 -
 .../shared/test/browser_observableobject.js   |   4 +-
 .../shared/test/browser_options-view-01.js    |   1 +
 .../shared/test/browser_outputparser.js       |   2 +
 .../browser_telemetry_button_eyedropper.js    |  36 +++-
 .../browser_telemetry_button_paintflashing.js |  49 +++--
 .../browser_telemetry_button_responsive.js    |  49 +++--
 .../browser_telemetry_button_scratchpad.js    |  48 ++++-
 .../test/browser_telemetry_button_tilt.js     |  51 ++++--
 .../shared/test/browser_telemetry_misc.js     |  24 ---
 .../shared/test/browser_telemetry_sidebar.js  |  51 ++++--
 .../shared/test/browser_telemetry_toolbox.js  |  20 +-
 ...er_telemetry_toolboxtabs_canvasdebugger.js |  17 +-
 ...browser_telemetry_toolboxtabs_inspector.js |  20 +-
 ...rowser_telemetry_toolboxtabs_jsdebugger.js |  20 +-
 ...rowser_telemetry_toolboxtabs_jsprofiler.js |  13 +-
 ...rowser_telemetry_toolboxtabs_netmonitor.js |  13 +-
 .../browser_telemetry_toolboxtabs_options.js  |  14 +-
 ...wser_telemetry_toolboxtabs_shadereditor.js |  14 +-
 .../browser_telemetry_toolboxtabs_storage.js  |  14 +-
 ...owser_telemetry_toolboxtabs_styleeditor.js |  13 +-
 ...er_telemetry_toolboxtabs_webaudioeditor.js |  14 +-
 ...rowser_telemetry_toolboxtabs_webconsole.js |  14 +-
 browser/devtools/shared/test/head.js          | 171 ++++++------------
 browser/devtools/storage/ui.js                |   6 +
 browser/devtools/webaudioeditor/controller.js |   2 +
 browser/devtools/webaudioeditor/includes.js   |   5 +-
 browser/devtools/webide/test/head.js          | 113 ------------
 .../devtools/webide/test/test_telemetry.html  |  91 ++++++++--
 32 files changed, 420 insertions(+), 495 deletions(-)
 delete mode 100644 browser/devtools/shared/test/browser_telemetry_misc.js

diff --git a/browser/devtools/canvasdebugger/canvasdebugger.js b/browser/devtools/canvasdebugger/canvasdebugger.js
index 537cda761e5..aaa9ae00985 100644
--- a/browser/devtools/canvasdebugger/canvasdebugger.js
+++ b/browser/devtools/canvasdebugger/canvasdebugger.js
@@ -17,6 +17,8 @@ const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { CallWatcherFront } = require("devtools/server/actors/call-watcher");
 const { CanvasFront } = require("devtools/server/actors/canvas");
+const Telemetry = require("devtools/shared/telemetry");
+const telemetry = new Telemetry();
 
 const CANVAS_ACTOR_RECORDING_ATTEMPT = gDevTools.testing ? 500 : 5000;
 
@@ -127,6 +129,7 @@ let EventsHandler = {
    * Listen for events emitted by the current tab target.
    */
   initialize: function() {
+    telemetry.toolOpened("canvasdebugger");
     this._onTabNavigated = this._onTabNavigated.bind(this);
     gTarget.on("will-navigate", this._onTabNavigated);
     gTarget.on("navigate", this._onTabNavigated);
@@ -136,6 +139,7 @@ let EventsHandler = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
+    telemetry.toolClosed("canvasdebugger");
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
   },
diff --git a/browser/devtools/shadereditor/shadereditor.js b/browser/devtools/shadereditor/shadereditor.js
index c28a2246b64..93019876eb2 100644
--- a/browser/devtools/shadereditor/shadereditor.js
+++ b/browser/devtools/shadereditor/shadereditor.js
@@ -17,6 +17,8 @@ const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {Tooltip} = require("devtools/shared/widgets/Tooltip");
 const Editor = require("devtools/sourceeditor/editor");
+const Telemetry = require("devtools/shared/telemetry");
+const telemetry = new Telemetry();
 
 // The panel's window global is an EventEmitter firing the following events:
 const EVENTS = {
@@ -84,6 +86,7 @@ let EventsHandler = {
    * Listen for events emitted by the current tab target.
    */
   initialize: function() {
+    telemetry.toolOpened("shadereditor");
     this._onHostChanged = this._onHostChanged.bind(this);
     this._onTabNavigated = this._onTabNavigated.bind(this);
     this._onProgramLinked = this._onProgramLinked.bind(this);
@@ -99,6 +102,7 @@ let EventsHandler = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
+    telemetry.toolClosed("shadereditor");
     gToolbox.off("host-changed", this._onHostChanged);
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
diff --git a/browser/devtools/shared/telemetry.js b/browser/devtools/shared/telemetry.js
index 05118aa6c7d..0193ccee19a 100644
--- a/browser/devtools/shared/telemetry.js
+++ b/browser/devtools/shared/telemetry.js
@@ -19,8 +19,17 @@
  *      timerHistogram: "DEVTOOLS_MYTOOLNAME_TIME_ACTIVE_SECONDS"
  *    },
  *
- * 3. toolbox.js will automatically ping telemetry with your tools opening and
- *    timing information.
+ * 3. Include this module at the top of your tool. Use:
+ *      let Telemetry = require("devtools/shared/telemetry")
+ *
+ * 4. Create a telemetry instance in your tool's constructor:
+ *      this._telemetry = new Telemetry();
+ *
+ * 5. When your tool is opened call:
+ *      this._telemetry.toolOpened("mytoolname");
+ *
+ * 6. When your tool is closed call:
+ *      this._telemetry.toolClosed("mytoolname");
  *
  * Note:
  * You can view telemetry stats for your local Firefox instance via
@@ -294,10 +303,6 @@ Telemetry.prototype = {
     }
   },
 
-  clearToolsOpenedPref: function() {
-    Services.prefs.clearUserPref(TOOLS_OPENED_PREF);
-  },
-
   destroy: function() {
     for (let histogramId of this._timers.keys()) {
       this.stopTimer(histogramId);
diff --git a/browser/devtools/shared/test/browser.ini b/browser/devtools/shared/test/browser.ini
index 4d352ac3bf5..b5da569d968 100644
--- a/browser/devtools/shared/test/browser.ini
+++ b/browser/devtools/shared/test/browser.ini
@@ -90,7 +90,6 @@ skip-if = e10s # Bug 1067145 - e10s responsiveview
 [browser_telemetry_button_tilt.js]
 skip-if = e10s # Bug 1086492 - Disable tilt for e10s
                # Bug 937166 - Make tilt work in E10S mode
-[browser_telemetry_misc.js]
 [browser_telemetry_sidebar.js]
 [browser_telemetry_toolbox.js]
 [browser_telemetry_toolboxtabs_canvasdebugger.js]
diff --git a/browser/devtools/shared/test/browser_observableobject.js b/browser/devtools/shared/test/browser_observableobject.js
index 5c1cdc69acc..8bd1d516944 100644
--- a/browser/devtools/shared/test/browser_observableobject.js
+++ b/browser/devtools/shared/test/browser_observableobject.js
@@ -2,7 +2,9 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  let ObservableObject = devtools.require("devtools/shared/observable-object");
+  let tmp = {};
+  Cu.import("resource://gre/modules/devtools/Loader.jsm", tmp);
+  let ObservableObject = tmp.devtools.require("devtools/shared/observable-object");
 
   let rawObject = {};
   let oe = new ObservableObject(rawObject);
diff --git a/browser/devtools/shared/test/browser_options-view-01.js b/browser/devtools/shared/test/browser_options-view-01.js
index 147da903403..b64cce36841 100644
--- a/browser/devtools/shared/test/browser_options-view-01.js
+++ b/browser/devtools/shared/test/browser_options-view-01.js
@@ -4,6 +4,7 @@
 // Tests that options-view OptionsView responds to events correctly.
 
 const {OptionsView} = devtools.require("devtools/shared/options-view");
+const {Services} = devtools.require("resource://gre/modules/Services.jsm");
 
 const BRANCH = "devtools.debugger.";
 const BLACK_BOX_PREF = "auto-black-box";
diff --git a/browser/devtools/shared/test/browser_outputparser.js b/browser/devtools/shared/test/browser_outputparser.js
index 47fe9685a00..583f74fad4f 100644
--- a/browser/devtools/shared/test/browser_outputparser.js
+++ b/browser/devtools/shared/test/browser_outputparser.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+let {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
 let {OutputParser} = devtools.require("devtools/output-parser");
 
 add_task(function*() {
diff --git a/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js b/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
index ca429ea02bc..946e4174ebf 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
@@ -8,34 +8,50 @@ let {EyedropperManager} = require("devtools/eyedropper/eyedropper");
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the eyedropper button");
-  testButton(toolbox);
+  testButton(toolbox, Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function testButton(toolbox) {
+function testButton(toolbox, Telemetry) {
   let button = toolbox.doc.querySelector("#command-button-eyedropper");
   ok(button, "Captain, we have the eyedropper button");
 
   info("clicking the button to open the eyedropper");
   button.click();
 
-  checkResults();
+  checkResults("_EYEDROPPER_", Telemetry);
 }
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
+function checkResults(histIdFocus, Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
 
-  checkTelemetry("DEVTOOLS_EYEDROPPER_OPENED_BOOLEAN", [0,1,0]);
-  checkTelemetry("DEVTOOLS_EYEDROPPER_OPENED_PER_USER_FLAG", [0,1,0]);
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
+        !histId.contains(histIdFocus)) {
+      // Inspector stats are tested in
+      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
+      // because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      is(value.length, 1, histId + " has one entry");
+
+      let okay = value.every(element => element === true);
+      ok(okay, "All " + histId + " entries are === true");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js b/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
index d05b9d15fbf..692df44c457 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the paintflashing button");
-  yield testButton(toolbox);
+  yield testButton(toolbox, Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox) {
+function* testButton(toolbox, Telemetry) {
   info("Testing command-button-paintflashing");
 
   let button = toolbox.doc.querySelector("#command-button-paintflashing");
   ok(button, "Captain, we have the button");
 
   yield delayedClicks(button, 4);
-  checkResults();
+  checkResults("_PAINTFLASHING_", Telemetry);
 }
 
 function delayedClicks(node, clicks) {
@@ -53,10 +53,37 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_PAINTFLASHING_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_PAINTFLASHING_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_PAINTFLASHING_TIME_ACTIVE_SECONDS", null, "hasentries");
+function checkResults(histIdFocus, Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
+        !histId.contains(histIdFocus)) {
+      // Inspector stats are tested in
+      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
+      // because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_responsive.js b/browser/devtools/shared/test/browser_telemetry_button_responsive.js
index bb5598d8337..fd9a33460cb 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_responsive.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_responsive.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the responsivedesign button");
-  yield testButton(toolbox);
+  yield testButton(toolbox, Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox) {
+function* testButton(toolbox, Telemetry) {
   info("Testing command-button-responsive");
 
   let button = toolbox.doc.querySelector("#command-button-responsive");
   ok(button, "Captain, we have the button");
 
   yield delayedClicks(button, 4);
-  checkResults();
+  checkResults("_RESPONSIVE_", Telemetry);
 }
 
 function delayedClicks(node, clicks) {
@@ -53,10 +53,37 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_RESPONSIVE_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_RESPONSIVE_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_RESPONSIVE_TIME_ACTIVE_SECONDS", null, "hasentries");
+function checkResults(histIdFocus, Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
+        !histId.contains(histIdFocus)) {
+      // Inspector stats are tested in
+      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
+      // because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js b/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
index e1a5b137fc6..f96755fcf8e 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
@@ -10,8 +10,7 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
@@ -20,11 +19,12 @@ add_task(function*() {
   let onAllWindowsOpened = trackScratchpadWindows();
 
   info("testing the scratchpad button");
-  yield testButton(toolbox);
+  yield testButton(toolbox, Telemetry);
   yield onAllWindowsOpened;
 
-  checkResults();
+  checkResults("_SCRATCHPAD_", Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
@@ -64,7 +64,7 @@ function trackScratchpadWindows() {
   });
 }
 
-function* testButton(toolbox) {
+function* testButton(toolbox, Telemetry) {
   info("Testing command-button-scratchpad");
   let button = toolbox.doc.querySelector("#command-button-scratchpad");
   ok(button, "Captain, we have the button");
@@ -91,9 +91,37 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults(histIdFocus) {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_SCRATCHPAD_OPENED_BOOLEAN", [0,4,0]);
-  checkTelemetry("DEVTOOLS_SCRATCHPAD_OPENED_PER_USER_FLAG", [0,1,0]);
+function checkResults(histIdFocus, Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
+        !histId.contains(histIdFocus)) {
+      // Inspector stats are tested in
+      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
+      // because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_button_tilt.js b/browser/devtools/shared/test/browser_telemetry_button_tilt.js
index b5cd3b30c70..4e36618ca5e 100644
--- a/browser/devtools/shared/test/browser_telemetry_button_tilt.js
+++ b/browser/devtools/shared/test/browser_telemetry_button_tilt.js
@@ -10,28 +10,28 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   info("testing the tilt button");
-  yield testButton(toolbox);
+  yield testButton(toolbox, Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function* testButton(toolbox) {
+function* testButton(toolbox, Telemetry) {
   info("Testing command-button-tilt");
 
   let button = toolbox.doc.querySelector("#command-button-tilt");
   ok(button, "Captain, we have the button");
 
-  yield delayedClicks(button, 4);
-  checkResults();
+  yield delayedClicks(button, 4)
+  checkResults("_TILT_", Telemetry);
 }
 
 function delayedClicks(node, clicks) {
@@ -53,10 +53,37 @@ function delayedClicks(node, clicks) {
   });
 }
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_TILT_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_TILT_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_TILT_TIME_ACTIVE_SECONDS", null, "hasentries");
+function checkResults(histIdFocus, Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_") ||
+        !histId.contains(histIdFocus)) {
+      // Inspector stats are tested in
+      // browser_telemetry_toolboxtabs_{toolname}.js so we skip them here
+      // because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_misc.js b/browser/devtools/shared/test/browser_telemetry_misc.js
deleted file mode 100644
index f5859d5629d..00000000000
--- a/browser/devtools/shared/test/browser_telemetry_misc.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_misc.js</p>";
-const TOOL_DELAY = 0;
-
-add_task(function*() {
-  yield promiseTab(TEST_URI);
-
-  startTelemetry();
-
-  yield openAndCloseToolbox(1, TOOL_DELAY, "inspector");
-  checkResults();
-
-  gBrowser.removeCurrentTab();
-});
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_OS_ENUMERATED_PER_USER", null, "hasentries");
-  checkTelemetry("DEVTOOLS_OS_IS_64_BITS_PER_USER", null, "hasentries");
-  checkTelemetry("DEVTOOLS_SCREEN_RESOLUTION_ENUMERATED_PER_USER", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_sidebar.js b/browser/devtools/shared/test/browser_telemetry_sidebar.js
index a975090ec0b..b80930e0e6c 100644
--- a/browser/devtools/shared/test/browser_telemetry_sidebar.js
+++ b/browser/devtools/shared/test/browser_telemetry_sidebar.js
@@ -9,16 +9,16 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   let toolbox = yield gDevTools.showToolbox(target, "inspector");
   info("inspector opened");
 
   yield testSidebar(toolbox);
-  checkResults();
+  checkResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
@@ -49,16 +49,37 @@ function* testSidebar(toolbox) {
   });
 }
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_ANIMATIONINSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_COMPUTEDVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_FONTINSPECTOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_FONTINSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_FONTINSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
+function checkResults(Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.startsWith("DEVTOOLS_INSPECTOR_")) {
+      // Inspector stats are tested in browser_telemetry_toolboxtabs.js so we
+      // skip them here because we only open the inspector once for this test.
+      continue;
+    }
+
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId === "DEVTOOLS_TOOLBOX_OPENED_BOOLEAN") {
+      is(value.length, 1, histId + " has only one entry");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_toolbox.js b/browser/devtools/shared/test/browser_telemetry_toolbox.js
index 724fdd129e5..366f64699ab 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolbox.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolbox.js
@@ -10,25 +10,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(3, TOOL_DELAY, "inspector");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_BOOLEAN", [0,3,0]);
-  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_BOOLEAN", [0,3,0]);
-  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_RULEVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,3,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
index bae88ab26c0..c9c07099a59 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
@@ -14,25 +14,14 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.canvasdebugger.enabled", true);
 
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "canvasdebugger");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activate the canvasdebugger");
   Services.prefs.setBoolPref("devtools.canvasdebugger.enabled", originalPref);
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_CANVASDEBUGGER_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
index 236faf6e469..61dff980af2 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
@@ -10,25 +10,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "inspector");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_INSPECTOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_RULEVIEW_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_RULEVIEW_TIME_ACTIVE_SECONDS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
index cc70eda3e39..a8625518351 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
@@ -10,25 +10,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "jsdebugger");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RECONFIGURETAB_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RECONFIGURETHREAD_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_RESUME_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_SOURCES_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_TABDETACH_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_THREADDETACH_MS", null, "hasentries");
-  checkTelemetry("DEVTOOLS_JSDEBUGGER_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_JSDEBUGGER_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_JSDEBUGGER_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
index d3db7fad406..e2131feb2df 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
@@ -9,18 +9,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "performance");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_JSPROFILER_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_JSPROFILER_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_JSPROFILER_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
index a0fa1abd97a..e7554e5492a 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
@@ -9,19 +9,12 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "netmonitor");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_NETMONITOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_NETMONITOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_NETMONITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
index b0ed00e6266..14256814e49 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
@@ -9,19 +9,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "options");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_OPTIONS_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_OPTIONS_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_OPTIONS_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
index 7f25e08a4c3..476fbd320d9 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
@@ -20,22 +20,14 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.shadereditor.enabled", true);
 
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "shadereditor");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activate the sharer editor");
   Services.prefs.setBoolPref("devtools.shadereditor.enabled", originalPref);
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_SHADEREDITOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_SHADEREDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_SHADEREDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
index b935204c68c..93348b96df7 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
@@ -12,22 +12,14 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.storage.enabled", true);
 
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "storage");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activating the storage inspector");
   Services.prefs.clearUserPref("devtools.storage.enabled");
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_STORAGE_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_STORAGE_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_STORAGE_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
index 968b328eecf..15c4a9c08ac 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
@@ -9,19 +9,12 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "styleeditor");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
 
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_STYLEEDITOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_STYLEEDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_STYLEEDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
index 435b5711563..033791a7235 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
@@ -13,22 +13,14 @@ add_task(function*() {
   Services.prefs.setBoolPref("devtools.webaudioeditor.enabled", true);
 
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "webaudioeditor");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 
   info("De-activating the webaudioeditor");
   Services.prefs.setBoolPref("devtools.webaudioeditor.enabled", originalPref);
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_WEBAUDIOEDITOR_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
index 693790522fd..b989a14269a 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
@@ -9,19 +9,11 @@ const TOOL_DELAY = 200;
 
 add_task(function*() {
   yield promiseTab(TEST_URI);
-
-  startTelemetry();
+  let Telemetry = loadTelemetryAndRecordLogs();
 
   yield openAndCloseToolbox(2, TOOL_DELAY, "webconsole");
-  checkResults();
+  checkTelemetryResults(Telemetry);
 
+  stopRecordingTelemetryLogs(Telemetry);
   gBrowser.removeCurrentTab();
 });
-
-function checkResults() {
-  // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-  // here.
-  checkTelemetry("DEVTOOLS_WEBCONSOLE_OPENED_BOOLEAN", [0,2,0]);
-  checkTelemetry("DEVTOOLS_WEBCONSOLE_OPENED_PER_USER_FLAG", [0,1,0]);
-  checkTelemetry("DEVTOOLS_WEBCONSOLE_TIME_ACTIVE_SECONDS", null, "hasentries");
-}
diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
index a6542217f82..121f75f6900 100644
--- a/browser/devtools/shared/test/head.js
+++ b/browser/devtools/shared/test/head.js
@@ -6,22 +6,12 @@ let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory, require} = devtools;
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 const {DOMHelpers} = Cu.import("resource:///modules/devtools/DOMHelpers.jsm", {});
 const {Hosts} = require("devtools/framework/toolbox-hosts");
 
-let oldCanRecord = Services.telemetry.canRecordExtended;
-
 gDevTools.testing = true;
-registerCleanupFunction(() => {
-  _stopTelemetry();
+SimpleTest.registerCleanupFunction(() => {
   gDevTools.testing = false;
-
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-
-  console = undefined;
 });
 
 const TEST_URI_ROOT = "http://example.com/browser/browser/devtools/shared/test/";
@@ -53,6 +43,14 @@ function promiseTab(aURL) {
     addTab(aURL, resolve));
 }
 
+registerCleanupFunction(function tearDown() {
+  while (gBrowser.tabs.length > 1) {
+    gBrowser.removeCurrentTab();
+  }
+
+  console = undefined;
+});
+
 function catchFail(func) {
   return function() {
     try {
@@ -152,124 +150,73 @@ let createHost = Task.async(function*(type = "bottom", src = "data:text/html;cha
   return [host, iframe.contentWindow, iframe.contentDocument];
 });
 
-function reportError(error) {
-  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+/**
+ * Load the Telemetry utils, then stub Telemetry.prototype.log in order to
+ * record everything that's logged in it.
+ * Store all recordings on Telemetry.telemetryInfo.
+ * @return {Telemetry}
+ */
+function loadTelemetryAndRecordLogs() {
+  info("Mock the Telemetry log function to record logged information");
 
-  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
-            error.lineNumber + "\n\nStack trace:" + stack);
+  let Telemetry = require("devtools/shared/telemetry");
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (!this.telemetryInfo) {
+      // Can be removed when Bug 992911 lands (see Bug 1011652 Comment 10)
+      return;
+    }
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
 
-  if (finishUp) {
-    finishUp();
-  }
-}
+      this.telemetryInfo[histogramId].push(value);
+    }
+  };
 
-function startTelemetry() {
-  Services.telemetry.canRecordExtended = true;
+  return Telemetry;
 }
 
 /**
- * This method is automatically called on teardown.
+ * Stop recording the Telemetry logs and put back the utils as it was before.
  */
-function _stopTelemetry() {
-  let Telemetry = devtools.require("devtools/shared/telemetry");
-  let telemetry = new Telemetry();
-
-  telemetry.clearToolsOpenedPref();
-
-  Services.telemetry.canRecordExtended = oldCanRecord;
-
-  // Clean up telemetry histogram changes
-  for (let histId in Services.telemetry.histogramSnapshots) {
-    try {
-      let histogram = Services.telemetry.getHistogramById(histId);
-      histogram.clear();
-    } catch(e) {
-      // Histograms is not listed in histograms.json, do nothing.
-    }
-  }
+function stopRecordingTelemetryLogs(Telemetry) {
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
 }
 
 /**
- * Check the value of a given telemetry histogram.
- *
- * @param  {String} histId
- *         Histogram id
- * @param  {Array|Number} expected
- *         Expected value
- * @param  {String} checkType
- *         "array" (default) - Check that an array matches the histogram data.
- *         "hasentries"  - For non-enumerated linear and exponential
- *                             histograms. This checks for at least one entry.
+ * Check the correctness of the data recorded in Telemetry after
+ * loadTelemetryAndRecordLogs was called.
  */
-function checkTelemetry(histId, expected, checkType="array") {
-  let actual = Services.telemetry.getHistogramById(histId).snapshot().counts;
+function checkTelemetryResults(Telemetry) {
+  let result = Telemetry.prototype.telemetryInfo;
 
-  switch (checkType) {
-    case "array":
-      is(JSON.stringify(actual), JSON.stringify(expected), histId + " correct.");
-    break;
-    case "hasentries":
-      let hasEntry = actual.some(num => num > 0);
-      ok(hasEntry, histId + " has at least one entry.");
-    break;
-  }
-}
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
 
-/**
- * Generate telemetry tests. You should call generateTelemetryTests("DEVTOOLS_")
- * from your result checking code in telemetry tests. It logs checkTelemetry
- * calls for all changed telemetry values.
- *
- * @param  {String} prefix
- *         Optionally limits results to histogram ids starting with prefix.
- */
-function generateTelemetryTests(prefix="") {
-  dump("=".repeat(80) + "\n");
-  for (let histId in Services.telemetry.histogramSnapshots) {
-    if (!histId.startsWith(prefix)) {
-      continue;
-    }
+      let okay = value.every(function(element) {
+        return element === true;
+      });
 
-    let snapshot = Services.telemetry.histogramSnapshots[histId];
-    let actual = snapshot.counts;
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
 
-    switch (snapshot.histogram_type) {
-      case Services.telemetry.HISTOGRAM_EXPONENTIAL:
-      case Services.telemetry.HISTOGRAM_LINEAR:
-        let total = 0;
-        for (let val of actual) {
-          total += val;
-        }
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
 
-        if (histId.endsWith("_ENUMERATED")) {
-          if (total > 0) {
-            dump("checkTelemetry(\"" + histId + "\", " + JSON.stringify(actual) + ");\n");
-          }
-          continue;
-        }
-
-        dump("checkTelemetry(\"" + histId + "\", null, \"hasentries\");\n");
-      break;
-      case Services.telemetry.HISTOGRAM_BOOLEAN:
-        actual = JSON.stringify(actual);
-
-        if (actual !== "[0,0,0]") {
-          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-        }
-      break;
-      case Services.telemetry.HISTOGRAM_FLAG:
-        actual = JSON.stringify(actual);
-
-        if (actual !== "[1,0,0]") {
-          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-        }
-      break;
-      case Services.telemetry.HISTOGRAM_COUNT:
-        dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-      break;
+      ok(okay, "All " + histId + " entries have time > 0");
     }
   }
-  dump("=".repeat(80) + "\n");
 }
 
 /**
@@ -283,7 +230,7 @@ function* openAndCloseToolbox(nbOfTimes, usageTime, toolId) {
   for (let i = 0; i < nbOfTimes; i ++) {
     info("Opening toolbox " + (i + 1));
     let target = TargetFactory.forTab(gBrowser.selectedTab);
-    yield gDevTools.showToolbox(target, toolId);
+    yield gDevTools.showToolbox(target, toolId)
 
     // We use a timeout to check the toolbox's active time
     yield new Promise(resolve => setTimeout(resolve, usageTime));
diff --git a/browser/devtools/storage/ui.js b/browser/devtools/storage/ui.js
index 1e1ee0ce974..52a0ca12b3d 100644
--- a/browser/devtools/storage/ui.js
+++ b/browser/devtools/storage/ui.js
@@ -21,6 +21,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "ViewHelpers",
 XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
   "resource:///modules/devtools/VariablesView.jsm");
 
+let Telemetry = require("devtools/shared/telemetry");
+
 /**
  * Localization convenience methods.
  */
@@ -85,6 +87,9 @@ this.StorageUI = function StorageUI(front, target, panelWin) {
 
   this.handleKeypress = this.handleKeypress.bind(this);
   this._panelDoc.addEventListener("keypress", this.handleKeypress);
+
+  this._telemetry = new Telemetry();
+  this._telemetry.toolOpened("storage");
 }
 
 exports.StorageUI = StorageUI;
@@ -97,6 +102,7 @@ StorageUI.prototype = {
   destroy: function() {
     this.front.off("stores-update", this.onUpdate);
     this._panelDoc.removeEventListener("keypress", this.handleKeypress);
+    this._telemetry.toolClosed("storage");
   },
 
   /**
diff --git a/browser/devtools/webaudioeditor/controller.js b/browser/devtools/webaudioeditor/controller.js
index 5f9755f4832..544650a9104 100644
--- a/browser/devtools/webaudioeditor/controller.js
+++ b/browser/devtools/webaudioeditor/controller.js
@@ -42,6 +42,7 @@ let WebAudioEditorController = {
    * Listen for events emitted by the current tab target.
    */
   initialize: Task.async(function* () {
+    telemetry.toolOpened("webaudioeditor");
     this._onTabNavigated = this._onTabNavigated.bind(this);
     this._onThemeChange = this._onThemeChange.bind(this);
 
@@ -75,6 +76,7 @@ let WebAudioEditorController = {
    * Remove events emitted by the current tab target.
    */
   destroy: function() {
+    telemetry.toolClosed("webaudioeditor");
     gTarget.off("will-navigate", this._onTabNavigated);
     gTarget.off("navigate", this._onTabNavigated);
     gFront.off("start-context", this._onStartContext);
diff --git a/browser/devtools/webaudioeditor/includes.js b/browser/devtools/webaudioeditor/includes.js
index acfbe87278c..2e6b8ece4ea 100644
--- a/browser/devtools/webaudioeditor/includes.js
+++ b/browser/devtools/webaudioeditor/includes.js
@@ -19,9 +19,10 @@ let { EventTarget } = require("sdk/event/target");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 const { Class } = require("sdk/core/heritage");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const STRINGS_URI = "chrome://browser/locale/devtools/webaudioeditor.properties";
+const STRINGS_URI = "chrome://browser/locale/devtools/webaudioeditor.properties"
 const L10N = new ViewHelpers.L10N(STRINGS_URI);
-
+const Telemetry = require("devtools/shared/telemetry");
+const telemetry = new Telemetry();
 devtools.lazyImporter(this, "LineGraphWidget",
   "resource:///modules/devtools/Graphs.jsm");
 
diff --git a/browser/devtools/webide/test/head.js b/browser/devtools/webide/test/head.js
index 309dbc61262..71d6697c863 100644
--- a/browser/devtools/webide/test/head.js
+++ b/browser/devtools/webide/test/head.js
@@ -14,8 +14,6 @@ const {require} = devtools;
 const promise = require("promise");
 const {AppProjects} = require("devtools/app-manager/app-projects");
 
-let oldCanRecord = Services.telemetry.canRecordExtended;
-
 let TEST_BASE;
 if (window.location === "chrome://browser/content/browser.xul") {
   TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/webide/test/";
@@ -35,8 +33,6 @@ Services.prefs.setCharPref("devtools.webide.templatesURL", TEST_BASE + "template
 Services.prefs.setCharPref("devtools.devices.url", TEST_BASE + "browser_devices.json");
 
 SimpleTest.registerCleanupFunction(() => {
-  _stopTelemetry();
-
   Services.prefs.clearUserPref("devtools.webide.enabled");
   Services.prefs.clearUserPref("devtools.webide.enableLocalRuntime");
   Services.prefs.clearUserPref("devtools.webide.autoinstallADBHelper");
@@ -211,112 +207,3 @@ function handleError(aError) {
   ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
   finish();
 }
-
-function startTelemetry() {
-  Services.telemetry.canRecordExtended = true;
-}
-
-/**
- * This method is automatically called on teardown.
- */
-function _stopTelemetry() {
-  let Telemetry = devtools.require("devtools/shared/telemetry");
-  let telemetry = new Telemetry();
-
-  telemetry.clearToolsOpenedPref();
-
-  Services.telemetry.canRecordExtended = oldCanRecord;
-
-  // Clean up telemetry histogram changes
-  for (let histId in Services.telemetry.histogramSnapshots) {
-    try {
-      let histogram = Services.telemetry.getHistogramById(histId);
-      histogram.clear();
-    } catch(e) {
-      // Histograms is not listed in histograms.json, do nothing.
-    }
-  }
-}
-
-/**
- * Check the value of a given telemetry histogram.
- *
- * @param  {String} histId
- *         Histogram id
- * @param  {Array|Number} expected
- *         Expected value
- * @param  {String} checkType
- *         "array" (default) - Check that an array matches the histogram data.
- *         "hasentries"  - For non-enumerated linear and exponential
- *                             histograms. This checks for at least one entry.
- */
-function checkTelemetry(histId, expected, checkType="array") {
-  let actual = Services.telemetry.getHistogramById(histId).snapshot().counts;
-
-  switch (checkType) {
-    case "array":
-      is(JSON.stringify(actual), JSON.stringify(expected), histId + " correct.");
-    break;
-    case "hasentries":
-      let hasEntry = actual.some(num => num > 0);
-      ok(hasEntry, histId + " has at least one entry.");
-    break;
-  }
-}
-
-/**
- * Generate telemetry tests. You should call generateTelemetryTests("DEVTOOLS_")
- * from your result checking code in telemetry tests. It logs checkTelemetry
- * calls for all changed telemetry values.
- *
- * @param  {String} prefix
- *         Optionally limits results to histogram ids starting with prefix.
- */
-function generateTelemetryTests(prefix="") {
-  dump("=".repeat(80) + "\n");
-  for (let histId in Services.telemetry.histogramSnapshots) {
-    if (!histId.startsWith(prefix)) {
-      continue;
-    }
-
-    let snapshot = Services.telemetry.histogramSnapshots[histId];
-    let actual = snapshot.counts;
-
-    switch (snapshot.histogram_type) {
-      case Services.telemetry.HISTOGRAM_EXPONENTIAL:
-      case Services.telemetry.HISTOGRAM_LINEAR:
-        let total = 0;
-        for (let val of actual) {
-          total += val;
-        }
-
-        if (histId.endsWith("_ENUMERATED")) {
-          if (total > 0) {
-            dump("checkTelemetry(\"" + histId + "\", " + JSON.stringify(actual) + ");\n");
-          }
-          continue;
-        }
-
-        dump("checkTelemetry(\"" + histId + "\", null, \"hasentries\");\n");
-      break;
-      case Services.telemetry.HISTOGRAM_BOOLEAN:
-        actual = JSON.stringify(actual);
-
-        if (actual !== "[0,0,0]") {
-          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-        }
-      break;
-      case Services.telemetry.HISTOGRAM_FLAG:
-        actual = JSON.stringify(actual);
-
-        if (actual !== "[1,0,0]") {
-          dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-        }
-      break;
-      case Services.telemetry.HISTOGRAM_COUNT:
-        dump("checkTelemetry(\"" + histId + "\", " + actual + ");\n");
-      break;
-    }
-  }
-  dump("=".repeat(80) + "\n");
-}
diff --git a/browser/devtools/webide/test/test_telemetry.html b/browser/devtools/webide/test/test_telemetry.html
index 4133cb65831..72eb4d51fed 100644
--- a/browser/devtools/webide/test/test_telemetry.html
+++ b/browser/devtools/webide/test/test_telemetry.html
@@ -15,6 +15,7 @@
   <body>
 
     <script type="application/javascript;version=1.8">
+      const Telemetry = require("devtools/shared/telemetry");
       const { _DeprecatedUSBRuntime, _WiFiRuntime, _SimulatorRuntime,
               _gRemoteRuntime, _gLocalRuntime, RuntimeTypes }
             = require("devtools/webide/runtimes");
@@ -23,6 +24,25 @@
       // been opened we make use of setTimeout() to create tool active times.
       const TOOL_DELAY = 200;
 
+      function patchTelemetry() {
+        Telemetry.prototype.telemetryInfo = {};
+        Telemetry.prototype._oldlog = Telemetry.prototype.log;
+        Telemetry.prototype.log = function(histogramId, value) {
+          if (histogramId) {
+            if (!this.telemetryInfo[histogramId]) {
+              this.telemetryInfo[histogramId] = [];
+            }
+            this.telemetryInfo[histogramId].push(value);
+          }
+        }
+      }
+
+      function resetTelemetry() {
+        Telemetry.prototype.log = Telemetry.prototype._oldlog;
+        delete Telemetry.prototype._oldlog;
+        delete Telemetry.prototype.telemetryInfo;
+      }
+
       function cycleWebIDE() {
         return Task.spawn(function*() {
           let win = yield openWebIDE();
@@ -130,22 +150,58 @@
       }
 
       function checkResults() {
-        // For help generating these tests use generateTelemetryTests("DEVTOOLS_")
-        // here.
-        checkTelemetry("DEVTOOLS_DEBUGGER_RDP_LOCAL_LISTTABS_MS", null, "hasentries");
-        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_DEBUG_USED", [6,0,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_PLAY_USED", [6,0,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_RESULT", [0,6,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_CONNECTION_TIME_SECONDS", null, "hasentries");
-        checkTelemetry("DEVTOOLS_WEBIDE_LOCAL_CONNECTION_RESULT", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_OPENED_BOOLEAN", [0,2,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_OPENED_PER_USER_FLAG", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_OTHER_CONNECTION_RESULT", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_REMOTE_CONNECTION_RESULT", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_SIMULATOR_CONNECTION_RESULT", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS", null, "hasentries");
-        checkTelemetry("DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT", [0,1,0]);
-        checkTelemetry("DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT", [0,1,0]);
+        let result = Telemetry.prototype.telemetryInfo;
+        for (let [histId, value] of Iterator(result)) {
+          if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+            ok(value.length === 1 && !!value[0],
+               "Per user value " + histId + " has a single value of true");
+          } else if (histId.endsWith("OPENED_BOOLEAN")) {
+            ok(value.length > 1, histId + " has more than one entry");
+
+            let okay = value.every(function(element) {
+              return !!element;
+            });
+
+            ok(okay, "All " + histId + " entries are true");
+          } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+            ok(value.length > 1, histId + " has more than one entry");
+
+            let okay = value.every(function(element) {
+              return element > 0;
+            });
+
+            ok(okay, "All " + histId + " entries have time > 0");
+          } else if (histId === "DEVTOOLS_WEBIDE_CONNECTION_RESULT") {
+            ok(value.length === 6, histId + " has 6 connection results");
+
+            let okay = value.every(function(element) {
+              return !!element;
+            });
+
+            ok(okay, "All " + histId + " connections succeeded");
+          } else if (histId.endsWith("CONNECTION_RESULT")) {
+            ok(value.length === 1 && !!value[0],
+               histId + " has 1 successful connection");
+          } else if (histId === "DEVTOOLS_WEBIDE_CONNECTION_TIME_SECONDS") {
+            ok(value.length === 6, histId + " has 6 connection results");
+
+            let okay = value.every(function(element) {
+              return element > 0;
+            });
+
+            ok(okay, "All " + histId + " connections have time > 0");
+          } else if (histId.endsWith("USED")) {
+            ok(value.length === 6, histId + " has 6 connection actions");
+
+            let okay = value.every(function(element) {
+              return !element;
+            });
+
+            ok(okay, "All " + histId + " actions were skipped");
+          } else {
+            ok(false, "Unexpected " + histId + " was logged");
+          }
+        }
       }
 
       window.onload = function() {
@@ -160,6 +216,7 @@
             }
             DebuggerServer.destroy();
             yield removeAllProjects();
+            resetTelemetry();
           });
         });
 
@@ -171,7 +228,7 @@
             DebuggerServer.addBrowserActors();
           }
 
-          startTelemetry();
+          patchTelemetry();
 
           // Cycle once, so we can test for multiple opens
           yield cycleWebIDE();

From 5c718648cf3e987caa876e74bac52ca5dbd2a5fe Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Mon, 20 Apr 2015 15:54:49 -0700
Subject: [PATCH 49/80] Bug 1155515 - Disable Reading List and RL Sync on all
 channels. r=markh

---
 browser/app/profile/firefox.js                             | 7 ++-----
 .../components/readinglist/test/xpcshell/test_scheduler.js | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ac3512fb668..a6ace16163c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1880,12 +1880,9 @@ pref("dom.ipc.reportProcessHangs", false);
 pref("dom.ipc.reportProcessHangs", true);
 #endif
 
-// Enable ReadingList browser UI by default.
-pref("browser.readinglist.enabled", true);
+pref("browser.readinglist.enabled", false);
 pref("browser.readinglist.sidebarEverOpened", false);
-
-// Enable the readinglist engine by default.
-pref("readinglist.scheduler.enabled", true);
+pref("readinglist.scheduler.enabled", false);
 pref("readinglist.server", "https://readinglist.services.mozilla.com/v1");
 
 // Don't limit how many nodes we care about on desktop:
diff --git a/browser/components/readinglist/test/xpcshell/test_scheduler.js b/browser/components/readinglist/test/xpcshell/test_scheduler.js
index 32decadf09f..c8326a9cd9e 100644
--- a/browser/components/readinglist/test/xpcshell/test_scheduler.js
+++ b/browser/components/readinglist/test/xpcshell/test_scheduler.js
@@ -15,6 +15,7 @@ Cu.import("resource://gre/modules/Timer.jsm");
 do_get_profile();
 
 let prefs = new Preferences("readinglist.scheduler.");
+prefs.set("enabled", true);
 
 function promiseObserver(topic) {
   return new Promise(resolve => {

From ce62d951156e7b73102b1d2ca42d3983b8c70914 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Mon, 20 Apr 2015 16:18:12 -0700
Subject: [PATCH 50/80] Bug 1133755 - Final copy for Tab Queue (r=antlam)

---
 mobile/android/base/locales/en-US/android_strings.dtd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 223c50ee7c5..57d8cadef7d 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -192,10 +192,10 @@
 <!ENTITY pref_donottrack_title "Do not track">
 <!ENTITY pref_donottrack_summary "&brandShortName; will tell sites that you do not want to be tracked">
 
-<!ENTITY tab_queue_toast_message "Open later">
+<!ENTITY tab_queue_toast_message "Tab queued in &brandShortName;">
 <!ENTITY tab_queue_toast_action "Open now">
 <!ENTITY tab_queue_prompt_title "Opening multiple links?">
-<!ENTITY tab_queue_prompt_text "Open them without switching to Firefox each time.">
+<!ENTITY tab_queue_prompt_text "Open them without switching to &brandShortName; each time.">
 <!ENTITY tab_queue_prompt_tip_text "you can change this later in Settings">
 <!ENTITY tab_queue_prompt_positive_action_button "Enable">
 <!ENTITY tab_queue_prompt_negative_action_button "Not now">
@@ -397,8 +397,8 @@ size. -->
 <!ENTITY pref_scroll_title_bar2 "Full-screen browsing">
 <!ENTITY pref_scroll_title_bar_summary "Hide the &brandShortName; title bar when scrolling down a page">
 
-<!ENTITY pref_tab_queue_title "Open later">
-<!ENTITY pref_tab_queue_summary "Prevent tabs from opening immediately, but open all queued tabs the next time &brandShortName; loads.">
+<!ENTITY pref_tab_queue_title "Open multiple links">
+<!ENTITY pref_tab_queue_summary "Queue links for later instead of switching to &brandShortName; each time">
 
 <!-- Localization note (page_removed): This string appears in a toast message when
      any page is removed frome about:home. This includes pages that are in history,

From bd6e2a321bbcd71bdc16cbf2411f6e845f7ee5b2 Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Mon, 20 Apr 2015 17:28:25 -0700
Subject: [PATCH 51/80] Bug 1134385. Delete main thread assertion in
 CompositorVsyncDispatcher. r=kats

---
 widget/VsyncDispatcher.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/widget/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp
index 6a4bab58113..0e3896fec7a 100644
--- a/widget/VsyncDispatcher.cpp
+++ b/widget/VsyncDispatcher.cpp
@@ -37,7 +37,6 @@ CompositorVsyncDispatcher::~CompositorVsyncDispatcher()
 {
   MOZ_ASSERT(XRE_IsParentProcess());
   // We auto remove this vsync dispatcher from the vsync source in the nsBaseWidget
-  MOZ_ASSERT(NS_IsMainThread());
 }
 
 void

From 210fdf983fd3cd3225396decaa3be359e52d9159 Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Mon, 20 Apr 2015 17:28:25 -0700
Subject: [PATCH 52/80] Bug 1134385. Silk documentation. r=kats

---
 gfx/doc/Silk.md              | 227 +++++++++++++++++++++++++++++++++++
 gfx/doc/silkArchitecture.png | Bin 0 -> 221047 bytes
 2 files changed, 227 insertions(+)
 create mode 100644 gfx/doc/Silk.md
 create mode 100644 gfx/doc/silkArchitecture.png

diff --git a/gfx/doc/Silk.md b/gfx/doc/Silk.md
new file mode 100644
index 00000000000..3348ce0c2bc
--- /dev/null
+++ b/gfx/doc/Silk.md
@@ -0,0 +1,227 @@
+Silk Architecture Overview
+=================
+
+#Architecture
+Our current architecture is to align three components to hardware vsync timers:
+
+1. Compositor
+2. RefreshDriver / Painting
+3. Input Events
+
+The flow of our rendering engine is as follows:
+
+1. Hardware Vsync event occurs on an OS specific *Hardware Vsync Thread* on a per monitor basis.
+2. The *Hardware Vsync Thread* attached to the monitor notifies the **CompositorVsyncDispatchers** and **RefreshTimerVsyncDispatcher**.
+3. For every Firefox window on the specific monitor, notify a **CompositorVsyncDispatcher**. The **CompositorVsyncDispatcher** is specific to one window.
+4. The **CompositorVsyncDispatcher** notifies the **Compositor** that a vsync has occured.
+5. The **RefreshTimerVsyncDispatcher** notifies the Chrome **RefreshTimer** that a vsync has occured.
+6. The **RefreshTimerVsyncDispatcher** sends IPC messages to all content processes to tick their respective active **RefreshTimer**.
+7. The **Compositor** dispatches input events on the *Compositor Thread*, then composites. Input events are only dispatched on the *Compositor Thread* on b2g.
+8. The **RefreshDriver** paints on the *Main Thread*.
+
+The implementation is broken into the following sections and will reference this figure. Note that **Objects** are bold fonts while *Threads* are italicized.
+
+<img src="architecture.png" width="900px" height="630px" />
+
+#Hardware Vsync
+Hardware vsync events from (1), occur on a specific **Display** Object.
+The **Display** object is responsible for enabling / disabling vsync on a per connected display basis.
+For example, if two monitors are connected, two **Display** objects will be created, each listening to vsync events for their respective displays.
+We require one **Display** object per monitor as each monitor may have different vsync rates.
+As a fallback solution, we have one global **Display** object that can synchronize across all connected displays.
+The global **Display** is useful if a window is positioned halfway between the two monitors.
+Each platform will have to implement a specific **Display** object to hook and listen to vsync events.
+As of this writing, both Firefox OS and OS X create their own hardware specific *Hardware Vsync Thread* that executes after a vsync has occured.
+OS X creates one *Hardware Vsync Thread* per **CVDisplayLinkRef**.
+We do not currently support multiple displays, so we use one global **CVDisplayLinkRef** that works across all active displays.
+On Windows, we have to create a new platform *thread* that waits for DwmFlush(), which works across all active displays.
+Once the thread wakes up from DwmFlush(), the actual vsync timestamp is retrieved from DwmGetCompositionTimingInfo(), which is the timestamp that is actually passed into the compositor and refresh driver.
+
+When a vsync occurs on a **Display**, the *Hardware Vsync Thread* callback fetches all **CompositorVsyncDispatchers** associated with the **Display**.
+Each **CompositorVsyncDispatcher** is notified that a vsync has occured with the vsync's timestamp.
+It is the responsibility of the **CompositorVsyncDispatcher** to notify the **Compositor** that is awaiting vsync notifications.
+The **Display** will then notify the associated **RefreshTimerVsyncDispatcher**, which should notify all active **RefreshDrivers** to tick.
+
+All **Display** objects are encapsulated in a **VsyncSource** object.
+The **VsyncSource** object lives in **gfxPlatform** and is instantiated only on the parent process when **gfxPlatform** is created.
+The **VsyncSource** is destroyed when **gfxPlatform** is destroyed.
+There is only one **VsyncSource** object throughout the entire lifetime of Firefox.
+Each platform is expected to implement their own **VsyncSource** to manage vsync events.
+On Firefox OS, this is through the **HwcComposer2D**.
+On OS X, this is through **CVDisplayLinkRef**.
+On Windows, it should be through **DwmGetCompositionTimingInfo**.
+
+#Compositor
+When the **CompositorVsyncDispatcher** is notified of the vsync event, the **CompositorVsyncObserver** associated with the **CompositorVsyncDispatcher** begins execution.
+Since the **CompositorVsyncDispatcher** executes on the *Hardware Vsync Thread* and the **Compositor** composites on the *CompositorThread*, the **CompositorVsyncObserver** posts a task to the *CompositorThread*.
+The **CompositorParent** then composites.
+The model where the **CompositorVsyncDispatcher** notifies components on the *Hardware Vsync Thread*, and the component schedules the task on the appropriate thread is used everywhere.
+
+The **CompositorVsyncObserver** listens to vsync events as needed and stops listening to vsync when composites are no longer scheduled or required.
+Every **CompositorParent** is associated and tied to one **CompositorVsyncObserver**, which is associated with the **CompositorVsyncDispatcher**.
+Each **CompositorParent** is associated with one widget and is created when a new platform window or **nsBaseWidget** is created.
+The **CompositorParent**, **CompositorVsyncDispatcher**, **CompositorVsyncObserver**, and **nsBaseWidget** all have the same lifetimes, which are created and destroyed together.
+
+###CompositorVsyncDispatcher
+The **CompositorVsyncDispatcher** executes on the *Hardware Vsync Thread*.
+It contains references to the **nsBaseWidget** it is associated with and has a lifetime equal to the **nsBaseWidget**.
+The **CompositorVsyncDispatcher** is responsible for notifying the **CompositorParent** that a vsync event has occured.
+There can be multiple **CompositorVsyncDispatchers** per **Display**, one **CompositorVsyncDispatcher** per window.
+The only responsibility of the **CompositorVsyncDispatcher** is to notify components when a vsync event has occured, and to stop listening to vsync when no components require vsync events.
+We require one **CompositorVsyncDispatcher** per window so that we can handle multiple **Displays**.
+
+###Multiple Displays
+The **VsyncSource** has an API to switch a **CompositorVsyncDispatcher** from one **Display** to another **Display**.
+For example, when one window either goes into full screen mode or moves from one connected monitor to another.
+When one window moves to another monitor, we expect a platform specific notification to occur.
+The detection of when a window enters full screen mode or moves is not covered by Silk itself, but the framework is built to support this use case.
+The expected flow is that the OS notification occurs on **nsIWidget**, which retrieves the associated **CompositorVsyncDispatcher**.
+The **CompositorVsyncDispatcher** then notifies the **VsyncSource** to switch to the correct **Display** the **CompositorVsyncDispatcher** is connected to.
+Because the notification works through the **nsIWidget**, the actual switching of the **CompositorVsyncDispatcher** to the correct **Display** should occur on the *Main Thread*.
+The current implementation of Silk does not handle this case and needs to be built out.
+
+###CompositorVsyncObserver
+The **CompositorVsyncObserver** handles the vsync notifications and interactions with the **CompositorVsyncDispatcher**.
+When the **Compositor** requires a scheduled composite, it notifies the **CompositorVsyncObserver** that it needs to listen to vsync.
+The **CompositorVsyncObserver** then observes / unobserves vsync as needed from the **CompositorVsyncDispatcher** to enable composites.
+
+###GeckoTouchDispatcher
+The **GeckoTouchDispatcher** is a singleton that resamples touch events to smooth out jank while tracking a user's finger.
+Because input and composite are linked together, the **CompositorVsyncObserver** has a reference to the **GeckoTouchDispatcher** and vice versa.
+
+###Input Events
+One large goal of Silk is to align touch events with vsync events.
+On Firefox OS, touchscreens often have different touch scan rates than the display refreshes.
+A Flame device has a touch refresh rate of 75 HZ, while a Nexus 4 has a touch refresh rate of 100 HZ, while the device's display refresh rate is 60HZ.
+When a vsync event occurs, we resample touch events, and then dispatch the resampled touch event to APZ.
+Touch events on Firefox OS occur on a *Touch Input Thread* whereas they are processed by APZ on the *APZ Controller Thread*.
+We use [Google Android's touch resampling](http://www.masonchang.com/blog/2014/8/25/androids-touch-resampling-algorithm) algorithm to resample touch events.
+
+Currently, we have a strict ordering between Composites and touch events.
+When a touch event occurs on the *Touch Input Thread*, we store the touch event in a queue.
+When a vsync event occurs, the **CompositorVsyncDispatcher** notifies the **Compositor** of a vsync event, which notifies the **GeckoTouchDispatcher**.
+The **GeckoTouchDispatcher** processes the touch event first on the *APZ Controller Thread*, which is the same as the *Compositor Thread* on b2g, then the **Compositor** finishes compositing.
+We require this strict ordering because if a vsync notification is dispatched to both the **Compositor** and **GeckoTouchDispatcher** at the same time, a race condition occurs between processing the touch event and therefore position versus compositing.
+In practice, this creates very janky scrolling.
+As of this writing, we have not analyzed input events on desktop platforms.
+
+One slight quirk is that input events can start a composite, for example during a scroll and after the **Compositor** is no longer listening to vsync events.
+In these cases, we notify the **Compositor** to observe vsync so that it dispatches touch events.
+If touch events were not dispatched, and since the **Compositor** is not listening to vsync events, the touch events would never be dispatched.
+The **GeckoTouchDispatcher** handles this case by always forcing the **Compositor** to listen to vsync events while touch events are occurring.
+
+###Widget, Compositor, CompositorVsyncDispatcher, GeckoTouchDispatcher Shutdown Procedure
+When the [nsBaseWidget shuts down](http://hg.mozilla.org/mozilla-central/file/0df249a0e4d3/widget/nsBaseWidget.cpp#l182) - It calls nsBaseWidget::DestroyCompositor on the *Gecko Main Thread*.
+During nsBaseWidget::DestroyCompositor, it first destroys the CompositorChild.
+CompositorChild sends a sync IPC call to CompositorParent::RecvStop, which calls [CompositorParent::Destroy](http://hg.mozilla.org/mozilla-central/file/ab0490972e1e/gfx/layers/ipc/CompositorParent.cpp#l509).
+During this time, the *main thread* is blocked on the parent process.
+CompositorParent::RecvStop runs on the *Compositor thread* and cleans up some resources, including setting the **CompositorVsyncObserver** to nullptr.
+CompositorParent::RecvStop also explicitly keeps the CompositorParent alive and posts another task to run CompositorParent::DeferredDestroy on the Compositor loop so that all ipdl code can finish executing.
+The **CompositorVsyncObserver** also unobserves from vsync and cancels any pending composite tasks.
+Once CompositorParent::RecvStop finishes, the *main thread* in the parent process continues shutting down the nsBaseWidget.
+
+At the same time, the *Compositor thread* is executing tasks until CompositorParent::DeferredDestroy runs, which flushes the compositor message loop.
+Now we have two tasks as both the nsBaseWidget releases a reference to the Compositor on the *main thread* during destruction and the CompositorParent::DeferredDestroy releases a reference to the CompositorParent on the *Compositor Thread*.
+Finally, the CompositorParent itself is destroyed on the *main thread* once both references are gone due to explicit [main thread destruction](http://hg.mozilla.org/mozilla-central/file/50b95032152c/gfx/layers/ipc/CompositorParent.h#l148).
+
+With the **CompositorVsyncObserver**, any accesses to the widget after nsBaseWidget::DestroyCompositor executes are invalid.
+Any accesses to the compositor between the time the nsBaseWidget::DestroyCompositor runs and the CompositorVsyncObserver's destructor runs aren't safe yet a hardware vsync event could occur between these times.
+Since any tasks posted on the Compositor loop after CompositorParent::DeferredDestroy is posted are invalid, we make sure that no vsync tasks can be posted once CompositorParent::RecvStop executes and DeferredDestroy is posted on the Compositor thread.
+When the sync call to CompositorParent::RecvStop executes, we explicitly set the CompositorVsyncObserver to null to prevent vsync notifications from occurring.
+If vsync notifications were allowed to occur, since the **CompositorVsyncObserver**'s vsync notification executes on the *hardware vsync thread*, it would post a task to the Compositor loop and may execute after CompositorParent::DeferredDestroy.
+Thus, we explicitly shut down vsync events in the **CompositorVsyncDispatcher** and **CompositorVsyncObserver** during nsBaseWidget::Shutdown to prevent any vsync tasks from executing after CompositorParent::DeferredDestroy.
+
+The **CompositorVsyncDispatcher** may be destroyed on either the *main thread* or *Compositor Thread*, since both the nsBaseWidget and **CompositorVsyncObserver** race to destroy on different threads.
+nsBaseWidget is destroyed on the *main thread* and releases a reference to the **CompositorVsyncDispatcher** during destruction.
+The **CompositorVsyncObserver** has a race to be destroyed either during CompositorParent shutdown or from the **GeckoTouchDispatcher** which is destroyed on the main thread with [ClearOnShutdown](http://hg.mozilla.org/mozilla-central/file/21567e9a6e40/xpcom/base/ClearOnShutdown.h#l15).
+Whichever object, the CompositorParent or the **GeckoTouchDispatcher** is destroyed last will hold the last reference to the **CompositorVsyncDispatcher**, which destroys the object.
+
+#Refresh Driver
+The Refresh Driver is ticked from a [single active timer](http://hg.mozilla.org/mozilla-central/file/ab0490972e1e/layout/base/nsRefreshDriver.cpp#l11).
+The assumption is that there are multiple **RefreshDrivers** connected to a single **RefreshTimer**.
+There are two **RefreshTimers**: an active and an inactive **RefreshTimer**.
+Each Tab has its own **RefreshDriver**, which connects to one of the global **RefreshTimers**.
+The **RefreshTimers** execute on the *Main Thread* and tick their connected **RefreshDrivers**.
+We do not want to break this model of multiple **RefreshDrivers** per a set of two global **RefreshTimers**.
+Each **RefreshDriver** switches between the active and inactive **RefreshTimer**.
+
+Instead, we create a new **RefreshTimer**, the **VsyncRefreshTimer** which ticks based on vsync messages.
+We replace the current active timer with a **VsyncRefreshTimer**.
+All tabs will then tick based on this new active timer.
+Since the **RefreshTimer** has a lifetime of the process, we only need to create a single **RefreshTimerVsyncDispatcher** per **Display** when Firefox starts.
+Even if we do not have any content processes, the Chrome process will still need a **VsyncRefreshTimer**, thus we can associate the **RefreshTimerVsyncDispatcher** with each **Display**.
+
+When Firefox starts, we initially create a new **VsyncRefreshTimer** in the Chrome process.
+The **VsyncRefreshTimer** will listen to vsync notifications from **RefreshTimerVsyncDispatcher** on the global **Display**.
+When nsRefreshDriver::Shutdown executes, it will delete the **VsyncRefreshTimer**.
+This creates a problem as all the **RefreshTimers** are currently manually memory managed whereas **VsyncObservers** are ref counted.
+To work around this problem, we create a new **RefreshDriverVsyncObserver** as an inner class to **VsyncRefreshTimer**, which actually receives vsync notifications. It then ticks the **RefreshDrivers** inside **VsyncRefreshTimer**.
+
+With Content processes, the start up process is more complicated.
+We send vsync IPC messages via the use of the PBackground thread on the parent process, which allows us to send messages from the Parent process' without waiting on the *main thread*.
+This sends messages from the Parent::*PBackground Thread* to the Child::*Main Thread*.
+The *main thread* receiving IPC messages on the content process is acceptable because **RefreshDrivers** must execute on the *main thread*.
+However, there is some amount of time required to setup the IPC connection upon process creation and during this time, the **RefreshDrivers** must tick to set up the process.
+To get around this, we initially use software **RefreshTimers** that already exist during content process startup and swap in the **VsyncRefreshTimer** once the IPC connection is created.
+
+During nsRefreshDriver::ChooseTimer, we create an async PBackground IPC open request to create a **VsyncParent** and **VsyncChild**.
+At the same time, we create a software **RefreshTimer** and tick the **RefreshDrivers** as normal.
+Once the PBackground callback is executed and an IPC connection exists, we swap all **RefreshDrivers** currently associated with the active **RefreshTimer** and swap the **RefreshDrivers** to use the **VsyncRefreshTimer**.
+Since all interactions on the content process occur on the main thread, there are no need for locks.
+The **VsyncParent** listens to vsync events through the **VsyncRefreshTimerDispatcher** on the parent side and sends vsync IPC messages to the **VsyncChild**.
+The **VsyncChild** notifies the **VsyncRefreshTimer** on the content process.
+
+During the shutdown process of the content process, ActorDestroy is called on the **VsyncChild** and **VsyncParent** due to the normal PBackground shutdown process.
+Once ActorDestroy is called, no IPC messages should be sent across the channel.
+After ActorDestroy is called, the IPDL machinery will delete the **VsyncParent/Child** pair.
+The **VsyncParent**, due to being a **VsyncObserver**, is ref counted.
+After **VsyncParent::ActorDestroy** is called, it unregisters itself from the **RefreshTimerVsyncDispatcher**, which holds the last reference to the **VsyncParent**, and the object will be deleted.
+
+Thus the overall flow during normal execution is:
+
+1. VsyncSource::Display::RefreshTimerVsyncDispatcher receives a Vsync notification from the OS in the parent process.
+2. RefreshTimerVsyncDispatcher notifies VsyncRefreshTimer::RefreshDriverVsyncObserver that a vsync occured on the parent process on the hardware vsync thread.
+3. RefreshTimerVsyncDispatcher notifies the VsyncParent on the hardware vsync thread that a vsync occured.
+4. The VsyncRefreshTimer::RefreshDriverVsyncObserver in the parent process posts a task to the main thread that ticks the refresh drivers.
+5. VsyncParent posts a task to the PBackground thread to send a vsync IPC message to VsyncChild.
+6. VsyncChild receive a vsync notification on the content process on the main thread and ticks their respective RefreshDrivers.
+
+###Compressing Vsync Messages
+Vsync messages occur quite often and the *main thread* can be busy for long periods of time due to JavaScript.
+Consistently sending vsync messages to the refresh driver timer can flood the *main thread* with refresh driver ticks, causing even more delays.
+To avoid this problem, we compress vsync messages on both the parent and child processes.
+
+On the parent process, newer vsync messages update a vsync timestamp but do not actually queue any tasks on the *main thread*.
+Once the parent process' *main thread* executes the refresh driver tick, it uses the most updated vsync timestamp to tick the refresh driver.
+After the refresh driver has ticked, one single vsync message is queued for another refresh driver tick task.
+On the content process, the IPDL **compress** keyword automatically compresses IPC messages.
+
+### Multiple Monitors
+In order to have multiple monitor support for the **RefreshDrivers**, we have multiple active **RefreshTimers**.
+Each **RefreshTimer** is associated with a specific **Display** via an id and tick when it's respective **Display** vsync occurs.
+We have **N RefreshTimers**, where N is the number of connected displays.
+Each **RefreshTimer** still has multiple **RefreshDrivers**.
+
+When a tab or window changes monitors, the **nsIWidget** receives a display changed notification.
+Based on which display the window is on, the window switches to the correct **RefreshTimerVsyncDispatcher** and **CompositorVsyncDispatcher** on the parent process based on the display id.
+Each **TabParent** should also send a notification to their child.
+Each **TabChild**, given the display ID, switches to the correct **RefreshTimer** associated with the display ID.
+When each display vsync occurs, it sends one IPC message to notify vsync.
+The vsync message contains a display ID, to tick the appropriate **RefreshTimer** on the content process.
+There is still only one **VsyncParent/VsyncChild** pair, just each vsync notification will include a display ID, which maps to the correct **RefreshTimer**.
+
+#Object Lifetime
+1. CompositorVsyncDispatcher - Lives as long as the nsBaseWidget associated with the VsyncDispatcher
+2. CompositorVsyncObserver - Lives and dies the same time as the CompositorParent.
+3. RefreshTimerVsyncDispatcher - As long as the associated display object, which is the lifetime of Firefox.
+4. VsyncSource - Lives as long as the gfxPlatform on the chrome process, which is the lifetime of Firefox.
+5. VsyncParent/VsyncChild - Lives as long as the content process
+6. RefreshTimer - Lives as long as the process
+
+#Threads
+All **VsyncObservers** are notified on the *Hardware Vsync Thread*. It is the responsibility of the **VsyncObservers** to post tasks to their respective correct thread. For example, the **CompositorVsyncObserver** will be notified on the *Hardware Vsync Thread*, and post a task to the *Compositor Thread* to do the actual composition.
+
+1. Compositor Thread - Nothing changes
+2. Main Thread - PVsyncChild receives IPC messages on the main thread. We also enable/disable vsync on the main thread.
+3. PBackground Thread - Creates a connection from the PBackground thread on the parent process to the main thread in the content process.
+4. Hardware Vsync Thread - Every platform is different, but we always have the concept of a hardware vsync thread. Sometimes this is actually created by the host OS. On Windows, we have to create a separate platform thread that blocks on DwmFlush().
diff --git a/gfx/doc/silkArchitecture.png b/gfx/doc/silkArchitecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..938c585e403523ba840091173608b6b35a8dbe5c
GIT binary patch
literal 221047
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%0Dse$UsG5bPhCVqzDsZd@n?oxX+*`)$
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

literal 0
HcmV?d00001


From 397fec2707c508668148548958e7905097b3d36b Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 20 Apr 2015 17:49:25 -0700
Subject: [PATCH 53/80] Bug 1127336 - Label HW-decoded frames with correct
 origin. - r=vlad

---
 dom/canvas/CanvasRenderingContext2D.cpp       |   5 +-
 dom/canvas/WebGLContext.cpp                   |   4 +-
 .../fmp4/android/AndroidDecoderModule.cpp     |  12 +-
 gfx/gl/GLBlitHelper.cpp                       | 116 ++++++++----------
 gfx/gl/GLBlitHelper.h                         |  21 ++--
 gfx/gl/GLContext.cpp                          |   2 +-
 gfx/layers/GLImages.cpp                       |  14 ++-
 7 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index b4448c14eda..7812b20832b 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -4269,7 +4269,10 @@ CanvasRenderingContext2D::DrawImage(const HTMLImageOrCanvasOrVideoElement& image
       gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR);
       gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR);
     }
-    bool ok = gl->BlitHelper()->BlitImageToTexture(srcImage.get(), srcImage->GetSize(), mVideoTexture, LOCAL_GL_TEXTURE_2D, 1);
+    const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
+    bool ok = gl->BlitHelper()->BlitImageToTexture(srcImage.get(), srcImage->GetSize(),
+                                                   mVideoTexture, LOCAL_GL_TEXTURE_2D,
+                                                   destOrigin);
     if (ok) {
       NativeSurface texSurf;
       texSurf.mType = NativeSurfaceType::OPENGL_TEXTURE;
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index fc67bcbab0c..7ac48a20440 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -1837,11 +1837,13 @@ WebGLContext::TexImageFromVideoElement(const TexImageTarget texImageTarget,
                         0, format, type, nullptr);
     }
 
+    const gl::OriginPos destOrigin = mPixelStoreFlipY ? gl::OriginPos::BottomLeft
+                                                      : gl::OriginPos::TopLeft;
     bool ok = gl->BlitHelper()->BlitImageToTexture(srcImage.get(),
                                                    srcImage->GetSize(),
                                                    tex->GLName(),
                                                    texImageTarget.get(),
-                                                   mPixelStoreFlipY);
+                                                   destOrigin);
     if (ok) {
         TexInternalFormat effectiveInternalFormat =
             EffectiveInternalFormatFromInternalFormatAndType(internalFormat,
diff --git a/dom/media/fmp4/android/AndroidDecoderModule.cpp b/dom/media/fmp4/android/AndroidDecoderModule.cpp
index 594b7dfe944..3babb85f18f 100644
--- a/dom/media/fmp4/android/AndroidDecoderModule.cpp
+++ b/dom/media/fmp4/android/AndroidDecoderModule.cpp
@@ -72,10 +72,14 @@ public:
   EGLImage CopySurface(layers::Image* img) {
     mGLContext->MakeCurrent();
 
-    GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(), img->GetSize());
+    GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(),
+                                           img->GetSize());
 
-    GLBlitHelper helper(mGLContext);
-    if (!helper.BlitImageToTexture(img, img->GetSize(), tex, LOCAL_GL_TEXTURE_2D)) {
+    auto helper = mGLContext->BlitHelper();
+    const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
+    if (!helper->BlitImageToTexture(img, img->GetSize(), tex, LOCAL_GL_TEXTURE_2D,
+                                    destOrigin))
+    {
       mGLContext->fDeleteTextures(1, &tex);
       return nullptr;
     }
@@ -134,7 +138,7 @@ public:
       data.mSync = eglSync;
       data.mOwns = true;
       data.mSize = mConfig.mDisplay;
-      data.mOriginPos = gl::OriginPos::BottomLeft;
+      data.mOriginPos = gl::OriginPos::TopLeft;
 
       layers::EGLImageImage* typedImg = static_cast<layers::EGLImageImage*>(img.get());
       typedImg->SetData(data);
diff --git a/gfx/gl/GLBlitHelper.cpp b/gfx/gl/GLBlitHelper.cpp
index b3208d4eb60..5e620e6d6e2 100644
--- a/gfx/gl/GLBlitHelper.cpp
+++ b/gfx/gl/GLBlitHelper.cpp
@@ -690,7 +690,7 @@ GLBlitHelper::BindAndUploadEGLImage(EGLImage image, GLuint target)
 #ifdef MOZ_WIDGET_GONK
 
 bool
-GLBlitHelper::BlitGrallocImage(layers::GrallocImage* grallocImage, bool yflip)
+GLBlitHelper::BlitGrallocImage(layers::GrallocImage* grallocImage)
 {
     ScopedBindTextureUnit boundTU(mGL, LOCAL_GL_TEXTURE0);
     mGL->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
@@ -711,8 +711,6 @@ GLBlitHelper::BlitGrallocImage(layers::GrallocImage* grallocImage, bool yflip)
 
     BindAndUploadEGLImage(image, LOCAL_GL_TEXTURE_EXTERNAL_OES);
 
-    mGL->fUniform1f(mYFlipLoc, yflip ? (float)1.0f : (float)0.0f);
-
     mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
 
     sEGLLibrary.fDestroyImage(sEGLLibrary.Display(), image);
@@ -726,7 +724,7 @@ GLBlitHelper::BlitGrallocImage(layers::GrallocImage* grallocImage, bool yflip)
 #define ATTACH_WAIT_MS 50
 
 bool
-GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage, bool yflip)
+GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage)
 {
     AndroidSurfaceTexture* surfaceTexture = stImage->GetData()->mSurfTex;
 
@@ -746,7 +744,6 @@ GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage, bool
     surfaceTexture->GetTransformMatrix(transform);
 
     mGL->fUniformMatrix4fv(mTextureTransformLoc, 1, false, &transform._11);
-    mGL->fUniform1f(mYFlipLoc, yflip ? 1.0f : 0.0f);
     mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
 
     surfaceTexture->Detach();
@@ -756,7 +753,7 @@ GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage, bool
 }
 
 bool
-GLBlitHelper::BlitEGLImageImage(layers::EGLImageImage* image, bool yflip)
+GLBlitHelper::BlitEGLImageImage(layers::EGLImageImage* image)
 {
     EGLImage eglImage = image->GetData()->mImage;
     EGLSync eglSync = image->GetData()->mSync;
@@ -775,8 +772,6 @@ GLBlitHelper::BlitEGLImageImage(layers::EGLImageImage* image, bool yflip)
 
     BindAndUploadEGLImage(eglImage, LOCAL_GL_TEXTURE_2D);
 
-    mGL->fUniform1f(mYFlipLoc, yflip ? 1.0f : 0.0f);
-
     mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
 
     mGL->fBindTexture(LOCAL_GL_TEXTURE_EXTERNAL_OES, oldBinding);
@@ -786,7 +781,7 @@ GLBlitHelper::BlitEGLImageImage(layers::EGLImageImage* image, bool yflip)
 #endif
 
 bool
-GLBlitHelper::BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage, bool yflip)
+GLBlitHelper::BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage)
 {
     ScopedBindTextureUnit boundTU(mGL, LOCAL_GL_TEXTURE0);
     const PlanarYCbCrData* yuvData = yuvImage->GetData();
@@ -807,8 +802,6 @@ GLBlitHelper::BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage, bool yfli
     BindAndUploadYUVTexture(Channel_Cb, yuvData->mCbCrStride, yuvData->mCbCrSize.height, yuvData->mCbChannel, needsAllocation);
     BindAndUploadYUVTexture(Channel_Cr, yuvData->mCbCrStride, yuvData->mCbCrSize.height, yuvData->mCrChannel, needsAllocation);
 
-    mGL->fUniform1f(mYFlipLoc, yflip ? (float)1.0 : (float)0.0);
-
     if (needsAllocation) {
         mGL->fUniform2f(mYTexScaleLoc, (float)yuvData->mYSize.width/yuvData->mYStride, 1.0f);
         mGL->fUniform2f(mCbCrTexScaleLoc, (float)yuvData->mCbCrSize.width/yuvData->mCbCrStride, 1.0f);
@@ -826,32 +819,39 @@ bool
 GLBlitHelper::BlitImageToFramebuffer(layers::Image* srcImage,
                                      const gfx::IntSize& destSize,
                                      GLuint destFB,
-                                     bool yflip,
-                                     GLuint xoffset,
-                                     GLuint yoffset,
-                                     GLuint cropWidth,
-                                     GLuint cropHeight)
+                                     OriginPos destOrigin)
 {
     ScopedGLDrawState autoStates(mGL);
 
     BlitType type;
+    OriginPos srcOrigin;
+
     switch (srcImage->GetFormat()) {
     case ImageFormat::PLANAR_YCBCR:
         type = ConvertPlanarYCbCr;
+        srcOrigin = OriginPos::TopLeft;
         break;
-    case ImageFormat::GRALLOC_PLANAR_YCBCR:
+
 #ifdef MOZ_WIDGET_GONK
+    case ImageFormat::GRALLOC_PLANAR_YCBCR:
         type = ConvertGralloc;
+        srcOrigin = OriginPos::TopLeft;
         break;
 #endif
+
 #ifdef MOZ_WIDGET_ANDROID
     case ImageFormat::SURFACE_TEXTURE:
         type = ConvertSurfaceTexture;
+        srcOrigin = static_cast<layers::SurfaceTextureImage*>(srcImage)->GetData()
+                                                                       ->mOriginPos;
         break;
+
     case ImageFormat::EGLIMAGE:
         type = ConvertEGLImage;
+        srcOrigin = static_cast<layers::EGLImageImage*>(srcImage)->GetData()->mOriginPos;
         break;
 #endif
+
     default:
         return false;
     }
@@ -861,37 +861,34 @@ GLBlitHelper::BlitImageToFramebuffer(layers::Image* srcImage,
         return false;
     }
 
+    const bool needsYFlip = (srcOrigin != destOrigin);
+    mGL->fUniform1f(mYFlipLoc, needsYFlip ? (float)1.0 : (float)0.0);
+
     ScopedBindFramebuffer boundFB(mGL, destFB);
     mGL->fColorMask(LOCAL_GL_TRUE, LOCAL_GL_TRUE, LOCAL_GL_TRUE, LOCAL_GL_TRUE);
     mGL->fViewport(0, 0, destSize.width, destSize.height);
-    if (xoffset != 0 && yoffset != 0 && cropWidth != 0 && cropHeight != 0) {
-        mGL->fEnable(LOCAL_GL_SCISSOR_TEST);
-        mGL->fScissor(xoffset, yoffset, (GLsizei)cropWidth, (GLsizei)cropHeight);
-    }
 
+    switch (type) {
 #ifdef MOZ_WIDGET_GONK
-    if (type == ConvertGralloc) {
-        layers::GrallocImage* grallocImage = static_cast<layers::GrallocImage*>(srcImage);
-        return BlitGrallocImage(grallocImage, yflip);
-    }
-#endif
-    if (type == ConvertPlanarYCbCr) {
-        mGL->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, 1);
-        PlanarYCbCrImage* yuvImage = static_cast<PlanarYCbCrImage*>(srcImage);
-        return BlitPlanarYCbCrImage(yuvImage, yflip);
-    }
-#ifdef MOZ_WIDGET_ANDROID
-    if (type == ConvertSurfaceTexture) {
-        layers::SurfaceTextureImage* stImage = static_cast<layers::SurfaceTextureImage*>(srcImage);
-        return BlitSurfaceTextureImage(stImage, yflip);
-    }
-    if (type == ConvertEGLImage) {
-        layers::EGLImageImage* eglImage = static_cast<layers::EGLImageImage*>(srcImage);
-        return BlitEGLImageImage(eglImage, yflip);
-    }
+    case ConvertGralloc:
+        return BlitGrallocImage(static_cast<layers::GrallocImage*>(srcImage));
 #endif
 
-    return false;
+    case ConvertPlanarYCbCr:
+        mGL->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, 1);
+        return BlitPlanarYCbCrImage(static_cast<PlanarYCbCrImage*>(srcImage));
+
+#ifdef MOZ_WIDGET_ANDROID
+    case ConvertSurfaceTexture:
+        return BlitSurfaceTextureImage(static_cast<layers::SurfaceTextureImage*>(srcImage));
+
+    case ConvertEGLImage:
+        return BlitEGLImageImage(static_cast<layers::EGLImageImage*>(srcImage));
+#endif
+
+    default:
+        return false;
+    }
 }
 
 bool
@@ -899,22 +896,15 @@ GLBlitHelper::BlitImageToTexture(layers::Image* srcImage,
                                  const gfx::IntSize& destSize,
                                  GLuint destTex,
                                  GLenum destTarget,
-                                 bool yflip,
-                                 GLuint xoffset,
-                                 GLuint yoffset,
-                                 GLuint cropWidth,
-                                 GLuint cropHeight)
+                                 OriginPos destOrigin)
 {
-    ScopedGLDrawState autoStates(mGL);
+    ScopedFramebufferForTexture autoFBForTex(mGL, destTex, destTarget);
 
-    if (!mFBO)
-        mGL->fGenFramebuffers(1, &mFBO);
+    if (!autoFBForTex.IsComplete()) {
+        MOZ_CRASH("ScopedFramebufferForTexture failed.");
+    }
 
-    ScopedBindFramebuffer boundFB(mGL, mFBO);
-    mGL->fFramebufferTexture2D(LOCAL_GL_FRAMEBUFFER, LOCAL_GL_COLOR_ATTACHMENT0,
-                               destTarget, destTex, 0);
-    return BlitImageToFramebuffer(srcImage, destSize, mFBO, yflip, xoffset, yoffset,
-                                  cropWidth, cropHeight);
+    return BlitImageToFramebuffer(srcImage, destSize, autoFBForTex.FB(), destOrigin);
 }
 
 void
@@ -929,7 +919,7 @@ GLBlitHelper::BlitTextureToFramebuffer(GLuint srcTex, GLuint destFB,
 
     if (mGL->IsSupported(GLFeature::framebuffer_blit)) {
         ScopedFramebufferForTexture srcWrapper(mGL, srcTex, srcTarget);
-        MOZ_ASSERT(srcWrapper.IsComplete());
+        MOZ_DIAGNOSTIC_ASSERT(srcWrapper.IsComplete());
 
         BlitFramebufferToFramebuffer(srcWrapper.FB(), destFB,
                                      srcSize, destSize,
@@ -938,8 +928,7 @@ GLBlitHelper::BlitTextureToFramebuffer(GLuint srcTex, GLuint destFB,
     }
 
     BlitType type;
-    switch (srcTarget)
-    {
+    switch (srcTarget) {
     case LOCAL_GL_TEXTURE_2D:
         type = BlitTex2D;
         break;
@@ -947,8 +936,7 @@ GLBlitHelper::BlitTextureToFramebuffer(GLuint srcTex, GLuint destFB,
         type = BlitTexRect;
         break;
     default:
-        printf_stderr("Fatal Error: Failed to prepare to blit texture->framebuffer.\n");
-        MOZ_CRASH();
+        MOZ_CRASH("Fatal Error: Bad `srcTarget`.");
         break;
     }
 
@@ -963,10 +951,14 @@ GLBlitHelper::BlitTextureToFramebuffer(GLuint srcTex, GLuint destFB,
     bool good = UseTexQuadProgram(type, srcSize);
     if (!good) {
         // We're up against the wall, so bail.
-        // This should really be MOZ_CRASH(why) or MOZ_RUNTIME_ASSERT(good).
-        printf_stderr("Fatal Error: Failed to prepare to blit texture->framebuffer.\n");
-        MOZ_CRASH();
+        MOZ_DIAGNOSTIC_ASSERT(false,
+                              "Error: Failed to prepare to blit texture->framebuffer.\n");
+        mGL->fScissor(0, 0, destSize.width, destSize.height);
+        mGL->fColorMask(1, 1, 1, 1);
+        mGL->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
+        return;
     }
+
     mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
 }
 
diff --git a/gfx/gl/GLBlitHelper.h b/gfx/gl/GLBlitHelper.h
index 7aad62e2fa9..06f4a964e03 100644
--- a/gfx/gl/GLBlitHelper.h
+++ b/gfx/gl/GLBlitHelper.h
@@ -145,18 +145,20 @@ class GLBlitHelper final
     void BindAndUploadEGLImage(EGLImage image, GLuint target);
 
 #ifdef MOZ_WIDGET_GONK
-    bool BlitGrallocImage(layers::GrallocImage* grallocImage, bool yflip);
+    bool BlitGrallocImage(layers::GrallocImage* grallocImage);
 #endif
-    bool BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage, bool yflip);
+    bool BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage);
 #ifdef MOZ_WIDGET_ANDROID
     // Blit onto the current FB.
-    bool BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage, bool yflip);
-    bool BlitEGLImageImage(layers::EGLImageImage* eglImage, bool yflip);
+    bool BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage);
+    bool BlitEGLImageImage(layers::EGLImageImage* eglImage);
 #endif
 
-public:
-
     explicit GLBlitHelper(GLContext* gl);
+
+    friend class GLContext;
+
+public:
     ~GLBlitHelper();
 
     // If you don't have |srcFormats| for the 2nd definition,
@@ -187,12 +189,9 @@ public:
                               GLenum srcTarget = LOCAL_GL_TEXTURE_2D,
                               GLenum destTarget = LOCAL_GL_TEXTURE_2D);
     bool BlitImageToFramebuffer(layers::Image* srcImage, const gfx::IntSize& destSize,
-                                GLuint destFB, bool yflip = false, GLuint xoffset = 0,
-                                GLuint yoffset = 0, GLuint width = 0, GLuint height = 0);
+                                GLuint destFB, OriginPos destOrigin);
     bool BlitImageToTexture(layers::Image* srcImage, const gfx::IntSize& destSize,
-                            GLuint destTex, GLenum destTarget, bool yflip = false,
-                            GLuint xoffset = 0, GLuint yoffset = 0, GLuint width = 0,
-                            GLuint height = 0);
+                            GLuint destTex, GLenum destTarget, OriginPos destOrigin);
 };
 
 } // namespace gl
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 61d0caf0f39..86610090434 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -2401,7 +2401,7 @@ GLBlitHelper*
 GLContext::BlitHelper()
 {
     if (!mBlitHelper) {
-        mBlitHelper = MakeUnique<GLBlitHelper>(this);
+        mBlitHelper.reset(new GLBlitHelper(this));
     }
 
     return mBlitHelper.get();
diff --git a/gfx/layers/GLImages.cpp b/gfx/layers/GLImages.cpp
index 7525eefd40f..f11c7069c91 100644
--- a/gfx/layers/GLImages.cpp
+++ b/gfx/layers/GLImages.cpp
@@ -57,11 +57,17 @@ GLImage::GetAsSourceSurface()
                                 LOCAL_GL_UNSIGNED_BYTE,
                                 nullptr);
 
-  ScopedFramebufferForTexture fb(sSnapshotContext, scopedTex.Texture());
+  ScopedFramebufferForTexture autoFBForTex(sSnapshotContext, scopedTex.Texture());
+  if (!autoFBForTex.IsComplete()) {
+      MOZ_CRASH("ScopedFramebufferForTexture failed.");
+  }
 
-  GLBlitHelper helper(sSnapshotContext);
+  const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
 
-  if (!helper.BlitImageToFramebuffer(this, size, fb.FB(), true)) {
+  if (!sSnapshotContext->BlitHelper()->BlitImageToFramebuffer(this, size,
+                                                              autoFBForTex.FB(),
+                                                              destOrigin))
+  {
     return nullptr;
   }
 
@@ -71,7 +77,7 @@ GLImage::GetAsSourceSurface()
     return nullptr;
   }
 
-  ScopedBindFramebuffer bind(sSnapshotContext, fb.FB());
+  ScopedBindFramebuffer bind(sSnapshotContext, autoFBForTex.FB());
   ReadPixelsIntoDataSurface(sSnapshotContext, source);
   return source.forget();
 }

From ba6541b56266207086458031ce1d5ec5f03b95a7 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 20 Apr 2015 18:02:17 -0700
Subject: [PATCH 54/80] Bug 1155684 - Part 0: disable reading list sync in
 confvars.sh.

---
 mobile/android/confvars.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 30a599def18..b07aeb20de2 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -55,9 +55,6 @@ MOZ_PAY=1
 # Enable UI for healthreporter
 MOZ_SERVICES_HEALTHREPORT=1
 
-# Enable reading list service integration.
-MOZ_ANDROID_READING_LIST_SERVICE=1
-
 # Enable runtime locale switching.
 MOZ_LOCALE_SWITCHER=1
 

From f40dc16f63ee0a73e156af2d0348a2cc1a04e751 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 20 Apr 2015 18:02:17 -0700
Subject: [PATCH 55/80] Bug 1155684 - Part 1-3: remove reading list sync
 integration. r=nalexander

---
 .../activities/FxAccountStatusFragment.java   | 44 ------------
 .../fxa/authenticator/AndroidFxAccount.java   | 15 ----
 .../receivers/FxAccountUpgradeReceiver.java   | 68 -------------------
 .../xml/fxaccount_status_prefscreen.xml       |  5 --
 .../FxAccountAndroidManifest_services.xml.in  | 17 +----
 5 files changed, 1 insertion(+), 148 deletions(-)

diff --git a/mobile/android/base/fxa/activities/FxAccountStatusFragment.java b/mobile/android/base/fxa/activities/FxAccountStatusFragment.java
index 5eab463fde8..3de2112bb40 100644
--- a/mobile/android/base/fxa/activities/FxAccountStatusFragment.java
+++ b/mobile/android/base/fxa/activities/FxAccountStatusFragment.java
@@ -13,11 +13,9 @@ import java.util.Set;
 
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.background.ReadingListConstants;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.background.preferences.PreferenceFragment;
-import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
@@ -31,7 +29,6 @@ import org.mozilla.gecko.sync.SyncConfiguration;
 import org.mozilla.gecko.util.HardwareUtils;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -178,9 +175,6 @@ public class FxAccountStatusFragment
     historyPreference = (CheckBoxPreference) ensureFindPreference("history");
     tabsPreference = (CheckBoxPreference) ensureFindPreference("tabs");
     passwordsPreference = (CheckBoxPreference) ensureFindPreference("passwords");
-    // The Reading List toggle appears with the other Firefox Sync toggles but
-    // controls a separate Android authority.
-    readingListPreference = (CheckBoxPreference) ensureFindPreference("reading_list");
 
     if (!FxAccountUtils.LOG_PERSONAL_INFORMATION) {
       removeDebugButtons();
@@ -200,7 +194,6 @@ public class FxAccountStatusFragment
     historyPreference.setOnPreferenceClickListener(this);
     tabsPreference.setOnPreferenceClickListener(this);
     passwordsPreference.setOnPreferenceClickListener(this);
-    readingListPreference.setOnPreferenceClickListener(this);
 
     deviceNamePreference = (EditTextPreference) ensureFindPreference("device_name");
     deviceNamePreference.setOnPreferenceChangeListener(this);
@@ -288,14 +281,6 @@ public class FxAccountStatusFragment
       return true;
     }
 
-    if (preference == readingListPreference) {
-      final boolean syncAutomatically = readingListPreference.isChecked();
-      ContentResolver.setIsSyncable(fxAccount.getAndroidAccount(), BrowserContract.READING_LIST_AUTHORITY, 1);
-      ContentResolver.setSyncAutomatically(fxAccount.getAndroidAccount(), BrowserContract.READING_LIST_AUTHORITY, syncAutomatically);
-      FxAccountUtils.pii(LOG_TAG, (syncAutomatically ? "En" : "Dis") + "abling Reading List sync automatically.");
-      return true;
-    }
-
     if (preference == morePreference) {
       getActivity().openOptionsMenu();
       return true;
@@ -330,11 +315,6 @@ public class FxAccountStatusFragment
     // Since we can't sync, we can't update our remote client record.
     deviceNamePreference.setEnabled(enabled);
     syncNowPreference.setEnabled(enabled);
-
-    // The checkboxes are a set of global settings: they reflect the account
-    // state and not the underlying Sync state. In the future, each checkbox
-    // will reflect its own piece of the account state.
-    readingListPreference.setEnabled(enabled);
   }
 
   /**
@@ -556,7 +536,6 @@ public class FxAccountStatusFragment
     } finally {
       // No matter our state, we should update the checkboxes.
       updateSelectedEngines();
-      updateReadingList();
     }
 
     final String clientName = clientsDataDelegate.getClientName();
@@ -668,19 +647,6 @@ public class FxAccountStatusFragment
     }
   }
 
-  /**
-   * Query the current reading list automatic sync state, and update the UI
-   * accordingly.
-   */
-  protected void updateReadingList() {
-    if (AppConstants.MOZ_ANDROID_READING_LIST_SERVICE) {
-      final boolean syncAutomatically = ContentResolver.getSyncAutomatically(fxAccount.getAndroidAccount(), BrowserContract.READING_LIST_AUTHORITY);
-      readingListPreference.setChecked(syncAutomatically);
-    } else {
-      syncCategory.removePreference(readingListPreference);
-    }
-  }
-
   /**
    * Persist engine selections to local shared preferences, and request a sync
    * to persist selections to remote storage.
@@ -790,16 +756,6 @@ public class FxAccountStatusFragment
         Logger.info(LOG_TAG, "Force syncing.");
         fxAccount.requestSync(FirefoxAccounts.FORCE);
         // No sense refreshing, since the sync will complete in the future.
-      } else if ("debug_forget_reading_list_oauth_token".equals(key)) {
-        final Account account = fxAccount.getAndroidAccount();
-        final AccountManager accountManager = AccountManager.get(getActivity());
-        final String authToken = accountManager.peekAuthToken(account, ReadingListConstants.AUTH_TOKEN_TYPE);
-        if (authToken != null) {
-          Logger.info(LOG_TAG, "Forgetting reading list oauth token: " + authToken);
-          accountManager.invalidateAuthToken(account.type, authToken);
-        } else {
-          Logger.warn(LOG_TAG, "No reading list oauth token to forget!");
-        }
       } else if ("debug_forget_certificate".equals(key)) {
         State state = fxAccount.getState();
         try {
diff --git a/mobile/android/base/fxa/authenticator/AndroidFxAccount.java b/mobile/android/base/fxa/authenticator/AndroidFxAccount.java
index d4e60e40000..a3babd6c24d 100644
--- a/mobile/android/base/fxa/authenticator/AndroidFxAccount.java
+++ b/mobile/android/base/fxa/authenticator/AndroidFxAccount.java
@@ -63,13 +63,6 @@ public class AndroidFxAccount {
   public static final String ACCOUNT_KEY_TOKEN_SERVER = "tokenServerURI";       // Sync-specific.
   public static final String ACCOUNT_KEY_DESCRIPTOR = "descriptor";
 
-  // The set of authorities to sync automatically changes over time. The first
-  // new authority is the Reading List. This tracks if we've enabled syncing,
-  // and opted in (or out) of syncing automatically, for the new Reading List
-  // authority. This happens either on when the account is created or when
-  // upgrading.
-  public static final String ACCOUNT_KEY_READING_LIST_AUTHORITY_INITIALIZED = "readingListAuthorityInitialized";
-
   public static final int CURRENT_BUNDLE_VERSION = 2;
   public static final String BUNDLE_KEY_BUNDLE_VERSION = "version";
   public static final String BUNDLE_KEY_STATE_LABEL = "stateLabel";
@@ -93,10 +86,6 @@ public class AndroidFxAccount {
     final HashMap<String, Boolean> m = new HashMap<String, Boolean>();
     // By default, Firefox Sync is enabled.
     m.put(BrowserContract.AUTHORITY, true);
-    if (AppConstants.MOZ_ANDROID_READING_LIST_SERVICE) {
-      // Sync the Reading List.
-      m.put(BrowserContract.READING_LIST_AUTHORITY, true);
-    }
     DEFAULT_AUTHORITIES_TO_SYNC_AUTOMATICALLY_MAP = Collections.unmodifiableMap(m);
   }
 
@@ -430,10 +419,6 @@ public class AndroidFxAccount {
     userdata.putString(ACCOUNT_KEY_IDP_SERVER, idpServerURI);
     userdata.putString(ACCOUNT_KEY_TOKEN_SERVER, tokenServerURI);
     userdata.putString(ACCOUNT_KEY_PROFILE, profile);
-    if (DEFAULT_AUTHORITIES_TO_SYNC_AUTOMATICALLY_MAP.containsKey(BrowserContract.READING_LIST_AUTHORITY)) {
-      // Have we initialized the Reading List authority?
-      userdata.putString(ACCOUNT_KEY_READING_LIST_AUTHORITY_INITIALIZED, "1");
-    }
 
     if (bundle == null) {
       bundle = new ExtendedJSONObject();
diff --git a/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java b/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java
index c04236a0183..ad81e048863 100644
--- a/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java
+++ b/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java
@@ -11,7 +11,6 @@ import java.util.concurrent.Executors;
 
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountUtils;
-import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
@@ -20,9 +19,7 @@ import org.mozilla.gecko.fxa.login.State.StateLabel;
 import org.mozilla.gecko.sync.Utils;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 
@@ -48,7 +45,6 @@ public class FxAccountUpgradeReceiver extends BroadcastReceiver {
     // Recovering accounts that are in the Doghouse should happen *after* we
     // unpickle any accounts saved to disk.
     runnables.add(new AdvanceFromDoghouseRunnable(context));
-    runnables.add(new MaybeInitializeReadingListAuthority(context));
     return runnables;
   }
 
@@ -134,68 +130,4 @@ public class FxAccountUpgradeReceiver extends BroadcastReceiver {
       }
     }
   }
-
-  /**
-   * A Runnable that initializes the Reading List authority (specifically, set
-   * the sync automatically flag) for existing Firefox Accounts that have not
-   * yet seen the authority. That is, if a new authority (Reading List) is added
-   * to the set of defaults, existing Firefox Accounts won't be syncing it
-   * automatically. This tries to set the sync automatically flag for such
-   * existing accounts.
-   *
-   * Public for testing only.
-   */
-  public static class MaybeInitializeReadingListAuthority implements Runnable {
-    protected final Context context;
-
-    public MaybeInitializeReadingListAuthority(Context context) {
-      this.context = context;
-    }
-
-    @Override
-    public void run() {
-      final String authority = BrowserContract.READING_LIST_AUTHORITY;
-      Boolean enabledByDefault = AndroidFxAccount.DEFAULT_AUTHORITIES_TO_SYNC_AUTOMATICALLY_MAP.get(authority);
-      if (enabledByDefault == null || !enabledByDefault.booleanValue()) {
-        Logger.info(LOG_TAG, "Reading List authority is not enabled by default; not trying to initialize Reading List authority for any accounts.");
-      }
-
-      final AccountManager accountManager = AccountManager.get(context);
-      final Account[] accounts = FirefoxAccounts.getFirefoxAccounts(context);
-      Logger.info(LOG_TAG, "Trying to initialize Reading List authority for " + accounts.length + " existing Firefox Accounts (if necessary).");
-
-      for (Account account : accounts) {
-        try {
-          final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
-          // For great debugging.
-          if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
-            fxAccount.dump();
-          }
-
-          final boolean readingListAuthorityInitialized =
-              "1".equals(accountManager.getUserData(account, AndroidFxAccount.ACCOUNT_KEY_READING_LIST_AUTHORITY_INITIALIZED));
-          if (readingListAuthorityInitialized) {
-            Logger.debug(LOG_TAG, "Reading List authority has already been initialized.");
-            continue;
-          }
-
-          // The Reading List authority has not been seen. This happens when an
-          // authority is added after the Firefox Account has been added (and
-          // the package last upgraded). If Firefox Sync is not syncing
-          // automatically, Reading List should not start syncing
-          // automatically: the user has elected not to upload data to Mozilla
-          // servers; we shouldn't opt them in.
-          final boolean syncAutomatically = ContentResolver.getSyncAutomatically(account, BrowserContract.AUTHORITY);
-            Logger.debug(LOG_TAG, "Setting Reading List authority " +
-                (syncAutomatically ? " to " : " to not ") + "sync automatically.");
-            ContentResolver.setSyncAutomatically(account, BrowserContract.READING_LIST_AUTHORITY, syncAutomatically);
-          // Update the account record.
-          accountManager.setUserData(account, AndroidFxAccount.ACCOUNT_KEY_READING_LIST_AUTHORITY_INITIALIZED, "1");
-        } catch (Exception e) {
-          Logger.warn(LOG_TAG, "Got exception trying to set authoritities to sync automatically for account named like " +
-              Utils.obfuscateEmail(account.name) + "; ignoring.", e);
-        }
-      }
-    }
-  }
 }
diff --git a/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml b/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
index 7386d52f307..491047beb11 100644
--- a/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
+++ b/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
@@ -79,10 +79,6 @@
             android:key="passwords"
             android:persistent="false"
             android:title="@string/fxaccount_status_passwords" />
-        <CheckBoxPreference
-            android:key="reading_list"
-            android:persistent="false"
-            android:title="@string/fxaccount_status_reading_list" />
 
         <EditTextPreference
             android:singleLine="true"
@@ -127,7 +123,6 @@
         <Preference android:key="debug_dump" />
         <Preference android:key="debug_force_sync" />
         <Preference android:key="debug_invalidate_certificate" />
-        <Preference android:key="debug_forget_reading_list_oauth_token" />
         <Preference android:key="debug_forget_certificate" />
         <Preference android:key="debug_require_password" />
         <Preference android:key="debug_require_upgrade" />
diff --git a/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in b/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
index 04c1f16aa54..3cae0d8078b 100644
--- a/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
+++ b/mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in
@@ -26,19 +26,4 @@
             <meta-data
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/fxaccount_syncadapter" />
-        </service>
-
-        <!-- Reading List. -->
-#ifdef MOZ_ANDROID_READING_LIST_SERVICE
-        <service
-            android:exported="false"
-            android:name="org.mozilla.gecko.reading.ReadingListSyncService" >
-            <intent-filter >
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/readinglist_syncadapter" />
-        </service>
-#endif
+        </service>
\ No newline at end of file

From d4dc1dd59569e0a328023a8cb239049204c8b9d6 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:09 +0900
Subject: [PATCH 56/80] Bug 1154615 part 1 - Rename AnimationPlayer to
 Animation in WebIDL; r=smaug

This patch is a fairly minimal rename of the AnimationPlayer interface. It
leaves a bunch of local variables and helper classes still using the word
"player". These will be addressed in subsequent patches that don't require DOM
peer review.
---
 .../{AnimationPlayer.cpp => Animation.cpp}    | 102 +++++++++---------
 .../{AnimationPlayer.h => Animation.h}        |  23 ++--
 dom/animation/KeyframeEffect.cpp              |   4 +-
 dom/animation/KeyframeEffect.h                |   4 +-
 dom/animation/PendingPlayerTracker.cpp        |  14 +--
 dom/animation/PendingPlayerTracker.h          |  22 ++--
 dom/animation/moz.build                       |   4 +-
 dom/base/Element.cpp                          |   6 +-
 dom/base/Element.h                            |   4 +-
 dom/base/nsDOMMutationObserver.cpp            |  10 +-
 dom/base/nsDOMMutationObserver.h              |  16 +--
 dom/base/nsIAnimationObserver.h               |  20 ++--
 dom/base/nsNodeUtils.cpp                      |  10 +-
 dom/base/nsNodeUtils.h                        |   8 +-
 .../mochitest/general/test_interfaces.html    |   4 +-
 dom/webidl/Animatable.webidl                  |   2 +-
 ...nimationPlayer.webidl => Animation.webidl} |  12 +--
 dom/webidl/AnimationTimeline.webidl           |   4 +-
 dom/webidl/MutationObserver.webidl            |   6 +-
 dom/webidl/moz.build                          |   2 +-
 gfx/layers/Layers.cpp                         |   2 +-
 gfx/layers/apz/src/AsyncPanZoomController.cpp |   2 +-
 gfx/layers/apz/src/Axis.cpp                   |   2 +-
 gfx/layers/apz/util/APZCCallbackHelper.cpp    |   1 +
 .../composite/AsyncCompositionManager.cpp     |   1 -
 layout/base/nsDisplayList.cpp                 |   4 +-
 layout/base/nsLayoutUtils.cpp                 |   2 +-
 layout/style/AnimationCommon.cpp              |   8 +-
 layout/style/AnimationCommon.h                |   5 +-
 layout/style/nsAnimationManager.cpp           |  20 ++--
 layout/style/nsAnimationManager.h             |   8 +-
 layout/style/nsTransitionManager.cpp          |  11 +-
 layout/style/nsTransitionManager.h            |   8 +-
 33 files changed, 175 insertions(+), 176 deletions(-)
 rename dom/animation/{AnimationPlayer.cpp => Animation.cpp} (90%)
 rename dom/animation/{AnimationPlayer.h => Animation.h} (96%)
 rename dom/webidl/{AnimationPlayer.webidl => Animation.webidl} (80%)

diff --git a/dom/animation/AnimationPlayer.cpp b/dom/animation/Animation.cpp
similarity index 90%
rename from dom/animation/AnimationPlayer.cpp
rename to dom/animation/Animation.cpp
index 5e3037247d9..35958a5b490 100644
--- a/dom/animation/AnimationPlayer.cpp
+++ b/dom/animation/Animation.cpp
@@ -3,9 +3,9 @@
  * 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 "AnimationPlayer.h"
+#include "Animation.h"
 #include "AnimationUtils.h"
-#include "mozilla/dom/AnimationPlayerBinding.h"
+#include "mozilla/dom/AnimationBinding.h"
 #include "mozilla/AutoRestore.h"
 #include "AnimationCommon.h" // For AnimationPlayerCollection,
                              // CommonAnimationManager
@@ -17,23 +17,23 @@
 namespace mozilla {
 namespace dom {
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AnimationPlayer, mTimeline,
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Animation, mTimeline,
                                       mEffect, mReady, mFinished)
-NS_IMPL_CYCLE_COLLECTING_ADDREF(AnimationPlayer)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(AnimationPlayer)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AnimationPlayer)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(Animation)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(Animation)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Animation)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 JSObject*
-AnimationPlayer::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+Animation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 {
-  return dom::AnimationPlayerBinding::Wrap(aCx, this, aGivenProto);
+  return dom::AnimationBinding::Wrap(aCx, this, aGivenProto);
 }
 
 void
-AnimationPlayer::SetStartTime(const Nullable<TimeDuration>& aNewStartTime)
+Animation::SetStartTime(const Nullable<TimeDuration>& aNewStartTime)
 {
 #if 1
   // Bug 1096776: once we support inactive/missing timelines we'll want to take
@@ -74,7 +74,7 @@ AnimationPlayer::SetStartTime(const Nullable<TimeDuration>& aNewStartTime)
 }
 
 Nullable<TimeDuration>
-AnimationPlayer::GetCurrentTime() const
+Animation::GetCurrentTime() const
 {
   Nullable<TimeDuration> result;
   if (!mHoldTime.IsNull()) {
@@ -94,7 +94,7 @@ AnimationPlayer::GetCurrentTime() const
 
 // Implements http://w3c.github.io/web-animations/#silently-set-the-current-time
 void
-AnimationPlayer::SilentlySetCurrentTime(const TimeDuration& aSeekTime)
+Animation::SilentlySetCurrentTime(const TimeDuration& aSeekTime)
 {
   if (!mHoldTime.IsNull() ||
       !mTimeline ||
@@ -115,7 +115,7 @@ AnimationPlayer::SilentlySetCurrentTime(const TimeDuration& aSeekTime)
 
 // Implements http://w3c.github.io/web-animations/#set-the-current-time
 void
-AnimationPlayer::SetCurrentTime(const TimeDuration& aSeekTime)
+Animation::SetCurrentTime(const TimeDuration& aSeekTime)
 {
   SilentlySetCurrentTime(aSeekTime);
 
@@ -132,7 +132,7 @@ AnimationPlayer::SetCurrentTime(const TimeDuration& aSeekTime)
 }
 
 void
-AnimationPlayer::SetPlaybackRate(double aPlaybackRate)
+Animation::SetPlaybackRate(double aPlaybackRate)
 {
   Nullable<TimeDuration> previousTime = GetCurrentTime();
   mPlaybackRate = aPlaybackRate;
@@ -144,7 +144,7 @@ AnimationPlayer::SetPlaybackRate(double aPlaybackRate)
 }
 
 void
-AnimationPlayer::SilentlySetPlaybackRate(double aPlaybackRate)
+Animation::SilentlySetPlaybackRate(double aPlaybackRate)
 {
   Nullable<TimeDuration> previousTime = GetCurrentTime();
   mPlaybackRate = aPlaybackRate;
@@ -156,7 +156,7 @@ AnimationPlayer::SilentlySetPlaybackRate(double aPlaybackRate)
 }
 
 AnimationPlayState
-AnimationPlayer::PlayState() const
+Animation::PlayState() const
 {
   if (mPendingState != PendingState::NotPending) {
     return AnimationPlayState::Pending;
@@ -190,7 +190,7 @@ CreatePromise(DocumentTimeline* aTimeline, ErrorResult& aRv)
 }
 
 Promise*
-AnimationPlayer::GetReady(ErrorResult& aRv)
+Animation::GetReady(ErrorResult& aRv)
 {
   if (!mReady) {
     mReady = CreatePromise(mTimeline, aRv); // Lazily create on demand
@@ -204,7 +204,7 @@ AnimationPlayer::GetReady(ErrorResult& aRv)
 }
 
 Promise*
-AnimationPlayer::GetFinished(ErrorResult& aRv)
+Animation::GetFinished(ErrorResult& aRv)
 {
   if (!mFinished) {
     mFinished = CreatePromise(mTimeline, aRv); // Lazily create on demand
@@ -218,14 +218,14 @@ AnimationPlayer::GetFinished(ErrorResult& aRv)
 }
 
 void
-AnimationPlayer::Play(LimitBehavior aLimitBehavior)
+Animation::Play(LimitBehavior aLimitBehavior)
 {
   DoPlay(aLimitBehavior);
   PostUpdate();
 }
 
 void
-AnimationPlayer::Pause()
+Animation::Pause()
 {
   // TODO: The DoPause() call should not be synchronous (bug 1109390). See
   // http://w3c.github.io/web-animations/#pausing-an-animation-section
@@ -234,25 +234,25 @@ AnimationPlayer::Pause()
 }
 
 Nullable<double>
-AnimationPlayer::GetStartTimeAsDouble() const
+Animation::GetStartTimeAsDouble() const
 {
   return AnimationUtils::TimeDurationToDouble(mStartTime);
 }
 
 void
-AnimationPlayer::SetStartTimeAsDouble(const Nullable<double>& aStartTime)
+Animation::SetStartTimeAsDouble(const Nullable<double>& aStartTime)
 {
   return SetStartTime(AnimationUtils::DoubleToTimeDuration(aStartTime));
 }
-  
+
 Nullable<double>
-AnimationPlayer::GetCurrentTimeAsDouble() const
+Animation::GetCurrentTimeAsDouble() const
 {
   return AnimationUtils::TimeDurationToDouble(GetCurrentTime());
 }
 
 void
-AnimationPlayer::SetCurrentTimeAsDouble(const Nullable<double>& aCurrentTime,
+Animation::SetCurrentTimeAsDouble(const Nullable<double>& aCurrentTime,
                                         ErrorResult& aRv)
 {
   if (aCurrentTime.IsNull()) {
@@ -266,7 +266,7 @@ AnimationPlayer::SetCurrentTimeAsDouble(const Nullable<double>& aCurrentTime,
 }
 
 void
-AnimationPlayer::SetEffect(KeyframeEffectReadonly* aEffect)
+Animation::SetEffect(KeyframeEffectReadonly* aEffect)
 {
   if (mEffect) {
     mEffect->SetParentTime(Nullable<TimeDuration>());
@@ -279,7 +279,7 @@ AnimationPlayer::SetEffect(KeyframeEffectReadonly* aEffect)
 }
 
 void
-AnimationPlayer::Tick()
+Animation::Tick()
 {
   // Since we are not guaranteed to get only one call per refresh driver tick,
   // it's possible that mPendingReadyTime is set to a time in the future.
@@ -302,7 +302,7 @@ AnimationPlayer::Tick()
 }
 
 void
-AnimationPlayer::TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime)
+Animation::TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime)
 {
   // Normally we expect the play state to be pending but it's possible that,
   // due to the handling of possibly orphaned players in Tick(), this player got
@@ -317,7 +317,7 @@ AnimationPlayer::TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime)
 }
 
 void
-AnimationPlayer::TriggerNow()
+Animation::TriggerNow()
 {
   MOZ_ASSERT(PlayState() == AnimationPlayState::Pending,
              "Expected to start a pending player");
@@ -328,7 +328,7 @@ AnimationPlayer::TriggerNow()
 }
 
 Nullable<TimeDuration>
-AnimationPlayer::GetCurrentOrPendingStartTime() const
+Animation::GetCurrentOrPendingStartTime() const
 {
   Nullable<TimeDuration> result;
 
@@ -349,7 +349,7 @@ AnimationPlayer::GetCurrentOrPendingStartTime() const
 }
 
 void
-AnimationPlayer::Cancel()
+Animation::Cancel()
 {
   if (mPendingState != PendingState::NotPending) {
     CancelPendingTasks();
@@ -371,7 +371,7 @@ AnimationPlayer::Cancel()
 }
 
 void
-AnimationPlayer::UpdateRelevance()
+Animation::UpdateRelevance()
 {
   bool wasRelevant = mIsRelevant;
   mIsRelevant = HasCurrentEffect() || IsInEffect();
@@ -385,7 +385,7 @@ AnimationPlayer::UpdateRelevance()
 }
 
 bool
-AnimationPlayer::CanThrottle() const
+Animation::CanThrottle() const
 {
   if (!mEffect ||
       mEffect->IsFinishedTransition() ||
@@ -410,9 +410,9 @@ AnimationPlayer::CanThrottle() const
 }
 
 void
-AnimationPlayer::ComposeStyle(nsRefPtr<css::AnimValuesStyleRule>& aStyleRule,
-                              nsCSSPropertySet& aSetProperties,
-                              bool& aNeedsRefreshes)
+Animation::ComposeStyle(nsRefPtr<css::AnimValuesStyleRule>& aStyleRule,
+                        nsCSSPropertySet& aSetProperties,
+                        bool& aNeedsRefreshes)
 {
   if (!mEffect || mEffect->IsFinishedTransition()) {
     return;
@@ -493,7 +493,7 @@ AnimationPlayer::ComposeStyle(nsRefPtr<css::AnimValuesStyleRule>& aStyleRule,
 }
 
 void
-AnimationPlayer::DoPlay(LimitBehavior aLimitBehavior)
+Animation::DoPlay(LimitBehavior aLimitBehavior)
 {
   bool abortedPause = mPendingState == PendingState::PausePending;
 
@@ -556,7 +556,7 @@ AnimationPlayer::DoPlay(LimitBehavior aLimitBehavior)
 }
 
 void
-AnimationPlayer::DoPause()
+Animation::DoPause()
 {
   if (IsPausedOrPausing()) {
     return;
@@ -593,7 +593,7 @@ AnimationPlayer::DoPause()
 }
 
 void
-AnimationPlayer::ResumeAt(const TimeDuration& aReadyTime)
+Animation::ResumeAt(const TimeDuration& aReadyTime)
 {
   // This method is only expected to be called for a player that is
   // waiting to play. We can easily adapt it to handle other states
@@ -625,7 +625,7 @@ AnimationPlayer::ResumeAt(const TimeDuration& aReadyTime)
 }
 
 void
-AnimationPlayer::PauseAt(const TimeDuration& aReadyTime)
+Animation::PauseAt(const TimeDuration& aReadyTime)
 {
   MOZ_ASSERT(mPendingState == PendingState::PausePending,
              "Expected to pause a pause-pending player");
@@ -645,7 +645,7 @@ AnimationPlayer::PauseAt(const TimeDuration& aReadyTime)
 }
 
 void
-AnimationPlayer::UpdateTiming()
+Animation::UpdateTiming()
 {
   // We call UpdateFinishedState before UpdateEffect because the former
   // can change the current time, which is used by the latter.
@@ -654,7 +654,7 @@ AnimationPlayer::UpdateTiming()
 }
 
 void
-AnimationPlayer::UpdateFinishedState(bool aSeekFlag)
+Animation::UpdateFinishedState(bool aSeekFlag)
 {
   Nullable<TimeDuration> currentTime = GetCurrentTime();
   TimeDuration effectEnd = TimeDuration(EffectEnd());
@@ -708,7 +708,7 @@ AnimationPlayer::UpdateFinishedState(bool aSeekFlag)
 }
 
 void
-AnimationPlayer::UpdateEffect()
+Animation::UpdateEffect()
 {
   if (mEffect) {
     mEffect->SetParentTime(GetCurrentTime());
@@ -717,7 +717,7 @@ AnimationPlayer::UpdateEffect()
 }
 
 void
-AnimationPlayer::FlushStyle() const
+Animation::FlushStyle() const
 {
   nsIDocument* doc = GetRenderedDocument();
   if (doc) {
@@ -726,7 +726,7 @@ AnimationPlayer::FlushStyle() const
 }
 
 void
-AnimationPlayer::PostUpdate()
+Animation::PostUpdate()
 {
   AnimationPlayerCollection* collection = GetCollection();
   if (collection) {
@@ -735,7 +735,7 @@ AnimationPlayer::PostUpdate()
 }
 
 void
-AnimationPlayer::CancelPendingTasks()
+Animation::CancelPendingTasks()
 {
   if (mPendingState == PendingState::NotPending) {
     return;
@@ -758,7 +758,7 @@ AnimationPlayer::CancelPendingTasks()
 }
 
 bool
-AnimationPlayer::IsFinished() const
+Animation::IsFinished() const
 {
   // Unfortunately there's some weirdness in the spec at the moment where if
   // you're finished and paused, the playState is paused. This prevents us
@@ -771,7 +771,7 @@ AnimationPlayer::IsFinished() const
 }
 
 bool
-AnimationPlayer::IsPossiblyOrphanedPendingPlayer() const
+Animation::IsPossiblyOrphanedPendingPlayer() const
 {
   // Check if we are pending but might never start because we are not being
   // tracked.
@@ -825,7 +825,7 @@ AnimationPlayer::IsPossiblyOrphanedPendingPlayer() const
 }
 
 StickyTimeDuration
-AnimationPlayer::EffectEnd() const
+Animation::EffectEnd() const
 {
   if (!mEffect) {
     return StickyTimeDuration(0);
@@ -836,7 +836,7 @@ AnimationPlayer::EffectEnd() const
 }
 
 nsIDocument*
-AnimationPlayer::GetRenderedDocument() const
+Animation::GetRenderedDocument() const
 {
   if (!mEffect) {
     return nullptr;
@@ -853,7 +853,7 @@ AnimationPlayer::GetRenderedDocument() const
 }
 
 nsPresContext*
-AnimationPlayer::GetPresContext() const
+Animation::GetPresContext() const
 {
   nsIDocument* doc = GetRenderedDocument();
   if (!doc) {
@@ -867,7 +867,7 @@ AnimationPlayer::GetPresContext() const
 }
 
 AnimationPlayerCollection*
-AnimationPlayer::GetCollection() const
+Animation::GetCollection() const
 {
   css::CommonAnimationManager* manager = GetAnimationManager();
   if (!manager) {
diff --git a/dom/animation/AnimationPlayer.h b/dom/animation/Animation.h
similarity index 96%
rename from dom/animation/AnimationPlayer.h
rename to dom/animation/Animation.h
index 1121a07104b..dd2399aad52 100644
--- a/dom/animation/AnimationPlayer.h
+++ b/dom/animation/Animation.h
@@ -3,14 +3,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_dom_AnimationPlayer_h
-#define mozilla_dom_AnimationPlayer_h
+#ifndef mozilla_dom_Animation_h
+#define mozilla_dom_Animation_h
 
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/TimeStamp.h" // for TimeStamp, TimeDuration
-#include "mozilla/dom/AnimationPlayerBinding.h" // for AnimationPlayState
+#include "mozilla/dom/AnimationBinding.h" // for AnimationPlayState
 #include "mozilla/dom/DocumentTimeline.h" // for DocumentTimeline
 #include "mozilla/dom/KeyframeEffect.h" // for KeyframeEffectReadonly
 #include "mozilla/dom/Promise.h" // for Promise
@@ -44,14 +44,15 @@ class CSSTransitionPlayer;
 
 namespace dom {
 
-class AnimationPlayer : public nsISupports,
-                        public nsWrapperCache
+class Animation
+  : public nsISupports
+  , public nsWrapperCache
 {
 protected:
-  virtual ~AnimationPlayer() {}
+  virtual ~Animation() {}
 
 public:
-  explicit AnimationPlayer(DocumentTimeline* aTimeline)
+  explicit Animation(DocumentTimeline* aTimeline)
     : mTimeline(aTimeline)
     , mPlaybackRate(1.0)
     , mPendingState(PendingState::NotPending)
@@ -63,7 +64,7 @@ public:
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AnimationPlayer)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Animation)
 
   DocumentTimeline* GetParentObject() const { return mTimeline; }
   virtual JSObject* WrapObject(JSContext* aCx,
@@ -79,7 +80,7 @@ public:
     Continue = 1
   };
 
-  // AnimationPlayer methods
+  // Animation methods
   KeyframeEffectReadonly* GetEffect() const { return mEffect; }
   DocumentTimeline* Timeline() const { return mTimeline; }
   Nullable<TimeDuration> GetStartTime() const { return mStartTime; }
@@ -97,7 +98,7 @@ public:
   virtual void Pause();
   bool IsRunningOnCompositor() const { return mIsRunningOnCompositor; }
 
-  // Wrapper functions for AnimationPlayer DOM methods when called
+  // Wrapper functions for Animation DOM methods when called
   // from script. We often use the same methods internally and from
   // script but when called from script we (or one of our subclasses) perform
   // extra steps such as flushing style or converting the return type.
@@ -346,4 +347,4 @@ protected:
 } // namespace dom
 } // namespace mozilla
 
-#endif // mozilla_dom_AnimationPlayer_h
+#endif // mozilla_dom_Animation_h
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index 82914e280ba..5900bc499f9 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -234,7 +234,7 @@ KeyframeEffectReadonly::ActiveDuration(const AnimationTiming& aTiming)
 
 // http://w3c.github.io/web-animations/#in-play
 bool
-KeyframeEffectReadonly::IsInPlay(const AnimationPlayer& aPlayer) const
+KeyframeEffectReadonly::IsInPlay(const Animation& aPlayer) const
 {
   if (IsFinishedTransition() ||
       aPlayer.PlayState() == AnimationPlayState::Finished) {
@@ -246,7 +246,7 @@ KeyframeEffectReadonly::IsInPlay(const AnimationPlayer& aPlayer) const
 
 // http://w3c.github.io/web-animations/#current
 bool
-KeyframeEffectReadonly::IsCurrent(const AnimationPlayer& aPlayer) const
+KeyframeEffectReadonly::IsCurrent(const Animation& aPlayer) const
 {
   if (IsFinishedTransition() ||
       aPlayer.PlayState() == AnimationPlayState::Finished) {
diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
index 2531b41452b..fb8ac5932da 100644
--- a/dom/animation/KeyframeEffect.h
+++ b/dom/animation/KeyframeEffect.h
@@ -306,8 +306,8 @@ public:
     mIsFinishedTransition = aIsFinished;
   }
 
-  bool IsInPlay(const AnimationPlayer& aPlayer) const;
-  bool IsCurrent(const AnimationPlayer& aPlayer) const;
+  bool IsInPlay(const Animation& aPlayer) const;
+  bool IsCurrent(const Animation& aPlayer) const;
   bool IsInEffect() const;
 
   const AnimationProperty*
diff --git a/dom/animation/PendingPlayerTracker.cpp b/dom/animation/PendingPlayerTracker.cpp
index 19aa81aa4b4..48e9f2e7c2f 100644
--- a/dom/animation/PendingPlayerTracker.cpp
+++ b/dom/animation/PendingPlayerTracker.cpp
@@ -22,7 +22,7 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PendingPlayerTracker, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PendingPlayerTracker, Release)
 
 void
-PendingPlayerTracker::AddPending(dom::AnimationPlayer& aPlayer,
+PendingPlayerTracker::AddPending(dom::Animation& aPlayer,
                                  AnimationPlayerSet& aSet)
 {
   aSet.PutEntry(&aPlayer);
@@ -34,24 +34,24 @@ PendingPlayerTracker::AddPending(dom::AnimationPlayer& aPlayer,
 }
 
 void
-PendingPlayerTracker::RemovePending(dom::AnimationPlayer& aPlayer,
+PendingPlayerTracker::RemovePending(dom::Animation& aPlayer,
                                     AnimationPlayerSet& aSet)
 {
   aSet.RemoveEntry(&aPlayer);
 }
 
 bool
-PendingPlayerTracker::IsWaiting(const dom::AnimationPlayer& aPlayer,
+PendingPlayerTracker::IsWaiting(const dom::Animation& aPlayer,
                                 const AnimationPlayerSet& aSet) const
 {
-  return aSet.Contains(const_cast<dom::AnimationPlayer*>(&aPlayer));
+  return aSet.Contains(const_cast<dom::Animation*>(&aPlayer));
 }
 
 PLDHashOperator
-TriggerPlayerAtTime(nsRefPtrHashKey<dom::AnimationPlayer>* aKey,
+TriggerPlayerAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
                     void* aReadyTime)
 {
-  dom::AnimationPlayer* player = aKey->GetKey();
+  dom::Animation* player = aKey->GetKey();
   dom::DocumentTimeline* timeline = player->Timeline();
 
   // When the timeline's refresh driver is under test control, its values
@@ -81,7 +81,7 @@ PendingPlayerTracker::TriggerPendingPlayersOnNextTick(const TimeStamp&
 }
 
 PLDHashOperator
-TriggerPlayerNow(nsRefPtrHashKey<dom::AnimationPlayer>* aKey, void*)
+TriggerPlayerNow(nsRefPtrHashKey<dom::Animation>* aKey, void*)
 {
   aKey->GetKey()->TriggerNow();
   return PL_DHASH_NEXT;
diff --git a/dom/animation/PendingPlayerTracker.h b/dom/animation/PendingPlayerTracker.h
index 0ce979a1f2f..45689eab1e1 100644
--- a/dom/animation/PendingPlayerTracker.h
+++ b/dom/animation/PendingPlayerTracker.h
@@ -6,7 +6,7 @@
 #ifndef mozilla_dom_PendingPlayerTracker_h
 #define mozilla_dom_PendingPlayerTracker_h
 
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIDocument.h"
 #include "nsTHashtable.h"
@@ -25,32 +25,32 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PendingPlayerTracker)
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(PendingPlayerTracker)
 
-  void AddPlayPending(dom::AnimationPlayer& aPlayer)
+  void AddPlayPending(dom::Animation& aPlayer)
   {
     MOZ_ASSERT(!IsWaitingToPause(aPlayer),
                "Player is already waiting to pause");
     AddPending(aPlayer, mPlayPendingSet);
   }
-  void RemovePlayPending(dom::AnimationPlayer& aPlayer)
+  void RemovePlayPending(dom::Animation& aPlayer)
   {
     RemovePending(aPlayer, mPlayPendingSet);
   }
-  bool IsWaitingToPlay(const dom::AnimationPlayer& aPlayer) const
+  bool IsWaitingToPlay(const dom::Animation& aPlayer) const
   {
     return IsWaiting(aPlayer, mPlayPendingSet);
   }
 
-  void AddPausePending(dom::AnimationPlayer& aPlayer)
+  void AddPausePending(dom::Animation& aPlayer)
   {
     MOZ_ASSERT(!IsWaitingToPlay(aPlayer),
                "Player is already waiting to play");
     AddPending(aPlayer, mPausePendingSet);
   }
-  void RemovePausePending(dom::AnimationPlayer& aPlayer)
+  void RemovePausePending(dom::Animation& aPlayer)
   {
     RemovePending(aPlayer, mPausePendingSet);
   }
-  bool IsWaitingToPause(const dom::AnimationPlayer& aPlayer) const
+  bool IsWaitingToPause(const dom::Animation& aPlayer) const
   {
     return IsWaiting(aPlayer, mPausePendingSet);
   }
@@ -66,14 +66,14 @@ private:
 
   void EnsurePaintIsScheduled();
 
-  typedef nsTHashtable<nsRefPtrHashKey<dom::AnimationPlayer>>
+  typedef nsTHashtable<nsRefPtrHashKey<dom::Animation>>
     AnimationPlayerSet;
 
-  void AddPending(dom::AnimationPlayer& aPlayer,
+  void AddPending(dom::Animation& aPlayer,
                   AnimationPlayerSet& aSet);
-  void RemovePending(dom::AnimationPlayer& aPlayer,
+  void RemovePending(dom::Animation& aPlayer,
                      AnimationPlayerSet& aSet);
-  bool IsWaiting(const dom::AnimationPlayer& aPlayer,
+  bool IsWaiting(const dom::Animation& aPlayer,
                  const AnimationPlayerSet& aSet) const;
 
   AnimationPlayerSet mPlayPendingSet;
diff --git a/dom/animation/moz.build b/dom/animation/moz.build
index 3f87d323cbe..77e58b2b8dd 100644
--- a/dom/animation/moz.build
+++ b/dom/animation/moz.build
@@ -8,8 +8,8 @@ MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 EXPORTS.mozilla.dom += [
+    'Animation.h',
     'AnimationEffectReadonly.h',
-    'AnimationPlayer.h',
     'AnimationTimeline.h',
     'DocumentTimeline.h',
     'KeyframeEffect.h',
@@ -21,8 +21,8 @@ EXPORTS.mozilla += [
 ]
 
 UNIFIED_SOURCES += [
+    'Animation.cpp',
     'AnimationEffectReadonly.cpp',
-    'AnimationPlayer.cpp',
     'AnimationTimeline.cpp',
     'DocumentTimeline.cpp',
     'KeyframeEffect.cpp',
diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 2bd1e78bab0..4674ef908c0 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -14,7 +14,7 @@
 
 #include "AnimationCommon.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/dom/Attr.h"
 #include "nsDOMAttributeMap.h"
 #include "nsIAtom.h"
@@ -3186,7 +3186,7 @@ Element::MozRequestPointerLock()
 }
 
 void
-Element::GetAnimations(nsTArray<nsRefPtr<AnimationPlayer> >& aAnimations)
+Element::GetAnimations(nsTArray<nsRefPtr<Animation>>& aAnimations)
 {
   nsIDocument* doc = GetComposedDoc();
   if (doc) {
@@ -3206,7 +3206,7 @@ Element::GetAnimations(nsTArray<nsRefPtr<AnimationPlayer> >& aAnimations)
     for (size_t playerIdx = 0;
          playerIdx < collection->mPlayers.Length();
          playerIdx++) {
-      AnimationPlayer* player = collection->mPlayers[playerIdx];
+      Animation* player = collection->mPlayers[playerIdx];
       if (player->IsRelevant()) {
         aAnimations.AppendElement(player);
       }
diff --git a/dom/base/Element.h b/dom/base/Element.h
index 9aaec0815ec..9d21961fc71 100644
--- a/dom/base/Element.h
+++ b/dom/base/Element.h
@@ -121,7 +121,7 @@ class EventStateManager;
 
 namespace dom {
 
-class AnimationPlayer;
+class Animation;
 class Link;
 class UndoManager;
 class DOMRect;
@@ -808,7 +808,7 @@ public:
   {
   }
 
-  void GetAnimations(nsTArray<nsRefPtr<AnimationPlayer> >& aAnimations);
+  void GetAnimations(nsTArray<nsRefPtr<Animation>>& aAnimations);
 
   NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML);
   virtual void SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError);
diff --git a/dom/base/nsDOMMutationObserver.cpp b/dom/base/nsDOMMutationObserver.cpp
index 3aa9fd7a934..bb890c5c13b 100644
--- a/dom/base/nsDOMMutationObserver.cpp
+++ b/dom/base/nsDOMMutationObserver.cpp
@@ -14,7 +14,7 @@
 #include "nsIDOMMutationEvent.h"
 #include "nsTextFragment.h"
 #include "nsServiceManagerUtils.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/dom/KeyframeEffect.h"
 
 nsAutoTArray<nsRefPtr<nsDOMMutationObserver>, 4>*
@@ -325,7 +325,7 @@ void nsMutationReceiver::NodeWillBeDestroyed(const nsINode *aNode)
 }
 
 void
-nsAnimationReceiver::RecordAnimationMutation(AnimationPlayer* aPlayer,
+nsAnimationReceiver::RecordAnimationMutation(Animation* aPlayer,
                                              AnimationMutation aMutationType)
 {
   KeyframeEffectReadonly* effect = aPlayer->GetEffect();
@@ -385,19 +385,19 @@ nsAnimationReceiver::RecordAnimationMutation(AnimationPlayer* aPlayer,
 }
 
 void
-nsAnimationReceiver::AnimationAdded(AnimationPlayer* aPlayer)
+nsAnimationReceiver::AnimationAdded(Animation* aPlayer)
 {
   RecordAnimationMutation(aPlayer, eAnimationMutation_Added);
 }
 
 void
-nsAnimationReceiver::AnimationChanged(AnimationPlayer* aPlayer)
+nsAnimationReceiver::AnimationChanged(Animation* aPlayer)
 {
   RecordAnimationMutation(aPlayer, eAnimationMutation_Changed);
 }
 
 void
-nsAnimationReceiver::AnimationRemoved(AnimationPlayer* aPlayer)
+nsAnimationReceiver::AnimationRemoved(Animation* aPlayer)
 {
   RecordAnimationMutation(aPlayer, eAnimationMutation_Removed);
 }
diff --git a/dom/base/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h
index 76d509365d7..671a0b04fc2 100644
--- a/dom/base/nsDOMMutationObserver.h
+++ b/dom/base/nsDOMMutationObserver.h
@@ -24,7 +24,7 @@
 #include "nsWrapperCache.h"
 #include "mozilla/dom/MutationObserverBinding.h"
 #include "nsIDocument.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "nsIAnimationObserver.h"
 
 class nsDOMMutationObserver;
@@ -36,7 +36,7 @@ class nsDOMMutationRecord final : public nsISupports,
   virtual ~nsDOMMutationRecord() {}
 
 public:
-  typedef nsTArray<nsRefPtr<mozilla::dom::AnimationPlayer>> AnimationPlayerArray;
+  typedef nsTArray<nsRefPtr<mozilla::dom::Animation>> AnimationPlayerArray;
 
   nsDOMMutationRecord(nsIAtom* aType, nsISupports* aOwner)
   : mType(aType), mAttrNamespace(NullString()), mPrevValue(NullString()), mOwner(aOwner)
@@ -434,7 +434,7 @@ private:
     eAnimationMutation_Removed
   };
 
-  void RecordAnimationMutation(mozilla::dom::AnimationPlayer* aPlayer,
+  void RecordAnimationMutation(mozilla::dom::Animation* aPlayer,
                                AnimationMutation aMutationType);
 };
 
@@ -756,7 +756,7 @@ public:
     return sCurrentBatch->mBatchTarget;
   }
 
-  static void AnimationAdded(mozilla::dom::AnimationPlayer* aPlayer)
+  static void AnimationAdded(mozilla::dom::Animation* aPlayer)
   {
     if (!IsBatching()) {
       return;
@@ -783,7 +783,7 @@ public:
     }
   }
 
-  static void AnimationChanged(mozilla::dom::AnimationPlayer* aPlayer)
+  static void AnimationChanged(mozilla::dom::Animation* aPlayer)
   {
     Entry* entry = sCurrentBatch->FindEntry(aPlayer);
     if (entry) {
@@ -800,7 +800,7 @@ public:
     }
   }
 
-  static void AnimationRemoved(mozilla::dom::AnimationPlayer* aPlayer)
+  static void AnimationRemoved(mozilla::dom::Animation* aPlayer)
   {
     Entry* entry = sCurrentBatch->FindEntry(aPlayer);
     if (entry) {
@@ -824,7 +824,7 @@ public:
   }
 
 private:
-  Entry* FindEntry(mozilla::dom::AnimationPlayer* aPlayer)
+  Entry* FindEntry(mozilla::dom::Animation* aPlayer)
   {
     for (Entry& e : mEntries) {
       if (e.mPlayer == aPlayer) {
@@ -843,7 +843,7 @@ private:
 
   struct Entry
   {
-    nsRefPtr<mozilla::dom::AnimationPlayer> mPlayer;
+    nsRefPtr<mozilla::dom::Animation> mPlayer;
     State mState;
     bool mChanged;
   };
diff --git a/dom/base/nsIAnimationObserver.h b/dom/base/nsIAnimationObserver.h
index c78f0803590..403a9e62b87 100644
--- a/dom/base/nsIAnimationObserver.h
+++ b/dom/base/nsIAnimationObserver.h
@@ -9,7 +9,7 @@
 
 namespace mozilla {
 namespace dom {
-class AnimationPlayer;
+class Animation;
 }
 }
 
@@ -22,36 +22,36 @@ class nsIAnimationObserver : public nsIMutationObserver
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IANIMATION_OBSERVER_IID)
 
-  virtual void AnimationAdded(mozilla::dom::AnimationPlayer* aPlayer) = 0;
-  virtual void AnimationChanged(mozilla::dom::AnimationPlayer* aPlayer) = 0;
-  virtual void AnimationRemoved(mozilla::dom::AnimationPlayer* aPlayer) = 0;
+  virtual void AnimationAdded(mozilla::dom::Animation* aPlayer) = 0;
+  virtual void AnimationChanged(mozilla::dom::Animation* aPlayer) = 0;
+  virtual void AnimationRemoved(mozilla::dom::Animation* aPlayer) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIAnimationObserver, NS_IANIMATION_OBSERVER_IID)
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONADDED                          \
-    virtual void AnimationAdded(mozilla::dom::AnimationPlayer* aPlayer)      \
+    virtual void AnimationAdded(mozilla::dom::Animation* aPlayer)      \
       override;
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONCHANGED                        \
-    virtual void AnimationChanged(mozilla::dom::AnimationPlayer* aPlayer)    \
+    virtual void AnimationChanged(mozilla::dom::Animation* aPlayer)    \
       override;
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONREMOVED                        \
-    virtual void AnimationRemoved(mozilla::dom::AnimationPlayer* aPlayer)    \
+    virtual void AnimationRemoved(mozilla::dom::Animation* aPlayer)    \
       override;
 
 #define NS_IMPL_NSIANIMATIONOBSERVER_STUB(class_)                            \
 void                                                                         \
-class_::AnimationAdded(mozilla::dom::AnimationPlayer* aPlayer)               \
+class_::AnimationAdded(mozilla::dom::Animation* aPlayer)               \
 {                                                                            \
 }                                                                            \
 void                                                                         \
-class_::AnimationChanged(mozilla::dom::AnimationPlayer* aPlayer)             \
+class_::AnimationChanged(mozilla::dom::Animation* aPlayer)             \
 {                                                                            \
 }                                                                            \
 void                                                                         \
-class_::AnimationRemoved(mozilla::dom::AnimationPlayer* aPlayer)             \
+class_::AnimationRemoved(mozilla::dom::Animation* aPlayer)             \
 {                                                                            \
 }                                                                            \
 NS_IMPL_NSIMUTATIONOBSERVER_CORE_STUB(class_)                                \
diff --git a/dom/base/nsNodeUtils.cpp b/dom/base/nsNodeUtils.cpp
index 994e5a372bf..e536d2cf848 100644
--- a/dom/base/nsNodeUtils.cpp
+++ b/dom/base/nsNodeUtils.cpp
@@ -24,7 +24,7 @@
 #include "nsBindingManager.h"
 #include "nsGenericHTMLElement.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/KeyframeEffect.h"
@@ -216,7 +216,7 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer,
 }
 
 static inline Element*
-GetTarget(AnimationPlayer* aPlayer)
+GetTarget(Animation* aPlayer)
 {
   KeyframeEffectReadonly* effect = aPlayer->GetEffect();
   if (!effect) {
@@ -238,7 +238,7 @@ GetTarget(AnimationPlayer* aPlayer)
 }
 
 void
-nsNodeUtils::AnimationAdded(AnimationPlayer* aPlayer)
+nsNodeUtils::AnimationAdded(Animation* aPlayer)
 {
   Element* target = GetTarget(aPlayer);
   if (!target) {
@@ -252,7 +252,7 @@ nsNodeUtils::AnimationAdded(AnimationPlayer* aPlayer)
 }
 
 void
-nsNodeUtils::AnimationChanged(AnimationPlayer* aPlayer)
+nsNodeUtils::AnimationChanged(Animation* aPlayer)
 {
   Element* target = GetTarget(aPlayer);
   if (!target) {
@@ -266,7 +266,7 @@ nsNodeUtils::AnimationChanged(AnimationPlayer* aPlayer)
 }
 
 void
-nsNodeUtils::AnimationRemoved(AnimationPlayer* aPlayer)
+nsNodeUtils::AnimationRemoved(Animation* aPlayer)
 {
   Element* target = GetTarget(aPlayer);
   if (!target) {
diff --git a/dom/base/nsNodeUtils.h b/dom/base/nsNodeUtils.h
index a845e980381..46392a360a7 100644
--- a/dom/base/nsNodeUtils.h
+++ b/dom/base/nsNodeUtils.h
@@ -18,7 +18,7 @@ template<class E> class nsCOMArray;
 class nsCycleCollectionTraversalCallback;
 namespace mozilla {
 namespace dom {
-class AnimationPlayer;
+class Animation;
 }
 }
 
@@ -127,9 +127,9 @@ public:
     }
   }
 
-  static void AnimationAdded(mozilla::dom::AnimationPlayer* aPlayer);
-  static void AnimationChanged(mozilla::dom::AnimationPlayer* aPlayer);
-  static void AnimationRemoved(mozilla::dom::AnimationPlayer* aPlayer);
+  static void AnimationAdded(mozilla::dom::Animation* aPlayer);
+  static void AnimationChanged(mozilla::dom::Animation* aPlayer);
+  static void AnimationRemoved(mozilla::dom::Animation* aPlayer);
 
   /**
    * To be called when reference count of aNode drops to zero.
diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index be4e1adc38f..5d10b372633 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -129,12 +129,12 @@ var interfaceNamesInGlobalScope =
     {name: "AlarmsManager", pref: "dom.mozAlarms.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "AnalyserNode",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "Animation", pref: "dom.animations-api.core.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "AnimationEffectReadonly", pref: "dom.animations-api.core.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "AnimationEvent",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "AnimationPlayer", pref: "dom.animations-api.core.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "AnimationTimeline", pref: "dom.animations-api.core.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
diff --git a/dom/webidl/Animatable.webidl b/dom/webidl/Animatable.webidl
index 38cafcfc407..03985f797b1 100644
--- a/dom/webidl/Animatable.webidl
+++ b/dom/webidl/Animatable.webidl
@@ -13,5 +13,5 @@
 [NoInterfaceObject]
 interface Animatable {
   [Func="nsDocument::IsWebAnimationsEnabled"]
-  sequence<AnimationPlayer> getAnimations();
+  sequence<Animation> getAnimations();
 };
diff --git a/dom/webidl/AnimationPlayer.webidl b/dom/webidl/Animation.webidl
similarity index 80%
rename from dom/webidl/AnimationPlayer.webidl
rename to dom/webidl/Animation.webidl
index db2f70a862f..6eb57ef7202 100644
--- a/dom/webidl/AnimationPlayer.webidl
+++ b/dom/webidl/Animation.webidl
@@ -4,16 +4,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is
- * http://dev.w3.org/fxtf/web-animations/#idl-def-AnimationPlayer
+ * http://w3c.github.io/web-animations/#the-animation-interface
  *
- * Copyright © 2014 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * Copyright © 2015 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
  * liability, trademark and document use rules apply.
  */
 
 enum AnimationPlayState { "idle", "pending", "running", "paused", "finished" };
 
 [Func="nsDocument::IsWebAnimationsEnabled"]
-interface AnimationPlayer {
+interface Animation {
   // Bug 1049975: Make 'effect' writeable
   [Pure]
   readonly attribute AnimationEffectReadonly? effect;
@@ -27,9 +27,9 @@ interface AnimationPlayer {
   [BinaryName="playStateFromJS"]
   readonly attribute AnimationPlayState playState;
   [Throws]
-  readonly attribute Promise<AnimationPlayer> ready;
+  readonly attribute Promise<Animation> ready;
   [Throws]
-  readonly attribute Promise<AnimationPlayer> finished;
+  readonly attribute Promise<Animation> finished;
   /*
   void cancel ();
   void finish ();
@@ -44,6 +44,6 @@ interface AnimationPlayer {
 };
 
 // Non-standard extensions
-partial interface AnimationPlayer {
+partial interface Animation {
   [ChromeOnly] readonly attribute boolean isRunningOnCompositor;
 };
diff --git a/dom/webidl/AnimationTimeline.webidl b/dom/webidl/AnimationTimeline.webidl
index 5616ff9a9f4..e920e13ec06 100644
--- a/dom/webidl/AnimationTimeline.webidl
+++ b/dom/webidl/AnimationTimeline.webidl
@@ -15,6 +15,6 @@ interface AnimationTimeline {
   [BinaryName="currentTimeAsDouble"]
   readonly attribute double? currentTime;
   // Not yet implemented:
-  // AnimationPlayer            play (optional TimedItem? source = null);
-  // sequence<AnimationPlayer>  getAnimations ();
+  // Animation           play (optional TimedItem? source = null);
+  // sequence<Animation> getAnimations ();
 };
diff --git a/dom/webidl/MutationObserver.webidl b/dom/webidl/MutationObserver.webidl
index 3f2c53c5bec..e1bbccd4253 100644
--- a/dom/webidl/MutationObserver.webidl
+++ b/dom/webidl/MutationObserver.webidl
@@ -29,11 +29,11 @@ interface MutationRecord {
   [Constant]
   readonly attribute DOMString? oldValue;
   [Constant,Cached,ChromeOnly]
-  readonly attribute sequence<AnimationPlayer> addedAnimations;
+  readonly attribute sequence<Animation> addedAnimations;
   [Constant,Cached,ChromeOnly]
-  readonly attribute sequence<AnimationPlayer> changedAnimations;
+  readonly attribute sequence<Animation> changedAnimations;
   [Constant,Cached,ChromeOnly]
-  readonly attribute sequence<AnimationPlayer> removedAnimations;
+  readonly attribute sequence<Animation> removedAnimations;
 };
 
 [Constructor(MutationCallback mutationCallback)]
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 8a3f39d04ed..01983ff9bda 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -22,9 +22,9 @@ WEBIDL_FILES = [
     'AlarmsManager.webidl',
     'AnalyserNode.webidl',
     'Animatable.webidl',
+    'Animation.webidl',
     'AnimationEffectReadonly.webidl',
     'AnimationEvent.webidl',
-    'AnimationPlayer.webidl',
     'AnimationTimeline.webidl',
     'AnonymousContent.webidl',
     'AppInfo.webidl',
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index 2488ca18ae8..3450b28101d 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -21,7 +21,7 @@
 #include "gfx2DGlue.h"
 #include "mozilla/DebugOnly.h"          // for DebugOnly
 #include "mozilla/Telemetry.h"          // for Accumulate
-#include "mozilla/dom/AnimationPlayer.h" // for ComputedTimingFunction
+#include "mozilla/dom/Animation.h"      // for ComputedTimingFunction
 #include "mozilla/gfx/2D.h"             // for DrawTarget
 #include "mozilla/gfx/BaseSize.h"       // for BaseSize
 #include "mozilla/gfx/Matrix.h"         // for Matrix4x4
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index dbd201bc844..123165ab0df 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -34,7 +34,7 @@
 #include "mozilla/ReentrantMonitor.h"   // for ReentrantMonitorAutoEnter, etc
 #include "mozilla/StaticPtr.h"          // for StaticAutoPtr
 #include "mozilla/TimeStamp.h"          // for TimeDuration, TimeStamp
-#include "mozilla/dom/AnimationPlayer.h" // for ComputedTimingFunction
+#include "mozilla/dom/KeyframeEffect.h" // for ComputedTimingFunction
 #include "mozilla/dom/Touch.h"          // for Touch
 #include "mozilla/gfx/BasePoint.h"      // for BasePoint
 #include "mozilla/gfx/BaseRect.h"       // for BaseRect
diff --git a/gfx/layers/apz/src/Axis.cpp b/gfx/layers/apz/src/Axis.cpp
index 24258770992..92800f61362 100644
--- a/gfx/layers/apz/src/Axis.cpp
+++ b/gfx/layers/apz/src/Axis.cpp
@@ -8,7 +8,7 @@
 #include <math.h>                       // for fabsf, pow, powf
 #include <algorithm>                    // for max
 #include "AsyncPanZoomController.h"     // for AsyncPanZoomController
-#include "mozilla/dom/AnimationPlayer.h" // for ComputedTimingFunction
+#include "mozilla/dom/KeyframeEffect.h" // for ComputedTimingFunction
 #include "mozilla/layers/APZCTreeManager.h" // for APZCTreeManager
 #include "mozilla/layers/APZThreadUtils.h" // for AssertOnControllerThread
 #include "FrameMetrics.h"               // for FrameMetrics
diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp
index 382633b1bb7..b69a5b90c90 100644
--- a/gfx/layers/apz/util/APZCCallbackHelper.cpp
+++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp
@@ -17,6 +17,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIDOMWindow.h"
+#include "nsRefreshDriver.h"
 
 #define APZCCH_LOG(...)
 // #define APZCCH_LOG(...) printf_stderr("APZCCH: " __VA_ARGS__)
diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp
index 9c219985b80..4f242dacced 100644
--- a/gfx/layers/composite/AsyncCompositionManager.cpp
+++ b/gfx/layers/composite/AsyncCompositionManager.cpp
@@ -13,7 +13,6 @@
 #include "gfxPoint.h"                   // for gfxPoint, gfxSize
 #include "mozilla/StyleAnimationValue.h" // for StyleAnimationValue, etc
 #include "mozilla/WidgetUtils.h"        // for ComputeTransformForRotation
-#include "mozilla/dom/AnimationPlayer.h" // for AnimationPlayer
 #include "mozilla/dom/KeyframeEffect.h" // for KeyframeEffectReadonly
 #include "mozilla/gfx/BaseRect.h"       // for BaseRect
 #include "mozilla/gfx/Point.h"          // for RoundedToInt, PointTyped
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 1c09793789c..1e89bff5501 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -348,7 +348,7 @@ ToTimingFunction(const ComputedTimingFunction& aCTF)
 
 static void
 AddAnimationForProperty(nsIFrame* aFrame, const AnimationProperty& aProperty,
-                        AnimationPlayer* aPlayer, Layer* aLayer,
+                        dom::Animation* aPlayer, Layer* aLayer,
                         AnimationData& aData, bool aPending)
 {
   MOZ_ASSERT(aLayer->AsContainerLayer(), "Should only animate ContainerLayer");
@@ -417,7 +417,7 @@ AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
 
   // Add from first to last (since last overrides)
   for (size_t playerIdx = 0; playerIdx < aPlayers.Length(); playerIdx++) {
-    AnimationPlayer* player = aPlayers[playerIdx];
+    dom::Animation* player = aPlayers[playerIdx];
     if (!player->IsPlaying()) {
       continue;
     }
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index c4d08757908..e7a3adc7bca 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -501,7 +501,7 @@ GetMinAndMaxScaleForAnimationProperty(nsIContent* aContent,
                                       gfxSize& aMinScale)
 {
   for (size_t playerIdx = aPlayers->mPlayers.Length(); playerIdx-- != 0; ) {
-    AnimationPlayer* player = aPlayers->mPlayers[playerIdx];
+    dom::Animation* player = aPlayers->mPlayers[playerIdx];
     if (!player->GetEffect() || player->GetEffect()->IsFinishedTransition()) {
       continue;
     }
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index 52daeff15fd..75cb6d963d4 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -29,7 +29,7 @@
 
 
 using mozilla::layers::Layer;
-using mozilla::dom::AnimationPlayer;
+using mozilla::dom::Animation;
 using mozilla::dom::KeyframeEffectReadonly;
 
 namespace mozilla {
@@ -601,7 +601,7 @@ AnimationPlayerCollection::CanPerformOnCompositorThread(
   }
 
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const AnimationPlayer* player = mPlayers[playerIdx];
+    const Animation* player = mPlayers[playerIdx];
     if (!player->IsPlaying()) {
       continue;
     }
@@ -620,7 +620,7 @@ AnimationPlayerCollection::CanPerformOnCompositorThread(
 
   bool existsProperty = false;
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const AnimationPlayer* player = mPlayers[playerIdx];
+    const Animation* player = mPlayers[playerIdx];
     if (!player->IsPlaying()) {
       continue;
     }
@@ -928,7 +928,7 @@ AnimationPlayerCollection::HasCurrentAnimationsForProperties(
                               size_t aPropertyCount) const
 {
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const AnimationPlayer& player = *mPlayers[playerIdx];
+    const Animation& player = *mPlayers[playerIdx];
     const KeyframeEffectReadonly* effect = player.GetEffect();
     if (effect &&
         effect->IsCurrent(player) &&
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index c25b70c21ee..176c302a923 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -15,7 +15,7 @@
 #include "nsDisplayList.h" // For nsDisplayItem::Type
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StyleAnimationValue.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Nullable.h"
 #include "nsStyleStruct.h"
@@ -223,8 +223,7 @@ private:
 
 } /* end css sub-namespace */
 
-typedef InfallibleTArray<nsRefPtr<dom::AnimationPlayer> >
-  AnimationPlayerPtrArray;
+typedef InfallibleTArray<nsRefPtr<dom::Animation>> AnimationPlayerPtrArray;
 
 enum EnsureStyleRuleFlags {
   EnsureStyleRule_IsThrottled,
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index 39ed070f8aa..fc5a4b72c97 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -24,7 +24,7 @@
 
 using namespace mozilla;
 using namespace mozilla::css;
-using mozilla::dom::AnimationPlayer;
+using mozilla::dom::Animation;
 using mozilla::dom::KeyframeEffectReadonly;
 using mozilla::CSSAnimationPlayer;
 
@@ -32,21 +32,21 @@ mozilla::dom::Promise*
 CSSAnimationPlayer::GetReady(ErrorResult& aRv)
 {
   FlushStyle();
-  return AnimationPlayer::GetReady(aRv);
+  return Animation::GetReady(aRv);
 }
 
 void
 CSSAnimationPlayer::Play(LimitBehavior aLimitBehavior)
 {
   mPauseShouldStick = false;
-  AnimationPlayer::Play(aLimitBehavior);
+  Animation::Play(aLimitBehavior);
 }
 
 void
 CSSAnimationPlayer::Pause()
 {
   mPauseShouldStick = true;
-  AnimationPlayer::Pause();
+  Animation::Pause();
 }
 
 mozilla::dom::AnimationPlayState
@@ -55,7 +55,7 @@ CSSAnimationPlayer::PlayStateFromJS() const
   // Flush style to ensure that any properties controlling animation state
   // (e.g. animation-play-state) are fully updated.
   FlushStyle();
-  return AnimationPlayer::PlayStateFromJS();
+  return Animation::PlayStateFromJS();
 }
 
 void
@@ -64,7 +64,7 @@ CSSAnimationPlayer::PlayFromJS()
   // Note that flushing style below might trigger calls to
   // PlayFromStyle()/PauseFromStyle() on this object.
   FlushStyle();
-  AnimationPlayer::PlayFromJS();
+  Animation::PlayFromJS();
 }
 
 void
@@ -72,7 +72,7 @@ CSSAnimationPlayer::PlayFromStyle()
 {
   mIsStylePaused = false;
   if (!mPauseShouldStick) {
-    DoPlay(AnimationPlayer::LimitBehavior::Continue);
+    DoPlay(Animation::LimitBehavior::Continue);
   }
 }
 
@@ -327,7 +327,7 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
     if (!collection->mPlayers.IsEmpty()) {
 
       for (size_t newIdx = newPlayers.Length(); newIdx-- != 0;) {
-        AnimationPlayer* newPlayer = newPlayers[newIdx];
+        Animation* newPlayer = newPlayers[newIdx];
 
         // Find the matching animation with this name in the old list
         // of animations.  We iterate through both lists in a backwards
@@ -507,7 +507,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
     // not generate animation events. This includes when the animation-name is
     // "none" which is represented by an empty name in the StyleAnimation.
     // Since such animations neither affect style nor dispatch events, we do
-    // not generate a corresponding AnimationPlayer for them.
+    // not generate a corresponding Animation for them.
     nsCSSKeyframesRule* rule =
       src.GetName().IsEmpty()
       ? nullptr
@@ -753,7 +753,7 @@ nsAnimationManager::UpdateCascadeResults(
 
     for (size_t playerIdx = aElementAnimations->mPlayers.Length();
          playerIdx-- != 0; ) {
-      const AnimationPlayer* player = aElementAnimations->mPlayers[playerIdx];
+      const Animation* player = aElementAnimations->mPlayers[playerIdx];
       const KeyframeEffectReadonly* effect = player->GetEffect();
       if (!effect) {
         continue;
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index 8aa814cadf0..6210623e432 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -9,7 +9,7 @@
 #include "mozilla/ContentEvents.h"
 #include "AnimationCommon.h"
 #include "nsCSSPseudoElements.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 
@@ -52,11 +52,11 @@ struct AnimationEventInfo {
 
 typedef InfallibleTArray<AnimationEventInfo> EventArray;
 
-class CSSAnimationPlayer final : public dom::AnimationPlayer
+class CSSAnimationPlayer final : public dom::Animation
 {
 public:
  explicit CSSAnimationPlayer(dom::DocumentTimeline* aTimeline)
-    : dom::AnimationPlayer(aTimeline)
+    : dom::Animation(aTimeline)
     , mIsStylePaused(false)
     , mPauseShouldStick(false)
     , mPreviousPhaseOrIteration(PREVIOUS_PHASE_BEFORE)
@@ -125,7 +125,7 @@ protected:
   //   'running' A | A | C | C | A
   //   'paused'  E | B | D | D | E
   //
-  // The base class, AnimationPlayer already provides a boolean value,
+  // The base class, Animation already provides a boolean value,
   // mIsPaused which gives us two states. To this we add a further two booleans
   // to represent the states as follows.
   //
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 63eaae79e06..773b9ed401d 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -33,11 +33,10 @@
 
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
-using mozilla::dom::AnimationPlayer;
+using mozilla::dom::Animation;
 using mozilla::dom::KeyframeEffectReadonly;
 
 using namespace mozilla;
-using namespace mozilla::layers;
 using namespace mozilla::css;
 
 const nsString&
@@ -90,14 +89,14 @@ mozilla::dom::AnimationPlayState
 CSSTransitionPlayer::PlayStateFromJS() const
 {
   FlushStyle();
-  return AnimationPlayer::PlayStateFromJS();
+  return Animation::PlayStateFromJS();
 }
 
 void
 CSSTransitionPlayer::PlayFromJS()
 {
   FlushStyle();
-  AnimationPlayer::PlayFromJS();
+  Animation::PlayFromJS();
 }
 
 CommonAnimationManager*
@@ -320,7 +319,7 @@ nsTransitionManager::StyleContextChanged(dom::Element *aElement,
     StyleAnimationValue currentValue;
     do {
       --i;
-      AnimationPlayer* player = players[i];
+      Animation* player = players[i];
       dom::KeyframeEffectReadonly* effect = player->GetEffect();
       MOZ_ASSERT(effect && effect->Properties().Length() == 1,
                  "Should have one animation property for a transition");
@@ -808,7 +807,7 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
       bool transitionStartedOrEnded = false;
       do {
         --i;
-        AnimationPlayer* player = collection->mPlayers[i];
+        Animation* player = collection->mPlayers[i];
         if (!player->GetEffect()->IsFinishedTransition()) {
           MOZ_ASSERT(player->GetEffect(),
                      "Transitions should have an effect");
diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
index 582e86b52a9..417162e7362 100644
--- a/layout/style/nsTransitionManager.h
+++ b/layout/style/nsTransitionManager.h
@@ -10,7 +10,7 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/dom/AnimationPlayer.h"
+#include "mozilla/dom/Animation.h"
 #include "mozilla/dom/KeyframeEffect.h"
 #include "AnimationCommon.h"
 #include "nsCSSPseudoElements.h"
@@ -75,11 +75,11 @@ struct ElementPropertyTransition : public dom::KeyframeEffectReadonly
   double CurrentValuePortion() const;
 };
 
-class CSSTransitionPlayer final : public dom::AnimationPlayer
+class CSSTransitionPlayer final : public dom::Animation
 {
 public:
  explicit CSSTransitionPlayer(dom::DocumentTimeline* aTimeline)
-    : dom::AnimationPlayer(aTimeline)
+    : dom::Animation(aTimeline)
   {
   }
 
@@ -91,7 +91,7 @@ public:
 
   // A variant of Play() that avoids posting style updates since this method
   // is expected to be called whilst already updating style.
-  void PlayFromStyle() { DoPlay(AnimationPlayer::LimitBehavior::Continue); }
+  void PlayFromStyle() { DoPlay(Animation::LimitBehavior::Continue); }
 
 protected:
   virtual ~CSSTransitionPlayer() { }

From b5750bd4b361982bd5125ee73f67ad8ac1ed80af Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:09 +0900
Subject: [PATCH 57/80] Bug 1154615 part 2 - Rename PendingPlayerTracker to
 PendingAnimationTracker; r=jwatt

This patch also updates the method names on PendingAnimationTracker but leaves
a number of local variables which will be fixed in a subsequent patch.
---
 dom/animation/Animation.cpp                   | 14 ++++++------
 dom/animation/Animation.h                     |  8 +++----
 ...racker.cpp => PendingAnimationTracker.cpp} | 22 +++++++++----------
 ...yerTracker.h => PendingAnimationTracker.h} | 22 +++++++++----------
 dom/animation/moz.build                       |  4 ++--
 dom/base/nsDOMWindowUtils.cpp                 | 15 ++++++-------
 dom/base/nsDocument.cpp                       | 14 ++++++------
 dom/base/nsDocument.h                         | 18 +++++++--------
 dom/base/nsIDocument.h                        | 13 ++++++-----
 layout/base/nsDisplayList.cpp                 |  6 ++---
 layout/base/nsRefreshDriver.cpp               |  6 ++---
 layout/style/nsTransitionManager.cpp          |  6 ++---
 12 files changed, 74 insertions(+), 74 deletions(-)
 rename dom/animation/{PendingPlayerTracker.cpp => PendingAnimationTracker.cpp} (80%)
 rename dom/animation/{PendingPlayerTracker.h => PendingAnimationTracker.h} (77%)

diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index 35958a5b490..46632f79727 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -12,7 +12,7 @@
 #include "nsIDocument.h" // For nsIDocument
 #include "nsIPresShell.h" // For nsIPresShell
 #include "nsLayoutUtils.h" // For PostRestyleEvent (remove after bug 1073336)
-#include "PendingPlayerTracker.h" // For PendingPlayerTracker
+#include "PendingAnimationTracker.h" // For PendingAnimationTracker
 
 namespace mozilla {
 namespace dom {
@@ -548,7 +548,7 @@ Animation::DoPlay(LimitBehavior aLimitBehavior)
     return;
   }
 
-  PendingPlayerTracker* tracker = doc->GetOrCreatePendingPlayerTracker();
+  PendingAnimationTracker* tracker = doc->GetOrCreatePendingAnimationTracker();
   tracker->AddPlayPending(*this);
 
   // We may have updated the current time when we set the hold time above.
@@ -586,7 +586,7 @@ Animation::DoPause()
     return;
   }
 
-  PendingPlayerTracker* tracker = doc->GetOrCreatePendingPlayerTracker();
+  PendingAnimationTracker* tracker = doc->GetOrCreatePendingAnimationTracker();
   tracker->AddPausePending(*this);
 
   UpdateFinishedState();
@@ -743,7 +743,7 @@ Animation::CancelPendingTasks()
 
   nsIDocument* doc = GetRenderedDocument();
   if (doc) {
-    PendingPlayerTracker* tracker = doc->GetPendingPlayerTracker();
+    PendingAnimationTracker* tracker = doc->GetPendingAnimationTracker();
     if (tracker) {
       if (mPendingState == PendingState::PlayPending) {
         tracker->RemovePlayPending(*this);
@@ -785,7 +785,7 @@ Animation::IsPossiblyOrphanedPendingPlayer() const
   // * We started playing but our timeline became inactive.
   //   In this case the pending player tracker will drop us from its hashmap
   //   when we have been painted.
-  // * When we started playing we couldn't find a PendingPlayerTracker to
+  // * When we started playing we couldn't find a PendingAnimationTracker to
   //   register with (perhaps the effect had no document) so we simply
   //   set mPendingState in DoPlay and relied on this method to catch us on the
   //   next tick.
@@ -808,7 +808,7 @@ Animation::IsPossiblyOrphanedPendingPlayer() const
   }
 
   // If we have no rendered document, or we're not in our rendered document's
-  // PendingPlayerTracker then there's a good chance no one is tracking us.
+  // PendingAnimationTracker then there's a good chance no one is tracking us.
   //
   // If we're wrong and another document is tracking us then, at worst, we'll
   // simply start/pause the animation one tick too soon. That's better than
@@ -818,7 +818,7 @@ Animation::IsPossiblyOrphanedPendingPlayer() const
     return false;
   }
 
-  PendingPlayerTracker* tracker = doc->GetPendingPlayerTracker();
+  PendingAnimationTracker* tracker = doc->GetPendingAnimationTracker();
   return !tracker ||
          (!tracker->IsWaitingToPlay(*this) &&
           !tracker->IsWaitingToPause(*this));
diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index dd2399aad52..8e38bb5953a 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -166,7 +166,7 @@ public:
    * consistency and so that animations paused together end up in step.
    *
    * Note that the caller of this method is responsible for removing the player
-   * from any PendingPlayerTracker it may have been added to.
+   * from any PendingAnimationTracker it may have been added to.
    */
   void TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime);
 
@@ -176,7 +176,7 @@ public:
   // this method, but there are a lot of them.
   //
   // As with TriggerOnNextTick, the caller of this method is responsible for
-  // removing the player from any PendingPlayerTracker it may have been added
+  // removing the player from any PendingAnimationTracker it may have been added
   // to.
   void TriggerNow();
 
@@ -327,9 +327,9 @@ protected:
 
   // Indicates if the player is in the pending state (and what state it is
   // waiting to enter when it finished pending). We use this rather than
-  // checking if this player is tracked by a PendingPlayerTracker because the
+  // checking if this player is tracked by a PendingAnimationTracker because the
   // player will continue to be pending even after it has been removed from the
-  // PendingPlayerTracker while it is waiting for the next tick
+  // PendingAnimationTracker while it is waiting for the next tick
   // (see TriggerOnNextTick for details).
   enum class PendingState { NotPending, PlayPending, PausePending };
   PendingState mPendingState;
diff --git a/dom/animation/PendingPlayerTracker.cpp b/dom/animation/PendingAnimationTracker.cpp
similarity index 80%
rename from dom/animation/PendingPlayerTracker.cpp
rename to dom/animation/PendingAnimationTracker.cpp
index 48e9f2e7c2f..2f56cbd1b18 100644
--- a/dom/animation/PendingPlayerTracker.cpp
+++ b/dom/animation/PendingAnimationTracker.cpp
@@ -3,7 +3,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/. */
 
-#include "PendingPlayerTracker.h"
+#include "PendingAnimationTracker.h"
 
 #include "mozilla/dom/DocumentTimeline.h"
 #include "nsIFrame.h"
@@ -13,16 +13,16 @@ using namespace mozilla;
 
 namespace mozilla {
 
-NS_IMPL_CYCLE_COLLECTION(PendingPlayerTracker,
+NS_IMPL_CYCLE_COLLECTION(PendingAnimationTracker,
                          mPlayPendingSet,
                          mPausePendingSet,
                          mDocument)
 
-NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PendingPlayerTracker, AddRef)
-NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PendingPlayerTracker, Release)
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PendingAnimationTracker, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PendingAnimationTracker, Release)
 
 void
-PendingPlayerTracker::AddPending(dom::Animation& aPlayer,
+PendingAnimationTracker::AddPending(dom::Animation& aPlayer,
                                  AnimationPlayerSet& aSet)
 {
   aSet.PutEntry(&aPlayer);
@@ -34,14 +34,14 @@ PendingPlayerTracker::AddPending(dom::Animation& aPlayer,
 }
 
 void
-PendingPlayerTracker::RemovePending(dom::Animation& aPlayer,
+PendingAnimationTracker::RemovePending(dom::Animation& aPlayer,
                                     AnimationPlayerSet& aSet)
 {
   aSet.RemoveEntry(&aPlayer);
 }
 
 bool
-PendingPlayerTracker::IsWaiting(const dom::Animation& aPlayer,
+PendingAnimationTracker::IsWaiting(const dom::Animation& aPlayer,
                                 const AnimationPlayerSet& aSet) const
 {
   return aSet.Contains(const_cast<dom::Animation*>(&aPlayer));
@@ -58,7 +58,7 @@ TriggerPlayerAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
   // have no correspondance to wallclock times so we shouldn't try to convert
   // aReadyTime (which is a wallclock time) to a timeline value. Instead, the
   // animation player will be started/paused when the refresh driver is next
-  // advanced since this will trigger a call to TriggerPendingPlayersNow.
+  // advanced since this will trigger a call to TriggerPendingAnimationsNow.
   if (timeline->IsUnderTestControl()) {
     return PL_DHASH_NEXT;
   }
@@ -71,7 +71,7 @@ TriggerPlayerAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
 }
 
 void
-PendingPlayerTracker::TriggerPendingPlayersOnNextTick(const TimeStamp&
+PendingAnimationTracker::TriggerPendingAnimationsOnNextTick(const TimeStamp&
                                                         aReadyTime)
 {
   mPlayPendingSet.EnumerateEntries(TriggerPlayerAtTime,
@@ -88,7 +88,7 @@ TriggerPlayerNow(nsRefPtrHashKey<dom::Animation>* aKey, void*)
 }
 
 void
-PendingPlayerTracker::TriggerPendingPlayersNow()
+PendingAnimationTracker::TriggerPendingAnimationsNow()
 {
   mPlayPendingSet.EnumerateEntries(TriggerPlayerNow, nullptr);
   mPlayPendingSet.Clear();
@@ -97,7 +97,7 @@ PendingPlayerTracker::TriggerPendingPlayersNow()
 }
 
 void
-PendingPlayerTracker::EnsurePaintIsScheduled()
+PendingAnimationTracker::EnsurePaintIsScheduled()
 {
   if (!mDocument) {
     return;
diff --git a/dom/animation/PendingPlayerTracker.h b/dom/animation/PendingAnimationTracker.h
similarity index 77%
rename from dom/animation/PendingPlayerTracker.h
rename to dom/animation/PendingAnimationTracker.h
index 45689eab1e1..6bcf3aa0a65 100644
--- a/dom/animation/PendingPlayerTracker.h
+++ b/dom/animation/PendingAnimationTracker.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_dom_PendingPlayerTracker_h
-#define mozilla_dom_PendingPlayerTracker_h
+#ifndef mozilla_dom_PendingAnimationTracker_h
+#define mozilla_dom_PendingAnimationTracker_h
 
 #include "mozilla/dom/Animation.h"
 #include "nsCycleCollectionParticipant.h"
@@ -15,15 +15,15 @@ class nsIFrame;
 
 namespace mozilla {
 
-class PendingPlayerTracker final
+class PendingAnimationTracker final
 {
 public:
-  explicit PendingPlayerTracker(nsIDocument* aDocument)
+  explicit PendingAnimationTracker(nsIDocument* aDocument)
     : mDocument(aDocument)
   { }
 
-  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PendingPlayerTracker)
-  NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(PendingPlayerTracker)
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PendingAnimationTracker)
+  NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(PendingAnimationTracker)
 
   void AddPlayPending(dom::Animation& aPlayer)
   {
@@ -55,14 +55,14 @@ public:
     return IsWaiting(aPlayer, mPausePendingSet);
   }
 
-  void TriggerPendingPlayersOnNextTick(const TimeStamp& aReadyTime);
-  void TriggerPendingPlayersNow();
-  bool HasPendingPlayers() const {
+  void TriggerPendingAnimationsOnNextTick(const TimeStamp& aReadyTime);
+  void TriggerPendingAnimationsNow();
+  bool HasPendingAnimations() const {
     return mPlayPendingSet.Count() > 0 || mPausePendingSet.Count() > 0;
   }
 
 private:
-  ~PendingPlayerTracker() { }
+  ~PendingAnimationTracker() { }
 
   void EnsurePaintIsScheduled();
 
@@ -83,4 +83,4 @@ private:
 
 } // namespace mozilla
 
-#endif // mozilla_dom_PendingPlayerTracker_h
+#endif // mozilla_dom_PendingAnimationTracker_h
diff --git a/dom/animation/moz.build b/dom/animation/moz.build
index 77e58b2b8dd..03725162c3a 100644
--- a/dom/animation/moz.build
+++ b/dom/animation/moz.build
@@ -17,7 +17,7 @@ EXPORTS.mozilla.dom += [
 
 EXPORTS.mozilla += [
     'AnimationUtils.h',
-    'PendingPlayerTracker.h',
+    'PendingAnimationTracker.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -26,7 +26,7 @@ UNIFIED_SOURCES += [
     'AnimationTimeline.cpp',
     'DocumentTimeline.cpp',
     'KeyframeEffect.cpp',
-    'PendingPlayerTracker.cpp',
+    'PendingAnimationTracker.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index da2282e7490..1e6d9eb2667 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -19,7 +19,7 @@
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
 #include "mozilla/dom/Touch.h"
-#include "mozilla/PendingPlayerTracker.h"
+#include "mozilla/PendingAnimationTracker.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsFrame.h"
 #include "mozilla/layers/ShadowLayers.h"
@@ -2342,16 +2342,15 @@ nsDOMWindowUtils::AdvanceTimeAndRefresh(int64_t aMilliseconds)
   // Before we advance the time, we should trigger any animations that are
   // waiting to start. This is because there are many tests that call this
   // which expect animations to start immediately. Ideally, we should make
-  // all these tests do an asynchronous wait on the corresponding animation
-  // player's 'ready' promise before continuing. Then we could remove the
-  // special handling here and the code path followed when testing would
-  // more closely match the code path during regular operation. Filed as
-  // bug 1112957.
+  // all these tests do an asynchronous wait on the corresponding animation's
+  // 'ready' promise before continuing. Then we could remove the special
+  // handling here and the code path followed when testing would more closely
+  // match the code path during regular operation. Filed as bug 1112957.
   nsCOMPtr<nsIDocument> doc = GetDocument();
   if (doc) {
-    PendingPlayerTracker* tracker = doc->GetPendingPlayerTracker();
+    PendingAnimationTracker* tracker = doc->GetPendingAnimationTracker();
     if (tracker) {
-      tracker->TriggerPendingPlayersNow();
+      tracker->TriggerPendingAnimationsNow();
     }
   }
 
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 0708c4151bf..c7d49ccee5a 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -2019,7 +2019,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStateObjectCached)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mUndoManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocumentTimeline)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPendingPlayerTracker)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPendingAnimationTracker)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTemplateContentsOwner)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChildrenCollection)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRegistry)
@@ -2103,7 +2103,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mCachedEncoder)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mUndoManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocumentTimeline)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingPlayerTracker)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingAnimationTracker)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mTemplateContentsOwner)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mChildrenCollection)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mRegistry)
@@ -7492,14 +7492,14 @@ nsDocument::GetAnimationController()
   return mAnimationController;
 }
 
-PendingPlayerTracker*
-nsDocument::GetOrCreatePendingPlayerTracker()
+PendingAnimationTracker*
+nsDocument::GetOrCreatePendingAnimationTracker()
 {
-  if (!mPendingPlayerTracker) {
-    mPendingPlayerTracker = new PendingPlayerTracker(this);
+  if (!mPendingAnimationTracker) {
+    mPendingAnimationTracker = new PendingAnimationTracker(this);
   }
 
-  return mPendingPlayerTracker;
+  return mPendingAnimationTracker;
 }
 
 /**
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
index 3e9d50a09d4..3ab03929011 100644
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -59,7 +59,7 @@
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/PendingPlayerTracker.h"
+#include "mozilla/PendingAnimationTracker.h"
 #include "mozilla/dom/DOMImplementation.h"
 #include "mozilla/dom/StyleSheetList.h"
 #include "nsDataHashtable.h"
@@ -1050,14 +1050,14 @@ public:
   // If HasAnimationController is true, this is guaranteed to return non-null.
   nsSMILAnimationController* GetAnimationController() override;
 
-  virtual mozilla::PendingPlayerTracker*
-  GetPendingPlayerTracker() final override
+  virtual mozilla::PendingAnimationTracker*
+  GetPendingAnimationTracker() final override
   {
-    return mPendingPlayerTracker;
+    return mPendingAnimationTracker;
   }
 
-  virtual mozilla::PendingPlayerTracker*
-  GetOrCreatePendingPlayerTracker() override;
+  virtual mozilla::PendingAnimationTracker*
+  GetOrCreatePendingAnimationTracker() override;
 
   void SetImagesNeedAnimating(bool aAnimating) override;
 
@@ -1540,9 +1540,9 @@ protected:
   // Array of observers
   nsTObserverArray<nsIDocumentObserver*> mObservers;
 
-  // Tracker for animation players that are waiting to start.
-  // nullptr until GetOrCreatePendingPlayerTracker is called.
-  nsRefPtr<mozilla::PendingPlayerTracker> mPendingPlayerTracker;
+  // Tracker for animations that are waiting to start.
+  // nullptr until GetOrCreatePendingAnimationTracker is called.
+  nsRefPtr<mozilla::PendingAnimationTracker> mPendingAnimationTracker;
 
   // Weak reference to the scope object (aka the script global object)
   // that, unlike mScriptGlobalObject, is never unset once set. This
diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index 1517b8aa155..8121d8a37e8 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -88,7 +88,7 @@ namespace mozilla {
 class CSSStyleSheet;
 class ErrorResult;
 class EventStates;
-class PendingPlayerTracker;
+class PendingAnimationTracker;
 class SVGAttrAnimationRuleProcessor;
 
 namespace css {
@@ -1837,16 +1837,17 @@ public:
   // mAnimationController isn't yet initialized.
   virtual nsSMILAnimationController* GetAnimationController() = 0;
 
-  // Gets the tracker for animation players that are waiting to start.
-  // Returns nullptr if there is no pending player tracker for this document
+  // Gets the tracker for animations that are waiting to start.
+  // Returns nullptr if there is no pending animation tracker for this document
   // which will be the case if there have never been any CSS animations or
   // transitions on elements in the document.
-  virtual mozilla::PendingPlayerTracker* GetPendingPlayerTracker() = 0;
+  virtual mozilla::PendingAnimationTracker* GetPendingAnimationTracker() = 0;
 
-  // Gets the tracker for animation players that are waiting to start and
+  // Gets the tracker for animations that are waiting to start and
   // creates it if it doesn't already exist. As a result, the return value
   // will never be nullptr.
-  virtual mozilla::PendingPlayerTracker* GetOrCreatePendingPlayerTracker() = 0;
+  virtual mozilla::PendingAnimationTracker*
+  GetOrCreatePendingAnimationTracker() = 0;
 
   // Makes the images on this document capable of having their animation
   // active or suspended. An Image will animate as long as at least one of its
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 1e89bff5501..05f97b0fe9d 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -56,7 +56,7 @@
 #include "StickyScrollContainer.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/LookAndFeel.h"
-#include "mozilla/PendingPlayerTracker.h"
+#include "mozilla/PendingAnimationTracker.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/UniquePtr.h"
 #include "ActiveLayerTracker.h"
@@ -1560,14 +1560,14 @@ nsDisplayList::ComputeVisibilityForSublist(nsDisplayListBuilder* aBuilder,
 static bool
 TriggerPendingAnimationsOnSubDocuments(nsIDocument* aDocument, void* aReadyTime)
 {
-  PendingPlayerTracker* tracker = aDocument->GetPendingPlayerTracker();
+  PendingAnimationTracker* tracker = aDocument->GetPendingAnimationTracker();
   if (tracker) {
     nsIPresShell* shell = aDocument->GetShell();
     // If paint-suppression is in effect then we haven't finished painting
     // this document yet so we shouldn't start animations
     if (!shell || !shell->IsPaintingSuppressed()) {
       const TimeStamp& readyTime = *static_cast<TimeStamp*>(aReadyTime);
-      tracker->TriggerPendingPlayersOnNextTick(readyTime);
+      tracker->TriggerPendingAnimationsOnNextTick(readyTime);
     }
   }
   aDocument->EnumerateSubDocuments(TriggerPendingAnimationsOnSubDocuments,
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index a43b4d7e4e4..181ee12e11b 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -38,7 +38,7 @@
 #include "nsIDocument.h"
 #include "jsapi.h"
 #include "nsContentUtils.h"
-#include "mozilla/PendingPlayerTracker.h"
+#include "mozilla/PendingAnimationTracker.h"
 #include "mozilla/Preferences.h"
 #include "nsViewManager.h"
 #include "GeckoProfiler.h"
@@ -1408,8 +1408,8 @@ HasPendingAnimations(nsIPresShell* aShell)
     return false;
   }
 
-  PendingPlayerTracker* tracker = doc->GetPendingPlayerTracker();
-  return tracker && tracker->HasPendingPlayers();
+  PendingAnimationTracker* tracker = doc->GetPendingAnimationTracker();
+  return tracker && tracker->HasPendingAnimations();
 }
 
 /**
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 773b9ed401d..23efca28861 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -567,9 +567,9 @@ nsTransitionManager::ConsiderStartingTransition(
 
   nsRefPtr<CSSTransitionPlayer> player = new CSSTransitionPlayer(timeline);
   // The order of the following two calls is important since PlayFromStyle
-  // will add the player to the PendingPlayerTracker of its effect's document.
-  // When we come to make effect writeable (bug 1049975) we should remove this
-  // dependency.
+  // will add the player to the PendingAnimationTracker of its effect's
+  // document. When we come to make effect writeable (bug 1049975) we should
+  // remove this dependency.
   player->SetEffect(pt);
   player->PlayFromStyle();
 

From 88c7d3e09b6d43ce84591c04082966d95b4a0b79 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:09 +0900
Subject: [PATCH 58/80] Bug 1154615 part 3 - Rename internal members of
 PendingAnimationTracker; r=jwatt

---
 dom/animation/PendingAnimationTracker.cpp | 38 +++++++++---------
 dom/animation/PendingAnimationTracker.h   | 49 +++++++++++------------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/dom/animation/PendingAnimationTracker.cpp b/dom/animation/PendingAnimationTracker.cpp
index 2f56cbd1b18..615c4821463 100644
--- a/dom/animation/PendingAnimationTracker.cpp
+++ b/dom/animation/PendingAnimationTracker.cpp
@@ -22,10 +22,10 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PendingAnimationTracker, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PendingAnimationTracker, Release)
 
 void
-PendingAnimationTracker::AddPending(dom::Animation& aPlayer,
-                                 AnimationPlayerSet& aSet)
+PendingAnimationTracker::AddPending(dom::Animation& aAnimation,
+                                    AnimationSet& aSet)
 {
-  aSet.PutEntry(&aPlayer);
+  aSet.PutEntry(&aAnimation);
 
   // Schedule a paint. Otherwise animations that don't trigger a paint by
   // themselves (e.g. CSS animations with an empty keyframes rule) won't
@@ -34,30 +34,30 @@ PendingAnimationTracker::AddPending(dom::Animation& aPlayer,
 }
 
 void
-PendingAnimationTracker::RemovePending(dom::Animation& aPlayer,
-                                    AnimationPlayerSet& aSet)
+PendingAnimationTracker::RemovePending(dom::Animation& aAnimation,
+                                       AnimationSet& aSet)
 {
-  aSet.RemoveEntry(&aPlayer);
+  aSet.RemoveEntry(&aAnimation);
 }
 
 bool
-PendingAnimationTracker::IsWaiting(const dom::Animation& aPlayer,
-                                const AnimationPlayerSet& aSet) const
+PendingAnimationTracker::IsWaiting(const dom::Animation& aAnimation,
+                                   const AnimationSet& aSet) const
 {
-  return aSet.Contains(const_cast<dom::Animation*>(&aPlayer));
+  return aSet.Contains(const_cast<dom::Animation*>(&aAnimation));
 }
 
 PLDHashOperator
-TriggerPlayerAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
+TriggerAnimationAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
                     void* aReadyTime)
 {
-  dom::Animation* player = aKey->GetKey();
-  dom::DocumentTimeline* timeline = player->Timeline();
+  dom::Animation* animation = aKey->GetKey();
+  dom::DocumentTimeline* timeline = animation->Timeline();
 
   // When the timeline's refresh driver is under test control, its values
   // have no correspondance to wallclock times so we shouldn't try to convert
   // aReadyTime (which is a wallclock time) to a timeline value. Instead, the
-  // animation player will be started/paused when the refresh driver is next
+  // animation will be started/paused when the refresh driver is next
   // advanced since this will trigger a call to TriggerPendingAnimationsNow.
   if (timeline->IsUnderTestControl()) {
     return PL_DHASH_NEXT;
@@ -65,7 +65,7 @@ TriggerPlayerAtTime(nsRefPtrHashKey<dom::Animation>* aKey,
 
   Nullable<TimeDuration> readyTime =
     timeline->ToTimelineTime(*static_cast<const TimeStamp*>(aReadyTime));
-  player->TriggerOnNextTick(readyTime);
+  animation->TriggerOnNextTick(readyTime);
 
   return PL_DHASH_REMOVE;
 }
@@ -74,14 +74,14 @@ void
 PendingAnimationTracker::TriggerPendingAnimationsOnNextTick(const TimeStamp&
                                                         aReadyTime)
 {
-  mPlayPendingSet.EnumerateEntries(TriggerPlayerAtTime,
+  mPlayPendingSet.EnumerateEntries(TriggerAnimationAtTime,
                                    const_cast<TimeStamp*>(&aReadyTime));
-  mPausePendingSet.EnumerateEntries(TriggerPlayerAtTime,
+  mPausePendingSet.EnumerateEntries(TriggerAnimationAtTime,
                                     const_cast<TimeStamp*>(&aReadyTime));
 }
 
 PLDHashOperator
-TriggerPlayerNow(nsRefPtrHashKey<dom::Animation>* aKey, void*)
+TriggerAnimationNow(nsRefPtrHashKey<dom::Animation>* aKey, void*)
 {
   aKey->GetKey()->TriggerNow();
   return PL_DHASH_NEXT;
@@ -90,9 +90,9 @@ TriggerPlayerNow(nsRefPtrHashKey<dom::Animation>* aKey, void*)
 void
 PendingAnimationTracker::TriggerPendingAnimationsNow()
 {
-  mPlayPendingSet.EnumerateEntries(TriggerPlayerNow, nullptr);
+  mPlayPendingSet.EnumerateEntries(TriggerAnimationNow, nullptr);
   mPlayPendingSet.Clear();
-  mPausePendingSet.EnumerateEntries(TriggerPlayerNow, nullptr);
+  mPausePendingSet.EnumerateEntries(TriggerAnimationNow, nullptr);
   mPausePendingSet.Clear();
 }
 
diff --git a/dom/animation/PendingAnimationTracker.h b/dom/animation/PendingAnimationTracker.h
index 6bcf3aa0a65..2a6280e8652 100644
--- a/dom/animation/PendingAnimationTracker.h
+++ b/dom/animation/PendingAnimationTracker.h
@@ -25,34 +25,34 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PendingAnimationTracker)
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(PendingAnimationTracker)
 
-  void AddPlayPending(dom::Animation& aPlayer)
+  void AddPlayPending(dom::Animation& aAnimation)
   {
-    MOZ_ASSERT(!IsWaitingToPause(aPlayer),
-               "Player is already waiting to pause");
-    AddPending(aPlayer, mPlayPendingSet);
+    MOZ_ASSERT(!IsWaitingToPause(aAnimation),
+               "Animation is already waiting to pause");
+    AddPending(aAnimation, mPlayPendingSet);
   }
-  void RemovePlayPending(dom::Animation& aPlayer)
+  void RemovePlayPending(dom::Animation& aAnimation)
   {
-    RemovePending(aPlayer, mPlayPendingSet);
+    RemovePending(aAnimation, mPlayPendingSet);
   }
-  bool IsWaitingToPlay(const dom::Animation& aPlayer) const
+  bool IsWaitingToPlay(const dom::Animation& aAnimation) const
   {
-    return IsWaiting(aPlayer, mPlayPendingSet);
+    return IsWaiting(aAnimation, mPlayPendingSet);
   }
 
-  void AddPausePending(dom::Animation& aPlayer)
+  void AddPausePending(dom::Animation& aAnimation)
   {
-    MOZ_ASSERT(!IsWaitingToPlay(aPlayer),
-               "Player is already waiting to play");
-    AddPending(aPlayer, mPausePendingSet);
+    MOZ_ASSERT(!IsWaitingToPlay(aAnimation),
+               "Animation is already waiting to play");
+    AddPending(aAnimation, mPausePendingSet);
   }
-  void RemovePausePending(dom::Animation& aPlayer)
+  void RemovePausePending(dom::Animation& aAnimation)
   {
-    RemovePending(aPlayer, mPausePendingSet);
+    RemovePending(aAnimation, mPausePendingSet);
   }
-  bool IsWaitingToPause(const dom::Animation& aPlayer) const
+  bool IsWaitingToPause(const dom::Animation& aAnimation) const
   {
-    return IsWaiting(aPlayer, mPausePendingSet);
+    return IsWaiting(aAnimation, mPausePendingSet);
   }
 
   void TriggerPendingAnimationsOnNextTick(const TimeStamp& aReadyTime);
@@ -66,18 +66,15 @@ private:
 
   void EnsurePaintIsScheduled();
 
-  typedef nsTHashtable<nsRefPtrHashKey<dom::Animation>>
-    AnimationPlayerSet;
+  typedef nsTHashtable<nsRefPtrHashKey<dom::Animation>> AnimationSet;
 
-  void AddPending(dom::Animation& aPlayer,
-                  AnimationPlayerSet& aSet);
-  void RemovePending(dom::Animation& aPlayer,
-                     AnimationPlayerSet& aSet);
-  bool IsWaiting(const dom::Animation& aPlayer,
-                 const AnimationPlayerSet& aSet) const;
+  void AddPending(dom::Animation& aAnimation, AnimationSet& aSet);
+  void RemovePending(dom::Animation& aAnimation, AnimationSet& aSet);
+  bool IsWaiting(const dom::Animation& aAnimation,
+                 const AnimationSet& aSet) const;
 
-  AnimationPlayerSet mPlayPendingSet;
-  AnimationPlayerSet mPausePendingSet;
+  AnimationSet mPlayPendingSet;
+  AnimationSet mPausePendingSet;
   nsCOMPtr<nsIDocument> mDocument;
 };
 

From 0e20f3500bc80cbcf996d093f5bedc08e074e235 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:09 +0900
Subject: [PATCH 59/80] Bug 1154615 part 4 - Rename references to players in
 dom/animation; r=jwatt

This patch does not, however,  update references to
AnimationPlayerCollection/CSSTransitionPlayer etc. which we will fix when we get
to layout/style.
---
 dom/animation/Animation.cpp      | 30 ++++++++--------
 dom/animation/Animation.h        | 62 ++++++++++++++++----------------
 dom/animation/KeyframeEffect.cpp |  8 ++---
 dom/animation/KeyframeEffect.h   |  4 +--
 4 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index 46632f79727..1b1cbea484e 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -292,9 +292,9 @@ Animation::Tick()
     mPendingReadyTime.SetNull();
   }
 
-  if (IsPossiblyOrphanedPendingPlayer()) {
+  if (IsPossiblyOrphanedPendingAnimation()) {
     MOZ_ASSERT(mTimeline && !mTimeline->GetCurrentTime().IsNull(),
-               "Orphaned pending players should have an active timeline");
+               "Orphaned pending animtaions should have an active timeline");
     FinishPendingAt(mTimeline->GetCurrentTime().Value());
   }
 
@@ -305,14 +305,15 @@ void
 Animation::TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime)
 {
   // Normally we expect the play state to be pending but it's possible that,
-  // due to the handling of possibly orphaned players in Tick(), this player got
-  // started whilst still being in another document's pending player map.
+  // due to the handling of possibly orphaned animations in Tick(), this
+  // animation got started whilst still being in another document's pending
+  // animation map.
   if (PlayState() != AnimationPlayState::Pending) {
     return;
   }
 
   // If aReadyTime.IsNull() we'll detect this in Tick() where we check for
-  // orphaned players and trigger this animation anyway
+  // orphaned animations and trigger this animation anyway
   mPendingReadyTime = aReadyTime;
 }
 
@@ -320,7 +321,7 @@ void
 Animation::TriggerNow()
 {
   MOZ_ASSERT(PlayState() == AnimationPlayState::Pending,
-             "Expected to start a pending player");
+             "Expected to start a pending animation");
   MOZ_ASSERT(mTimeline && !mTimeline->GetCurrentTime().IsNull(),
              "Expected an active timeline");
 
@@ -595,13 +596,13 @@ Animation::DoPause()
 void
 Animation::ResumeAt(const TimeDuration& aReadyTime)
 {
-  // This method is only expected to be called for a player that is
+  // This method is only expected to be called for an animation that is
   // waiting to play. We can easily adapt it to handle other states
   // but it's currently not necessary.
   MOZ_ASSERT(mPendingState == PendingState::PlayPending,
-             "Expected to resume a play-pending player");
+             "Expected to resume a play-pending animation");
   MOZ_ASSERT(mHoldTime.IsNull() != mStartTime.IsNull(),
-             "A player in the play-pending state should have either a"
+             "An animation in the play-pending state should have either a"
              " resolved hold time or resolved start time (but not both)");
 
   // If we aborted a pending pause operation we will already have a start time
@@ -628,7 +629,7 @@ void
 Animation::PauseAt(const TimeDuration& aReadyTime)
 {
   MOZ_ASSERT(mPendingState == PendingState::PausePending,
-             "Expected to pause a pause-pending player");
+             "Expected to pause a pause-pending animation");
 
   if (!mStartTime.IsNull()) {
     mHoldTime.SetValue((aReadyTime - mStartTime.Value())
@@ -771,7 +772,7 @@ Animation::IsFinished() const
 }
 
 bool
-Animation::IsPossiblyOrphanedPendingPlayer() const
+Animation::IsPossiblyOrphanedPendingAnimation() const
 {
   // Check if we are pending but might never start because we are not being
   // tracked.
@@ -783,7 +784,7 @@ Animation::IsPossiblyOrphanedPendingPlayer() const
   //   (note that for the case of our effect changing we should handle
   //   that in SetEffect)
   // * We started playing but our timeline became inactive.
-  //   In this case the pending player tracker will drop us from its hashmap
+  //   In this case the pending animation tracker will drop us from its hashmap
   //   when we have been painted.
   // * When we started playing we couldn't find a PendingAnimationTracker to
   //   register with (perhaps the effect had no document) so we simply
@@ -873,13 +874,14 @@ Animation::GetCollection() const
   if (!manager) {
     return nullptr;
   }
-  MOZ_ASSERT(mEffect, "A player with an animation manager must have an effect");
+  MOZ_ASSERT(mEffect,
+             "An animation with an animation manager must have an effect");
 
   Element* targetElement;
   nsCSSPseudoElements::Type targetPseudoType;
   mEffect->GetTarget(targetElement, targetPseudoType);
   MOZ_ASSERT(targetElement,
-             "A player with an animation manager must have a target");
+             "An animation with an animation manager must have a target");
 
   return manager->GetAnimations(targetElement, targetPseudoType, false);
 }
diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index 8e38bb5953a..82db24d526b 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -118,24 +118,24 @@ public:
   void Tick();
 
   /**
-   * Set the time to use for starting or pausing a pending player.
+   * Set the time to use for starting or pausing a pending animation.
    *
-   * Typically, when a player is played, it does not start immediately but is
-   * added to a table of pending players on the document of its effect.
+   * Typically, when an animation is played, it does not start immediately but
+   * is added to a table of pending animations on the document of its effect.
    * In the meantime it sets its hold time to the time from which playback
    * should begin.
    *
-   * When the document finishes painting, any pending players in its table
+   * When the document finishes painting, any pending animations in its table
    * are marked as being ready to start by calling StartOnNextTick.
    * The moment when the paint completed is also recorded, converted to a
    * timeline time, and passed to StartOnTick. This is so that when these
-   * players do start, they can be timed from the point when painting
+   * animations do start, they can be timed from the point when painting
    * completed.
    *
-   * After calling TriggerOnNextTick, players remain in the pending state until
-   * the next refresh driver tick. At that time they transition out of the
-   * pending state using the time passed to TriggerOnNextTick as the effective
-   * time at which they resumed.
+   * After calling TriggerOnNextTick, animations remain in the pending state
+   * until the next refresh driver tick. At that time they transition out of
+   * the pending state using the time passed to TriggerOnNextTick as the
+   * effective time at which they resumed.
    *
    * This approach means that any setup time required for performing the
    * initial paint of an animation such as layerization is not deducted from
@@ -145,14 +145,14 @@ public:
    *
    * Furthermore:
    *
-   * - Starting the player immediately when painting finishes is problematic
-   *   because the start time of the player will be ahead of its timeline
+   * - Starting the animation immediately when painting finishes is problematic
+   *   because the start time of the animation will be ahead of its timeline
    *   (since the timeline time is based on the refresh driver time).
-   *   That's a problem because the player is playing but its timing suggests
-   *   it starts in the future. We could update the timeline to match the start
-   *   time of the player but then we'd also have to update the timing and style
-   *   of all animations connected to that timeline or else be stuck in an
-   *   inconsistent state until the next refresh driver tick.
+   *   That's a problem because the animation is playing but its timing
+   *   suggests it starts in the future. We could update the timeline to match
+   *   the start time of the animation but then we'd also have to update the
+   *   timing and style of all animations connected to that timeline or else be
+   *   stuck in an inconsistent state until the next refresh driver tick.
    *
    * - If we simply use the refresh driver time on its next tick, the lag
    *   between triggering an animation and its effective start is unacceptably
@@ -165,19 +165,19 @@ public:
    * animations could be paused immediately, we do it asynchronously for
    * consistency and so that animations paused together end up in step.
    *
-   * Note that the caller of this method is responsible for removing the player
-   * from any PendingAnimationTracker it may have been added to.
+   * Note that the caller of this method is responsible for removing the
+   * animation from any PendingAnimationTracker it may have been added to.
    */
   void TriggerOnNextTick(const Nullable<TimeDuration>& aReadyTime);
 
-  // Testing only: Start or pause a pending player using the current timeline
+  // Testing only: Start or pause a pending animation using the current timeline
   // time. This is used to support existing tests that expect animations to
   // begin immediately. Ideally we would rewrite the those tests and get rid of
   // this method, but there are a lot of them.
   //
   // As with TriggerOnNextTick, the caller of this method is responsible for
-  // removing the player from any PendingAnimationTracker it may have been added
-  // to.
+  // removing the animation from any PendingAnimationTracker it may have been
+  // added to.
   void TriggerNow();
 
   /**
@@ -254,11 +254,11 @@ public:
   // running on the compositor).
   bool CanThrottle() const;
 
-  // Updates |aStyleRule| with the animation values of this player's effect,
+  // Updates |aStyleRule| with the animation values of this animation's effect,
   // if any.
   // Any properties already contained in |aSetProperties| are not changed. Any
   // properties that are changed are added to |aSetProperties|.
-  // |aNeedsRefreshes| will be set to true if this player expects to update
+  // |aNeedsRefreshes| will be set to true if this animation expects to update
   // the style rule on the next refresh driver tick as well (because it
   // is running and has an effect to sample).
   void ComposeStyle(nsRefPtr<css::AnimValuesStyleRule>& aStyleRule,
@@ -287,7 +287,7 @@ protected:
   void FlushStyle() const;
   void PostUpdate();
   /**
-   * Remove this player from the pending player tracker and reset
+   * Remove this animation from the pending animation tracker and reset
    * mPendingState as necessary. The caller is responsible for resolving or
    * aborting the mReady promise as necessary.
    */
@@ -295,7 +295,7 @@ protected:
 
   bool IsFinished() const;
 
-  bool IsPossiblyOrphanedPendingPlayer() const;
+  bool IsPossiblyOrphanedPendingAnimation() const;
   StickyTimeDuration EffectEnd() const;
 
   nsIDocument* GetRenderedDocument() const;
@@ -307,9 +307,9 @@ protected:
   nsRefPtr<KeyframeEffectReadonly> mEffect;
   // The beginning of the delay period.
   Nullable<TimeDuration> mStartTime; // Timeline timescale
-  Nullable<TimeDuration> mHoldTime;  // Player timescale
+  Nullable<TimeDuration> mHoldTime;  // Animation timescale
   Nullable<TimeDuration> mPendingReadyTime; // Timeline timescale
-  Nullable<TimeDuration> mPreviousCurrentTime; // Player timescale
+  Nullable<TimeDuration> mPreviousCurrentTime; // Animation timescale
   double mPlaybackRate;
 
   // A Promise that is replaced on each call to Play() (and in future Pause())
@@ -325,11 +325,11 @@ protected:
   // See http://w3c.github.io/web-animations/#current-finished-promise
   nsRefPtr<Promise> mFinished;
 
-  // Indicates if the player is in the pending state (and what state it is
+  // Indicates if the animation is in the pending state (and what state it is
   // waiting to enter when it finished pending). We use this rather than
-  // checking if this player is tracked by a PendingAnimationTracker because the
-  // player will continue to be pending even after it has been removed from the
-  // PendingAnimationTracker while it is waiting for the next tick
+  // checking if this animation is tracked by a PendingAnimationTracker because
+  // the animation will continue to be pending even after it has been removed
+  // from the PendingAnimationTracker while it is waiting for the next tick
   // (see TriggerOnNextTick for details).
   enum class PendingState { NotPending, PlayPending, PausePending };
   PendingState mPendingState;
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index 5900bc499f9..e592dc15c62 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -234,10 +234,10 @@ KeyframeEffectReadonly::ActiveDuration(const AnimationTiming& aTiming)
 
 // http://w3c.github.io/web-animations/#in-play
 bool
-KeyframeEffectReadonly::IsInPlay(const Animation& aPlayer) const
+KeyframeEffectReadonly::IsInPlay(const Animation& aAnimation) const
 {
   if (IsFinishedTransition() ||
-      aPlayer.PlayState() == AnimationPlayState::Finished) {
+      aAnimation.PlayState() == AnimationPlayState::Finished) {
     return false;
   }
 
@@ -246,10 +246,10 @@ KeyframeEffectReadonly::IsInPlay(const Animation& aPlayer) const
 
 // http://w3c.github.io/web-animations/#current
 bool
-KeyframeEffectReadonly::IsCurrent(const Animation& aPlayer) const
+KeyframeEffectReadonly::IsCurrent(const Animation& aAnimation) const
 {
   if (IsFinishedTransition() ||
-      aPlayer.PlayState() == AnimationPlayState::Finished) {
+      aAnimation.PlayState() == AnimationPlayState::Finished) {
     return false;
   }
 
diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
index fb8ac5932da..a5236414a8b 100644
--- a/dom/animation/KeyframeEffect.h
+++ b/dom/animation/KeyframeEffect.h
@@ -306,8 +306,8 @@ public:
     mIsFinishedTransition = aIsFinished;
   }
 
-  bool IsInPlay(const Animation& aPlayer) const;
-  bool IsCurrent(const Animation& aPlayer) const;
+  bool IsInPlay(const Animation& aAnimation) const;
+  bool IsCurrent(const Animation& aAnimation) const;
   bool IsInEffect() const;
 
   const AnimationProperty*

From 3b1faa1fd5703612fca9fddbdfbcec17b8f7e8ee Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:10 +0900
Subject: [PATCH 60/80] Bug 1154615 part 5 - Rename AnimationPlayerCollection
 to AnimationCollection; r=jwatt

---
 dom/animation/Animation.cpp          |  6 +--
 dom/animation/Animation.h            |  4 +-
 dom/animation/KeyframeEffect.cpp     |  2 +-
 dom/base/Element.cpp                 |  4 +-
 layout/base/RestyleManager.cpp       |  4 +-
 layout/base/nsDisplayList.cpp        | 16 +++---
 layout/base/nsLayoutUtils.cpp        | 22 ++++----
 layout/style/AnimationCommon.cpp     | 81 +++++++++++++---------------
 layout/style/AnimationCommon.h       | 24 ++++-----
 layout/style/nsAnimationManager.cpp  | 23 ++++----
 layout/style/nsAnimationManager.h    | 11 ++--
 layout/style/nsTransitionManager.cpp | 29 +++++-----
 layout/style/nsTransitionManager.h   | 18 +++----
 13 files changed, 113 insertions(+), 131 deletions(-)

diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index 1b1cbea484e..d7546c00568 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -7,7 +7,7 @@
 #include "AnimationUtils.h"
 #include "mozilla/dom/AnimationBinding.h"
 #include "mozilla/AutoRestore.h"
-#include "AnimationCommon.h" // For AnimationPlayerCollection,
+#include "AnimationCommon.h" // For AnimationCollection,
                              // CommonAnimationManager
 #include "nsIDocument.h" // For nsIDocument
 #include "nsIPresShell.h" // For nsIPresShell
@@ -729,7 +729,7 @@ Animation::FlushStyle() const
 void
 Animation::PostUpdate()
 {
-  AnimationPlayerCollection* collection = GetCollection();
+  AnimationCollection* collection = GetCollection();
   if (collection) {
     collection->NotifyPlayerUpdated();
   }
@@ -867,7 +867,7 @@ Animation::GetPresContext() const
   return shell->GetPresContext();
 }
 
-AnimationPlayerCollection*
+AnimationCollection*
 Animation::GetCollection() const
 {
   css::CommonAnimationManager* manager = GetAnimationManager();
diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index 82db24d526b..da12ed04c70 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -33,7 +33,7 @@ class nsIDocument;
 class nsPresContext;
 
 namespace mozilla {
-struct AnimationPlayerCollection;
+struct AnimationCollection;
 namespace css {
 class AnimValuesStyleRule;
 class CommonAnimationManager;
@@ -301,7 +301,7 @@ protected:
   nsIDocument* GetRenderedDocument() const;
   nsPresContext* GetPresContext() const;
   virtual css::CommonAnimationManager* GetAnimationManager() const = 0;
-  AnimationPlayerCollection* GetCollection() const;
+  AnimationCollection* GetCollection() const;
 
   nsRefPtr<DocumentTimeline> mTimeline;
   nsRefPtr<KeyframeEffectReadonly> mEffect;
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index e592dc15c62..5671d1844a2 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -325,7 +325,7 @@ KeyframeEffectReadonly::ComposeStyle(
                "incorrect last to key");
 
     if (aSetProperties.HasProperty(prop.mProperty)) {
-      // Animations are composed by AnimationPlayerCollection by iterating
+      // Animations are composed by AnimationCollection by iterating
       // from the last animation to first. For animations targetting the
       // same property, the later one wins. So if this property is already set,
       // we should not override it.
diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 4674ef908c0..45ecb60f9d6 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -3197,8 +3197,8 @@ Element::GetAnimations(nsTArray<nsRefPtr<Animation>>& aAnimations)
                             nsGkAtoms::animationsProperty };
   for (size_t propIdx = 0; propIdx < MOZ_ARRAY_LENGTH(properties);
        propIdx++) {
-    AnimationPlayerCollection* collection =
-      static_cast<AnimationPlayerCollection*>(
+    AnimationCollection* collection =
+      static_cast<AnimationCollection*>(
         GetProperty(properties[propIdx]));
     if (!collection) {
       continue;
diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index 694502ca8ba..1c972fd417a 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -1233,10 +1233,10 @@ RestyleManager::GetMaxAnimationGenerationForFrame(nsIFrame* aFrame)
 
   nsCSSPseudoElements::Type pseudoType =
     aFrame->StyleContext()->GetPseudoType();
-  AnimationPlayerCollection* transitions =
+  AnimationCollection* transitions =
     aFrame->PresContext()->TransitionManager()->GetAnimations(
       content->AsElement(), pseudoType, false /* don't create */);
-  AnimationPlayerCollection* animations =
+  AnimationCollection* animations =
     aFrame->PresContext()->AnimationManager()->GetAnimations(
       content->AsElement(), pseudoType, false /* don't create */);
 
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 05f97b0fe9d..e5d0237cbf9 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -503,9 +503,9 @@ nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(Layer* aLayer,
   if (!content) {
     return;
   }
-  AnimationPlayerCollection* transitions =
+  AnimationCollection* transitions =
     nsTransitionManager::GetAnimationsForCompositor(content, aProperty);
-  AnimationPlayerCollection* animations =
+  AnimationCollection* animations =
     nsAnimationManager::GetAnimationsForCompositor(content, aProperty);
 
   if (!animations && !transitions) {
@@ -5457,8 +5457,8 @@ nsDisplayOpacity::CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder)
   if (nsLayoutUtils::IsAnimationLoggingEnabled()) {
     nsCString message;
     message.AppendLiteral("Performance warning: Async animation disabled because frame was not marked active for opacity animation");
-    AnimationPlayerCollection::LogAsyncAnimationFailure(message,
-                                                        Frame()->GetContent());
+    AnimationCollection::LogAsyncAnimationFailure(message,
+                                                  Frame()->GetContent());
   }
   return false;
 }
@@ -5511,8 +5511,8 @@ nsDisplayTransform::ShouldPrerenderTransformedContent(nsDisplayListBuilder* aBui
     if (aLogAnimations) {
       nsCString message;
       message.AppendLiteral("Performance warning: Async animation disabled because frame was not marked active for transform animation");
-      AnimationPlayerCollection::LogAsyncAnimationFailure(message,
-                                                          aFrame->GetContent());
+      AnimationCollection::LogAsyncAnimationFailure(message,
+                                                    aFrame->GetContent());
     }
     return false;
   }
@@ -5551,8 +5551,8 @@ nsDisplayTransform::ShouldPrerenderTransformedContent(nsDisplayListBuilder* aBui
     message.AppendLiteral(") is larger than the max allowable value (");
     message.AppendInt(nsPresContext::AppUnitsToIntCSSPixels(maxInAppUnits));
     message.Append(')');
-    AnimationPlayerCollection::LogAsyncAnimationFailure(message,
-                                                        aFrame->GetContent());
+    AnimationCollection::LogAsyncAnimationFailure(message,
+                                                  aFrame->GetContent());
   }
   return false;
 }
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index e7a3adc7bca..7fe5e0e2040 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -376,13 +376,13 @@ nsLayoutUtils::HasAnimationsForCompositor(nsIContent* aContent,
          nsTransitionManager::GetAnimationsForCompositor(aContent, aProperty);
 }
 
-static AnimationPlayerCollection*
+static AnimationCollection*
 GetAnimationsOrTransitions(nsIContent* aContent,
                            nsIAtom* aAnimationProperty,
                            nsCSSProperty aProperty)
 {
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(aContent->GetProperty(
+  AnimationCollection* collection =
+    static_cast<AnimationCollection*>(aContent->GetProperty(
         aAnimationProperty));
   if (collection) {
     bool propertyMatches = collection->HasAnimationOfProperty(aProperty);
@@ -412,8 +412,8 @@ nsLayoutUtils::HasCurrentAnimations(nsIContent* aContent,
   if (!aContent->MayHaveAnimations())
     return false;
 
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(
+  AnimationCollection* collection =
+    static_cast<AnimationCollection*>(
       aContent->GetProperty(aAnimationProperty));
   return (collection && collection->HasCurrentAnimations());
 }
@@ -430,8 +430,8 @@ nsLayoutUtils::HasCurrentAnimationsForProperties(nsIContent* aContent,
                                          nsGkAtoms::animationsProperty,
                                          nullptr };
   for (nsIAtom* const* animProp = sAnimProps; *animProp; animProp++) {
-    AnimationPlayerCollection* collection =
-      static_cast<AnimationPlayerCollection*>(aContent->GetProperty(*animProp));
+    AnimationCollection* collection =
+      static_cast<AnimationCollection*>(aContent->GetProperty(*animProp));
     if (collection &&
         collection->HasCurrentAnimationsForProperties(aProperties,
                                                       aPropertyCount)) {
@@ -496,12 +496,12 @@ GetSuitableScale(float aMaxScale, float aMinScale)
 
 static void
 GetMinAndMaxScaleForAnimationProperty(nsIContent* aContent,
-                                      AnimationPlayerCollection* aPlayers,
+                                      AnimationCollection* aAnimations,
                                       gfxSize& aMaxScale,
                                       gfxSize& aMinScale)
 {
-  for (size_t playerIdx = aPlayers->mPlayers.Length(); playerIdx-- != 0; ) {
-    dom::Animation* player = aPlayers->mPlayers[playerIdx];
+  for (size_t playerIdx = aAnimations->mPlayers.Length(); playerIdx-- != 0; ) {
+    dom::Animation* player = aAnimations->mPlayers[playerIdx];
     if (!player->GetEffect() || player->GetEffect()->IsFinishedTransition()) {
       continue;
     }
@@ -537,7 +537,7 @@ nsLayoutUtils::ComputeSuitableScaleForAnimation(nsIContent* aContent)
   gfxSize minScale(std::numeric_limits<gfxFloat>::max(),
                    std::numeric_limits<gfxFloat>::max());
 
-  AnimationPlayerCollection* animations =
+  AnimationCollection* animations =
     nsAnimationManager::GetAnimationsForCompositor(aContent,
                                                    eCSSProperty_transform);
   if (animations) {
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index 75cb6d963d4..48d1f0351c9 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -74,8 +74,7 @@ CommonAnimationManager::Disconnect()
 }
 
 void
-CommonAnimationManager::AddElementCollection(AnimationPlayerCollection*
-                                               aCollection)
+CommonAnimationManager::AddElementCollection(AnimationCollection* aCollection)
 {
   if (!mIsObservingRefreshDriver) {
     NS_ASSERTION(aCollection->mNeedsRefreshes,
@@ -92,9 +91,8 @@ void
 CommonAnimationManager::RemoveAllElementCollections()
 {
   while (!PR_CLIST_IS_EMPTY(&mElementCollections)) {
-    AnimationPlayerCollection* head =
-      static_cast<AnimationPlayerCollection*>(
-        PR_LIST_HEAD(&mElementCollections));
+    AnimationCollection* head =
+      static_cast<AnimationCollection*>(PR_LIST_HEAD(&mElementCollections));
     head->Destroy();
   }
 }
@@ -128,14 +126,14 @@ CommonAnimationManager::NeedsRefresh() const
   for (PRCList *l = PR_LIST_HEAD(&mElementCollections);
        l != &mElementCollections;
        l = PR_NEXT_LINK(l)) {
-    if (static_cast<AnimationPlayerCollection*>(l)->mNeedsRefreshes) {
+    if (static_cast<AnimationCollection*>(l)->mNeedsRefreshes) {
       return true;
     }
   }
   return false;
 }
 
-AnimationPlayerCollection*
+AnimationCollection*
 CommonAnimationManager::GetAnimationsForCompositor(nsIContent* aContent,
                                                    nsIAtom* aElementProperty,
                                                    nsCSSProperty aProperty)
@@ -143,13 +141,12 @@ CommonAnimationManager::GetAnimationsForCompositor(nsIContent* aContent,
   if (!aContent->MayHaveAnimations())
     return nullptr;
 
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(
-      aContent->GetProperty(aElementProperty));
+  AnimationCollection* collection =
+    static_cast<AnimationCollection*>(aContent->GetProperty(aElementProperty));
   if (!collection ||
       !collection->HasAnimationOfProperty(aProperty) ||
       !collection->CanPerformOnCompositorThread(
-        AnimationPlayerCollection::CanAnimate_AllowPartial)) {
+        AnimationCollection::CanAnimate_AllowPartial)) {
     return nullptr;
   }
 
@@ -263,8 +260,7 @@ CommonAnimationManager::AddStyleUpdatesTo(RestyleTracker& aTracker)
 
   PRCList* next = PR_LIST_HEAD(&mElementCollections);
   while (next != &mElementCollections) {
-    AnimationPlayerCollection* collection =
-      static_cast<AnimationPlayerCollection*>(next);
+    AnimationCollection* collection = static_cast<AnimationCollection*>(next);
     next = PR_NEXT_LINK(next);
 
     collection->EnsureStyleRuleFor(now, EnsureStyleRule_IsNotThrottled);
@@ -279,7 +275,7 @@ CommonAnimationManager::AddStyleUpdatesTo(RestyleTracker& aTracker)
 }
 
 void
-CommonAnimationManager::NotifyCollectionUpdated(AnimationPlayerCollection&
+CommonAnimationManager::NotifyCollectionUpdated(AnimationCollection&
                                                   aCollection)
 {
   MaybeStartObservingRefreshDriver();
@@ -308,7 +304,7 @@ CommonAnimationManager::ExtractComputedValueForTransition(
   return result;
 }
 
-AnimationPlayerCollection*
+AnimationCollection*
 CommonAnimationManager::GetAnimations(dom::Element *aElement,
                                       nsCSSPseudoElements::Type aPseudoType,
                                       bool aCreateIfNeeded)
@@ -331,15 +327,14 @@ CommonAnimationManager::GetAnimations(dom::Element *aElement,
                  "other than :before or :after");
     return nullptr;
   }
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(aElement->GetProperty(propName));
+  AnimationCollection* collection =
+    static_cast<AnimationCollection*>(aElement->GetProperty(propName));
   if (!collection && aCreateIfNeeded) {
     // FIXME: Consider arena-allocating?
-    collection =
-      new AnimationPlayerCollection(aElement, propName, this);
+    collection = new AnimationCollection(aElement, propName, this);
     nsresult rv =
       aElement->SetProperty(propName, collection,
-                            &AnimationPlayerCollection::PropertyDtor, false);
+                            &AnimationCollection::PropertyDtor, false);
     if (NS_FAILED(rv)) {
       NS_WARNING("SetProperty failed");
       delete collection;
@@ -371,7 +366,7 @@ CommonAnimationManager::GetAnimationRule(mozilla::dom::Element* aElement,
     return nullptr;
   }
 
-  AnimationPlayerCollection* collection =
+  AnimationCollection* collection =
     GetAnimations(aElement, aPseudoType, false);
   if (!collection) {
     return nullptr;
@@ -505,7 +500,7 @@ AnimValuesStyleRule::List(FILE* out, int32_t aIndent) const
 } /* end sub-namespace css */
 
 bool
-AnimationPlayerCollection::CanAnimatePropertyOnCompositor(
+AnimationCollection::CanAnimatePropertyOnCompositor(
   const dom::Element *aElement,
   nsCSSProperty aProperty,
   CanAnimateFlags aFlags)
@@ -571,7 +566,7 @@ AnimationPlayerCollection::CanAnimatePropertyOnCompositor(
 }
 
 /* static */ bool
-AnimationPlayerCollection::IsCompositorAnimationDisabledForFrame(
+AnimationCollection::IsCompositorAnimationDisabledForFrame(
   nsIFrame* aFrame)
 {
   void* prop = aFrame->Properties().Get(nsIFrame::RefusedAsyncAnimation());
@@ -579,7 +574,7 @@ AnimationPlayerCollection::IsCompositorAnimationDisabledForFrame(
 }
 
 bool
-AnimationPlayerCollection::CanPerformOnCompositorThread(
+AnimationCollection::CanPerformOnCompositorThread(
   CanAnimateFlags aFlags) const
 {
   nsIFrame* frame = nsLayoutUtils::GetStyleFrame(mElement);
@@ -651,7 +646,7 @@ AnimationPlayerCollection::CanPerformOnCompositorThread(
 }
 
 void
-AnimationPlayerCollection::PostUpdateLayerAnimations()
+AnimationCollection::PostUpdateLayerAnimations()
 {
   nsCSSPropertySet propsHandled;
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
@@ -675,8 +670,7 @@ AnimationPlayerCollection::PostUpdateLayerAnimations()
 }
 
 bool
-AnimationPlayerCollection::HasAnimationOfProperty(
-  nsCSSProperty aProperty) const
+AnimationCollection::HasAnimationOfProperty(nsCSSProperty aProperty) const
 {
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
     const KeyframeEffectReadonly* effect = mPlayers[playerIdx]->GetEffect();
@@ -689,7 +683,7 @@ AnimationPlayerCollection::HasAnimationOfProperty(
 }
 
 mozilla::dom::Element*
-AnimationPlayerCollection::GetElementToRestyle() const
+AnimationCollection::GetElementToRestyle() const
 {
   if (IsForElement()) {
     return mElement;
@@ -715,7 +709,7 @@ AnimationPlayerCollection::GetElementToRestyle() const
 }
 
 void
-AnimationPlayerCollection::NotifyPlayerUpdated()
+AnimationCollection::NotifyPlayerUpdated()
 {
   // On the next flush, force us to update the style rule
   mNeedsRefreshes = true;
@@ -725,7 +719,7 @@ AnimationPlayerCollection::NotifyPlayerUpdated()
 }
 
 /* static */ void
-AnimationPlayerCollection::LogAsyncAnimationFailure(nsCString& aMessage,
+AnimationCollection::LogAsyncAnimationFailure(nsCString& aMessage,
                                                      const nsIContent* aContent)
 {
   if (aContent) {
@@ -745,11 +739,11 @@ AnimationPlayerCollection::LogAsyncAnimationFailure(nsCString& aMessage,
 }
 
 /*static*/ void
-AnimationPlayerCollection::PropertyDtor(void *aObject, nsIAtom *aPropertyName,
-                                         void *aPropertyValue, void *aData)
+AnimationCollection::PropertyDtor(void *aObject, nsIAtom *aPropertyName,
+                                  void *aPropertyValue, void *aData)
 {
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(aPropertyValue);
+  AnimationCollection* collection =
+    static_cast<AnimationCollection*>(aPropertyValue);
 #ifdef DEBUG
   MOZ_ASSERT(!collection->mCalledPropertyDtor, "can't call dtor twice");
   collection->mCalledPropertyDtor = true;
@@ -758,7 +752,7 @@ AnimationPlayerCollection::PropertyDtor(void *aObject, nsIAtom *aPropertyName,
 }
 
 void
-AnimationPlayerCollection::Tick()
+AnimationCollection::Tick()
 {
   for (size_t playerIdx = 0, playerEnd = mPlayers.Length();
        playerIdx != playerEnd; playerIdx++) {
@@ -767,8 +761,8 @@ AnimationPlayerCollection::Tick()
 }
 
 void
-AnimationPlayerCollection::EnsureStyleRuleFor(TimeStamp aRefreshTime,
-                                              EnsureStyleRuleFlags aFlags)
+AnimationCollection::EnsureStyleRuleFor(TimeStamp aRefreshTime,
+                                        EnsureStyleRuleFlags aFlags)
 {
   if (!mNeedsRefreshes) {
     mStyleRuleRefreshTime = aRefreshTime;
@@ -825,7 +819,7 @@ AnimationPlayerCollection::EnsureStyleRuleFor(TimeStamp aRefreshTime,
 }
 
 bool
-AnimationPlayerCollection::CanThrottleTransformChanges(TimeStamp aTime)
+AnimationCollection::CanThrottleTransformChanges(TimeStamp aTime)
 {
   if (!nsLayoutUtils::AreAsyncAnimationsEnabled()) {
     return false;
@@ -864,7 +858,7 @@ AnimationPlayerCollection::CanThrottleTransformChanges(TimeStamp aTime)
 }
 
 bool
-AnimationPlayerCollection::CanThrottleAnimation(TimeStamp aTime)
+AnimationCollection::CanThrottleAnimation(TimeStamp aTime)
 {
   nsIFrame* frame = nsLayoutUtils::GetStyleFrame(mElement);
   if (!frame) {
@@ -895,15 +889,14 @@ AnimationPlayerCollection::CanThrottleAnimation(TimeStamp aTime)
 }
 
 void
-AnimationPlayerCollection::UpdateAnimationGeneration(
-  nsPresContext* aPresContext)
+AnimationCollection::UpdateAnimationGeneration(nsPresContext* aPresContext)
 {
   mAnimationGeneration =
     aPresContext->RestyleManager()->GetAnimationGeneration();
 }
 
 void
-AnimationPlayerCollection::UpdateCheckGeneration(
+AnimationCollection::UpdateCheckGeneration(
   nsPresContext* aPresContext)
 {
   mCheckGeneration =
@@ -911,7 +904,7 @@ AnimationPlayerCollection::UpdateCheckGeneration(
 }
 
 bool
-AnimationPlayerCollection::HasCurrentAnimations() const
+AnimationCollection::HasCurrentAnimations() const
 {
   for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
     if (mPlayers[playerIdx]->HasCurrentEffect()) {
@@ -923,7 +916,7 @@ AnimationPlayerCollection::HasCurrentAnimations() const
 }
 
 bool
-AnimationPlayerCollection::HasCurrentAnimationsForProperties(
+AnimationCollection::HasCurrentAnimationsForProperties(
                               const nsCSSProperty* aProperties,
                               size_t aPropertyCount) const
 {
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index 176c302a923..55efd75733c 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -33,7 +33,7 @@ class nsStyleChangeList;
 namespace mozilla {
 
 class RestyleTracker;
-struct AnimationPlayerCollection;
+struct AnimationCollection;
 
 namespace css {
 
@@ -82,7 +82,7 @@ public:
   // elements.
   void AddStyleUpdatesTo(mozilla::RestyleTracker& aTracker);
 
-  AnimationPlayerCollection*
+  AnimationCollection*
   GetAnimations(dom::Element *aElement,
                 nsCSSPseudoElements::Type aPseudoType,
                 bool aCreateIfNeeded);
@@ -102,7 +102,7 @@ public:
 
   // Notify this manager that one of its collections of animation players,
   // has been updated.
-  void NotifyCollectionUpdated(AnimationPlayerCollection& aCollection);
+  void NotifyCollectionUpdated(AnimationCollection& aCollection);
 
   enum FlushFlags {
     Can_Throttle,
@@ -141,9 +141,9 @@ protected:
   virtual ~CommonAnimationManager();
 
   // For ElementCollectionRemoved
-  friend struct mozilla::AnimationPlayerCollection;
+  friend struct mozilla::AnimationCollection;
 
-  void AddElementCollection(AnimationPlayerCollection* aCollection);
+  void AddElementCollection(AnimationCollection* aCollection);
   void ElementCollectionRemoved() { MaybeStartOrStopObservingRefreshDriver(); }
   void RemoveAllElementCollections();
 
@@ -162,7 +162,7 @@ protected:
     return false;
   }
 
-  static AnimationPlayerCollection*
+  static AnimationCollection*
   GetAnimationsForCompositor(nsIContent* aContent,
                              nsIAtom* aElementProperty,
                              nsCSSProperty aProperty);
@@ -230,10 +230,10 @@ enum EnsureStyleRuleFlags {
   EnsureStyleRule_IsNotThrottled
 };
 
-struct AnimationPlayerCollection : public PRCList
+struct AnimationCollection : public PRCList
 {
-  AnimationPlayerCollection(dom::Element *aElement, nsIAtom *aElementProperty,
-                            mozilla::css::CommonAnimationManager *aManager)
+  AnimationCollection(dom::Element *aElement, nsIAtom *aElementProperty,
+                      mozilla::css::CommonAnimationManager *aManager)
     : mElement(aElement)
     , mElementProperty(aElementProperty)
     , mManager(aManager)
@@ -244,14 +244,14 @@ struct AnimationPlayerCollection : public PRCList
     , mCalledPropertyDtor(false)
 #endif
   {
-    MOZ_COUNT_CTOR(AnimationPlayerCollection);
+    MOZ_COUNT_CTOR(AnimationCollection);
     PR_INIT_CLIST(this);
   }
-  ~AnimationPlayerCollection()
+  ~AnimationCollection()
   {
     MOZ_ASSERT(mCalledPropertyDtor,
                "must call destructor through element property dtor");
-    MOZ_COUNT_DTOR(AnimationPlayerCollection);
+    MOZ_COUNT_DTOR(AnimationCollection);
     PR_REMOVE_LINK(this);
     mManager->ElementCollectionRemoved();
   }
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index fc5a4b72c97..fcc0bf9fa32 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -202,8 +202,7 @@ CSSAnimationPlayer::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
 }
 
 void
-nsAnimationManager::UpdateStyleAndEvents(AnimationPlayerCollection*
-                                           aCollection,
+nsAnimationManager::UpdateStyleAndEvents(AnimationCollection* aCollection,
                                          TimeStamp aRefreshTime,
                                          EnsureStyleRuleFlags aFlags)
 {
@@ -212,7 +211,7 @@ nsAnimationManager::UpdateStyleAndEvents(AnimationPlayerCollection*
 }
 
 void
-nsAnimationManager::QueueEvents(AnimationPlayerCollection* aCollection,
+nsAnimationManager::QueueEvents(AnimationCollection* aCollection,
                                 EventArray& aEventsToDispatch)
 {
   for (size_t playerIdx = aCollection->mPlayers.Length(); playerIdx-- != 0; ) {
@@ -224,7 +223,7 @@ nsAnimationManager::QueueEvents(AnimationPlayerCollection* aCollection,
 }
 
 void
-nsAnimationManager::MaybeUpdateCascadeResults(AnimationPlayerCollection* aCollection)
+nsAnimationManager::MaybeUpdateCascadeResults(AnimationCollection* aCollection)
 {
   for (size_t playerIdx = aCollection->mPlayers.Length(); playerIdx-- != 0; ) {
     CSSAnimationPlayer* player =
@@ -280,7 +279,7 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
   // style change, but also not in an animation restyle.
 
   const nsStyleDisplay* disp = aStyleContext->StyleDisplay();
-  AnimationPlayerCollection* collection =
+  AnimationCollection* collection =
     GetAnimations(aElement, aStyleContext->GetPseudoType(), false);
   if (!collection &&
       disp->mAnimationNameCount == 1 &&
@@ -738,7 +737,7 @@ nsAnimationManager::BuildSegment(InfallibleTArray<AnimationPropertySegment>&
 /* static */ void
 nsAnimationManager::UpdateCascadeResults(
                       nsStyleContext* aStyleContext,
-                      AnimationPlayerCollection* aElementAnimations)
+                      AnimationCollection* aElementAnimations)
 {
   /*
    * Figure out which properties we need to examine.
@@ -791,10 +790,9 @@ nsAnimationManager::UpdateCascadeResults(
    * another.
    *
    * We iterate from the last animation to the first, just like we do
-   * when calling ComposeStyle from
-   * AnimationPlayerCollection::EnsureStyleRuleFor.  Later animations
-   * override earlier ones, so we add properties to the set of
-   * overridden properties as we encounter them, if the animation is
+   * when calling ComposeStyle from AnimationCollection::EnsureStyleRuleFor.
+   * Later animations override earlier ones, so we add properties to the set
+   * of overridden properties as we encounter them, if the animation is
    * currently in effect.
    */
 
@@ -874,15 +872,14 @@ nsAnimationManager::FlushAnimations(FlushFlags aFlags)
   for (PRCList *l = PR_LIST_HEAD(&mElementCollections);
        l != &mElementCollections;
        l = PR_NEXT_LINK(l)) {
-    AnimationPlayerCollection* collection =
-      static_cast<AnimationPlayerCollection*>(l);
+    AnimationCollection* collection = static_cast<AnimationCollection*>(l);
 
     nsAutoAnimationMutationBatch mb(collection->mElement);
 
     collection->Tick();
     bool canThrottleTick = aFlags == Can_Throttle &&
       collection->CanPerformOnCompositorThread(
-        AnimationPlayerCollection::CanAnimateFlags(0)) &&
+        AnimationCollection::CanAnimateFlags(0)) &&
       collection->CanThrottleAnimation(now);
 
     nsRefPtr<css::AnimValuesStyleRule> oldStyleRule = collection->mStyleRule;
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index 6210623e432..b3f2b64ce10 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -165,21 +165,20 @@ public:
   {
   }
 
-  static mozilla::AnimationPlayerCollection*
+  static mozilla::AnimationCollection*
   GetAnimationsForCompositor(nsIContent* aContent, nsCSSProperty aProperty)
   {
     return mozilla::css::CommonAnimationManager::GetAnimationsForCompositor(
       aContent, nsGkAtoms::animationsProperty, aProperty);
   }
 
-  void UpdateStyleAndEvents(mozilla::AnimationPlayerCollection* aEA,
+  void UpdateStyleAndEvents(mozilla::AnimationCollection* aEA,
                             mozilla::TimeStamp aRefreshTime,
                             mozilla::EnsureStyleRuleFlags aFlags);
-  void QueueEvents(mozilla::AnimationPlayerCollection* aEA,
+  void QueueEvents(mozilla::AnimationCollection* aEA,
                    mozilla::EventArray &aEventsToDispatch);
 
-  void MaybeUpdateCascadeResults(mozilla::AnimationPlayerCollection*
-                                   aCollection);
+  void MaybeUpdateCascadeResults(mozilla::AnimationCollection* aCollection);
 
   // nsIStyleRuleProcessor (parts)
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf)
@@ -248,7 +247,7 @@ private:
                     float aToKey, nsStyleContext* aToContext);
 
   static void UpdateCascadeResults(nsStyleContext* aStyleContext,
-                                   mozilla::AnimationPlayerCollection*
+                                   mozilla::AnimationCollection*
                                      aElementAnimations);
 
   // The guts of DispatchEvents
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 23efca28861..ca9378e77cd 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -183,8 +183,7 @@ nsTransitionManager::StyleContextChanged(dom::Element *aElement,
     aElement = aElement->GetParent()->AsElement();
   }
 
-  AnimationPlayerCollection* collection =
-    GetAnimations(aElement, pseudoType, false);
+  AnimationCollection* collection = GetAnimations(aElement, pseudoType, false);
   if (!collection &&
       disp->mTransitionPropertyCount == 1 &&
       disp->mTransitions[0].GetCombinedDuration() <= 0.0f) {
@@ -384,7 +383,7 @@ nsTransitionManager::ConsiderStartingTransition(
   nsCSSProperty aProperty,
   const StyleTransition& aTransition,
   dom::Element* aElement,
-  AnimationPlayerCollection*& aElementTransitions,
+  AnimationCollection*& aElementTransitions,
   nsStyleContext* aOldStyleContext,
   nsStyleContext* aNewStyleContext,
   bool* aStartedAny,
@@ -611,10 +610,9 @@ nsTransitionManager::ConsiderStartingTransition(
 
 void
 nsTransitionManager::UpdateCascadeResultsWithTransitions(
-                       AnimationPlayerCollection* aTransitions)
+                       AnimationCollection* aTransitions)
 {
-  AnimationPlayerCollection* animations =
-    mPresContext->AnimationManager()->
+  AnimationCollection* animations = mPresContext->AnimationManager()->
       GetAnimations(aTransitions->mElement,
                     aTransitions->PseudoElementType(), false);
   UpdateCascadeResults(aTransitions, animations);
@@ -622,10 +620,9 @@ nsTransitionManager::UpdateCascadeResultsWithTransitions(
 
 void
 nsTransitionManager::UpdateCascadeResultsWithAnimations(
-                       AnimationPlayerCollection* aAnimations)
+                       AnimationCollection* aAnimations)
 {
-  AnimationPlayerCollection* transitions =
-    mPresContext->TransitionManager()->
+  AnimationCollection* transitions = mPresContext->TransitionManager()->
       GetAnimations(aAnimations->mElement,
                     aAnimations->PseudoElementType(), false);
   UpdateCascadeResults(transitions, aAnimations);
@@ -633,12 +630,12 @@ nsTransitionManager::UpdateCascadeResultsWithAnimations(
 
 void
 nsTransitionManager::UpdateCascadeResultsWithAnimationsToBeDestroyed(
-                       const AnimationPlayerCollection* aAnimations)
+                       const AnimationCollection* aAnimations)
 {
   // aAnimations is about to be destroyed.  So get transitions from it,
   // but then don't pass it to UpdateCascadeResults, since it has
   // information that may now be incorrect.
-  AnimationPlayerCollection* transitions =
+  AnimationCollection* transitions =
     mPresContext->TransitionManager()->
       GetAnimations(aAnimations->mElement,
                     aAnimations->PseudoElementType(), false);
@@ -646,9 +643,8 @@ nsTransitionManager::UpdateCascadeResultsWithAnimationsToBeDestroyed(
 }
 
 void
-nsTransitionManager::UpdateCascadeResults(
-                       AnimationPlayerCollection* aTransitions,
-                       AnimationPlayerCollection* aAnimations)
+nsTransitionManager::UpdateCascadeResults(AnimationCollection* aTransitions,
+                                          AnimationCollection* aAnimations)
 {
   if (!aTransitions) {
     // Nothing to do.
@@ -785,8 +781,7 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
   {
     PRCList *next = PR_LIST_HEAD(&mElementCollections);
     while (next != &mElementCollections) {
-      AnimationPlayerCollection* collection =
-        static_cast<AnimationPlayerCollection*>(next);
+      AnimationCollection* collection = static_cast<AnimationCollection*>(next);
       next = PR_NEXT_LINK(next);
 
       nsAutoAnimationMutationBatch mb(collection->mElement);
@@ -794,7 +789,7 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
       collection->Tick();
       bool canThrottleTick = aFlags == Can_Throttle &&
         collection->CanPerformOnCompositorThread(
-          AnimationPlayerCollection::CanAnimateFlags(0)) &&
+          AnimationCollection::CanAnimateFlags(0)) &&
         collection->CanThrottleAnimation(now);
 
       MOZ_ASSERT(collection->mElement->GetCrossShadowCurrentDoc() ==
diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
index 417162e7362..0bab8d20c50 100644
--- a/layout/style/nsTransitionManager.h
+++ b/layout/style/nsTransitionManager.h
@@ -111,9 +111,9 @@ public:
   {
   }
 
-  typedef mozilla::AnimationPlayerCollection AnimationPlayerCollection;
+  typedef mozilla::AnimationCollection AnimationCollection;
 
-  static AnimationPlayerCollection*
+  static AnimationCollection*
   GetAnimationsForCompositor(nsIContent* aContent, nsCSSProperty aProperty)
   {
     return mozilla::css::CommonAnimationManager::GetAnimationsForCompositor(
@@ -138,14 +138,12 @@ public:
                            nsStyleContext *aOldStyleContext,
                            nsRefPtr<nsStyleContext>* aNewStyleContext /* inout */);
 
-  void UpdateCascadeResultsWithTransitions(
-         AnimationPlayerCollection* aTransitions);
-  void UpdateCascadeResultsWithAnimations(
-         AnimationPlayerCollection* aAnimations);
+  void UpdateCascadeResultsWithTransitions(AnimationCollection* aTransitions);
+  void UpdateCascadeResultsWithAnimations(AnimationCollection* aAnimations);
   void UpdateCascadeResultsWithAnimationsToBeDestroyed(
-         const AnimationPlayerCollection* aAnimations);
-  void UpdateCascadeResults(AnimationPlayerCollection* aTransitions,
-                            AnimationPlayerCollection* aAnimations);
+         const AnimationCollection* aAnimations);
+  void UpdateCascadeResults(AnimationCollection* aTransitions,
+                            AnimationCollection* aAnimations);
 
   void SetInAnimationOnlyStyleUpdate(bool aInAnimationOnlyUpdate) {
     mInAnimationOnlyStyleUpdate = aInAnimationOnlyUpdate;
@@ -181,7 +179,7 @@ private:
   ConsiderStartingTransition(nsCSSProperty aProperty,
                              const mozilla::StyleTransition& aTransition,
                              mozilla::dom::Element* aElement,
-                             AnimationPlayerCollection*& aElementTransitions,
+                             AnimationCollection*& aElementTransitions,
                              nsStyleContext* aOldStyleContext,
                              nsStyleContext* aNewStyleContext,
                              bool* aStartedAny,

From d8ca19874e4d74c68cd365235555f21188d3ccce Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:10 +0900
Subject: [PATCH 61/80] Bug 1154615 part 6 - Rename references to players
 within layout/; r=jwatt

We will rename CSSAnimationPlayer/CSSTransitionPlayer in a separate patch
---
 dom/animation/Animation.cpp          |   2 +-
 dom/base/Element.cpp                 |  12 +--
 layout/base/nsDisplayList.cpp        |  39 +++++----
 layout/base/nsLayoutUtils.cpp        |   8 +-
 layout/style/AnimationCommon.cpp     |  56 ++++++-------
 layout/style/AnimationCommon.h       |  12 +--
 layout/style/nsAnimationManager.cpp  | 119 ++++++++++++++-------------
 layout/style/nsAnimationManager.h    |   2 +-
 layout/style/nsTransitionManager.cpp |  83 +++++++++----------
 9 files changed, 166 insertions(+), 167 deletions(-)

diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index d7546c00568..fc5d794fb8b 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -731,7 +731,7 @@ Animation::PostUpdate()
 {
   AnimationCollection* collection = GetCollection();
   if (collection) {
-    collection->NotifyPlayerUpdated();
+    collection->NotifyAnimationUpdated();
   }
 }
 
diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 45ecb60f9d6..ffd2cfaed9f 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -3203,12 +3203,12 @@ Element::GetAnimations(nsTArray<nsRefPtr<Animation>>& aAnimations)
     if (!collection) {
       continue;
     }
-    for (size_t playerIdx = 0;
-         playerIdx < collection->mPlayers.Length();
-         playerIdx++) {
-      Animation* player = collection->mPlayers[playerIdx];
-      if (player->IsRelevant()) {
-        aAnimations.AppendElement(player);
+    for (size_t animIdx = 0;
+         animIdx < collection->mAnimations.Length();
+         animIdx++) {
+      Animation* anim = collection->mAnimations[animIdx];
+      if (anim->IsRelevant()) {
+        aAnimations.AppendElement(anim);
       }
     }
   }
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index e5d0237cbf9..9a49811758f 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -348,13 +348,12 @@ ToTimingFunction(const ComputedTimingFunction& aCTF)
 
 static void
 AddAnimationForProperty(nsIFrame* aFrame, const AnimationProperty& aProperty,
-                        dom::Animation* aPlayer, Layer* aLayer,
+                        dom::Animation* aAnimation, Layer* aLayer,
                         AnimationData& aData, bool aPending)
 {
   MOZ_ASSERT(aLayer->AsContainerLayer(), "Should only animate ContainerLayer");
-  MOZ_ASSERT(aPlayer->GetEffect(),
-             "Should not be adding an animation for a player without"
-             " an effect");
+  MOZ_ASSERT(aAnimation->GetEffect(),
+             "Should not be adding an animation without an effect");
   nsStyleContext* styleContext = aFrame->StyleContext();
   nsPresContext* presContext = aFrame->PresContext();
   nsRect bounds = nsDisplayTransform::GetFrameBoundsForTransform(aFrame);
@@ -364,13 +363,13 @@ AddAnimationForProperty(nsIFrame* aFrame, const AnimationProperty& aProperty,
     aLayer->AddAnimationForNextTransaction() :
     aLayer->AddAnimation();
 
-  const AnimationTiming& timing = aPlayer->GetEffect()->Timing();
-  Nullable<TimeDuration> startTime = aPlayer->GetCurrentOrPendingStartTime();
+  const AnimationTiming& timing = aAnimation->GetEffect()->Timing();
+  Nullable<TimeDuration> startTime = aAnimation->GetCurrentOrPendingStartTime();
   animation->startTime() = startTime.IsNull()
                            ? TimeStamp()
-                           : aPlayer->Timeline()->ToTimeStamp(
+                           : aAnimation->Timeline()->ToTimeStamp(
                               startTime.Value() + timing.mDelay);
-  animation->initialCurrentTime() = aPlayer->GetCurrentTime().Value()
+  animation->initialCurrentTime() = aAnimation->GetCurrentTime().Value()
                                     - timing.mDelay;
   animation->duration() = timing.mIterationDuration;
   animation->iterationCount() = timing.mIterationCount;
@@ -407,7 +406,7 @@ AddAnimationForProperty(nsIFrame* aFrame, const AnimationProperty& aProperty,
 
 static void
 AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
-                         AnimationPlayerPtrArray& aPlayers,
+                         AnimationPtrArray& aAnimations,
                          Layer* aLayer, AnimationData& aData,
                          bool aPending)
 {
@@ -416,13 +415,13 @@ AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
              "inconsistent property flags");
 
   // Add from first to last (since last overrides)
-  for (size_t playerIdx = 0; playerIdx < aPlayers.Length(); playerIdx++) {
-    dom::Animation* player = aPlayers[playerIdx];
-    if (!player->IsPlaying()) {
+  for (size_t animIdx = 0; animIdx < aAnimations.Length(); animIdx++) {
+    dom::Animation* anim = aAnimations[animIdx];
+    if (!anim->IsPlaying()) {
       continue;
     }
-    dom::KeyframeEffectReadonly* effect = player->GetEffect();
-    MOZ_ASSERT(effect, "A playing player should have an effect");
+    dom::KeyframeEffectReadonly* effect = anim->GetEffect();
+    MOZ_ASSERT(effect, "A playing animation should have an effect");
     const AnimationProperty* property =
       effect->GetAnimationOfProperty(aProperty);
     if (!property) {
@@ -450,15 +449,15 @@ AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
     // Instead we leave the animation running on the main thread and the
     // next time the refresh driver is advanced it will trigger any pending
     // animations.
-    if (player->PlayState() == AnimationPlayState::Pending) {
-      nsRefreshDriver* driver = player->Timeline()->GetRefreshDriver();
+    if (anim->PlayState() == AnimationPlayState::Pending) {
+      nsRefreshDriver* driver = anim->Timeline()->GetRefreshDriver();
       if (driver && driver->IsTestControllingRefreshesEnabled()) {
         continue;
       }
     }
 
-    AddAnimationForProperty(aFrame, *property, player, aLayer, aData, aPending);
-    player->SetIsRunningOnCompositor();
+    AddAnimationForProperty(aFrame, *property, anim, aLayer, aData, aPending);
+    anim->SetIsRunningOnCompositor();
   }
 }
 
@@ -566,12 +565,12 @@ nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(Layer* aLayer,
   // When both are running, animations override transitions.  We want
   // to add the ones that override last.
   if (transitions) {
-    AddAnimationsForProperty(aFrame, aProperty, transitions->mPlayers,
+    AddAnimationsForProperty(aFrame, aProperty, transitions->mAnimations,
                              aLayer, data, pending);
   }
 
   if (animations) {
-    AddAnimationsForProperty(aFrame, aProperty, animations->mPlayers,
+    AddAnimationsForProperty(aFrame, aProperty, animations->mAnimations,
                              aLayer, data, pending);
   }
 }
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 7fe5e0e2040..13465eac8c4 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -500,12 +500,12 @@ GetMinAndMaxScaleForAnimationProperty(nsIContent* aContent,
                                       gfxSize& aMaxScale,
                                       gfxSize& aMinScale)
 {
-  for (size_t playerIdx = aAnimations->mPlayers.Length(); playerIdx-- != 0; ) {
-    dom::Animation* player = aAnimations->mPlayers[playerIdx];
-    if (!player->GetEffect() || player->GetEffect()->IsFinishedTransition()) {
+  for (size_t animIdx = aAnimations->mAnimations.Length(); animIdx-- != 0; ) {
+    dom::Animation* anim = aAnimations->mAnimations[animIdx];
+    if (!anim->GetEffect() || anim->GetEffect()->IsFinishedTransition()) {
       continue;
     }
-    dom::KeyframeEffectReadonly* effect = player->GetEffect();
+    dom::KeyframeEffectReadonly* effect = anim->GetEffect();
     for (size_t propIdx = effect->Properties().Length(); propIdx-- != 0; ) {
       AnimationProperty& prop = effect->Properties()[propIdx];
       if (prop.mProperty == eCSSProperty_transform) {
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index 48d1f0351c9..1cef007361b 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -595,14 +595,14 @@ AnimationCollection::CanPerformOnCompositorThread(
     return false;
   }
 
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const Animation* player = mPlayers[playerIdx];
-    if (!player->IsPlaying()) {
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    const Animation* anim = mAnimations[animIdx];
+    if (!anim->IsPlaying()) {
       continue;
     }
 
-    const KeyframeEffectReadonly* effect = player->GetEffect();
-    MOZ_ASSERT(effect, "A playing player should have an effect");
+    const KeyframeEffectReadonly* effect = anim->GetEffect();
+    MOZ_ASSERT(effect, "A playing animation should have an effect");
 
     for (size_t propIdx = 0, propEnd = effect->Properties().Length();
          propIdx != propEnd; ++propIdx) {
@@ -614,14 +614,14 @@ AnimationCollection::CanPerformOnCompositorThread(
   }
 
   bool existsProperty = false;
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const Animation* player = mPlayers[playerIdx];
-    if (!player->IsPlaying()) {
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    const Animation* anim = mAnimations[animIdx];
+    if (!anim->IsPlaying()) {
       continue;
     }
 
-    const KeyframeEffectReadonly* effect = player->GetEffect();
-    MOZ_ASSERT(effect, "A playing player should have an effect");
+    const KeyframeEffectReadonly* effect = anim->GetEffect();
+    MOZ_ASSERT(effect, "A playing animation should have an effect");
 
     existsProperty = existsProperty || effect->Properties().Length() > 0;
 
@@ -649,8 +649,8 @@ void
 AnimationCollection::PostUpdateLayerAnimations()
 {
   nsCSSPropertySet propsHandled;
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const auto& properties = mPlayers[playerIdx]->GetEffect()->Properties();
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    const auto& properties = mAnimations[animIdx]->GetEffect()->Properties();
     for (size_t propIdx = properties.Length(); propIdx-- != 0; ) {
       nsCSSProperty prop = properties[propIdx].mProperty;
       if (nsCSSProps::PropHasFlags(prop,
@@ -672,8 +672,8 @@ AnimationCollection::PostUpdateLayerAnimations()
 bool
 AnimationCollection::HasAnimationOfProperty(nsCSSProperty aProperty) const
 {
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const KeyframeEffectReadonly* effect = mPlayers[playerIdx]->GetEffect();
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    const KeyframeEffectReadonly* effect = mAnimations[animIdx]->GetEffect();
     if (effect && effect->HasAnimationOfProperty(aProperty) &&
         !effect->IsFinishedTransition()) {
       return true;
@@ -709,7 +709,7 @@ AnimationCollection::GetElementToRestyle() const
 }
 
 void
-AnimationCollection::NotifyPlayerUpdated()
+AnimationCollection::NotifyAnimationUpdated()
 {
   // On the next flush, force us to update the style rule
   mNeedsRefreshes = true;
@@ -754,9 +754,9 @@ AnimationCollection::PropertyDtor(void *aObject, nsIAtom *aPropertyName,
 void
 AnimationCollection::Tick()
 {
-  for (size_t playerIdx = 0, playerEnd = mPlayers.Length();
-       playerIdx != playerEnd; playerIdx++) {
-    mPlayers[playerIdx]->Tick();
+  for (size_t animIdx = 0, animEnd = mAnimations.Length();
+       animIdx != animEnd; animIdx++) {
+    mAnimations[animIdx]->Tick();
   }
 }
 
@@ -782,8 +782,8 @@ AnimationCollection::EnsureStyleRuleFor(TimeStamp aRefreshTime,
   // mode behavior). CanThrottle returns false for any finishing animations
   // so we can force style recalculation in that case.
   if (aFlags == EnsureStyleRule_IsThrottled) {
-    for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-      if (!mPlayers[playerIdx]->CanThrottle()) {
+    for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+      if (!mAnimations[animIdx]->CanThrottle()) {
         aFlags = EnsureStyleRule_IsNotThrottled;
         break;
       }
@@ -811,8 +811,8 @@ AnimationCollection::EnsureStyleRuleFor(TimeStamp aRefreshTime,
   // property has already been set, we don't leave it.
   nsCSSPropertySet properties;
 
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    mPlayers[playerIdx]->ComposeStyle(mStyleRule, properties, mNeedsRefreshes);
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    mAnimations[animIdx]->ComposeStyle(mStyleRule, properties, mNeedsRefreshes);
   }
 
   mManager->MaybeStartObservingRefreshDriver();
@@ -906,8 +906,8 @@ AnimationCollection::UpdateCheckGeneration(
 bool
 AnimationCollection::HasCurrentAnimations() const
 {
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    if (mPlayers[playerIdx]->HasCurrentEffect()) {
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    if (mAnimations[animIdx]->HasCurrentEffect()) {
       return true;
     }
   }
@@ -920,11 +920,11 @@ AnimationCollection::HasCurrentAnimationsForProperties(
                               const nsCSSProperty* aProperties,
                               size_t aPropertyCount) const
 {
-  for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-    const Animation& player = *mPlayers[playerIdx];
-    const KeyframeEffectReadonly* effect = player.GetEffect();
+  for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+    const Animation& anim = *mAnimations[animIdx];
+    const KeyframeEffectReadonly* effect = anim.GetEffect();
     if (effect &&
-        effect->IsCurrent(player) &&
+        effect->IsCurrent(anim) &&
         effect->HasAnimationOfProperties(aProperties, aPropertyCount)) {
       return true;
     }
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index 55efd75733c..c3e2a866fff 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -100,7 +100,7 @@ public:
     return false;
   }
 
-  // Notify this manager that one of its collections of animation players,
+  // Notify this manager that one of its collections of animations,
   // has been updated.
   void NotifyCollectionUpdated(AnimationCollection& aCollection);
 
@@ -223,7 +223,7 @@ private:
 
 } /* end css sub-namespace */
 
-typedef InfallibleTArray<nsRefPtr<dom::Animation>> AnimationPlayerPtrArray;
+typedef InfallibleTArray<nsRefPtr<dom::Animation>> AnimationPtrArray;
 
 enum EnsureStyleRuleFlags {
   EnsureStyleRule_IsThrottled,
@@ -258,8 +258,8 @@ struct AnimationCollection : public PRCList
 
   void Destroy()
   {
-    for (size_t playerIdx = mPlayers.Length(); playerIdx-- != 0; ) {
-      mPlayers[playerIdx]->Cancel();
+    for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+      mAnimations[animIdx]->Cancel();
     }
     // This will call our destructor.
     mElement->DeleteProperty(mElementProperty);
@@ -374,7 +374,7 @@ struct AnimationCollection : public PRCList
     }
   }
 
-  void NotifyPlayerUpdated();
+  void NotifyAnimationUpdated();
 
   static void LogAsyncAnimationFailure(nsCString& aMessage,
                                        const nsIContent* aContent = nullptr);
@@ -387,7 +387,7 @@ struct AnimationCollection : public PRCList
 
   mozilla::css::CommonAnimationManager *mManager;
 
-  mozilla::AnimationPlayerPtrArray mPlayers;
+  mozilla::AnimationPtrArray mAnimations;
 
   // This style rule contains the style data for currently animating
   // values.  It only matches when styling with animation.  When we
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index fcc0bf9fa32..a102b091390 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -214,22 +214,22 @@ void
 nsAnimationManager::QueueEvents(AnimationCollection* aCollection,
                                 EventArray& aEventsToDispatch)
 {
-  for (size_t playerIdx = aCollection->mPlayers.Length(); playerIdx-- != 0; ) {
-    CSSAnimationPlayer* player =
-      aCollection->mPlayers[playerIdx]->AsCSSAnimationPlayer();
-    MOZ_ASSERT(player, "Expected a collection of CSS Animation players");
-    player->QueueEvents(aEventsToDispatch);
+  for (size_t animIdx = aCollection->mAnimations.Length(); animIdx-- != 0; ) {
+    CSSAnimationPlayer* anim =
+      aCollection->mAnimations[animIdx]->AsCSSAnimationPlayer();
+    MOZ_ASSERT(anim, "Expected a collection of CSS Animations");
+    anim->QueueEvents(aEventsToDispatch);
   }
 }
 
 void
 nsAnimationManager::MaybeUpdateCascadeResults(AnimationCollection* aCollection)
 {
-  for (size_t playerIdx = aCollection->mPlayers.Length(); playerIdx-- != 0; ) {
-    CSSAnimationPlayer* player =
-      aCollection->mPlayers[playerIdx]->AsCSSAnimationPlayer();
+  for (size_t animIdx = aCollection->mAnimations.Length(); animIdx-- != 0; ) {
+    CSSAnimationPlayer* anim =
+      aCollection->mAnimations[animIdx]->AsCSSAnimationPlayer();
 
-    if (player->IsInEffect() != player->mInEffectForCascadeResults) {
+    if (anim->IsInEffect() != anim->mInEffectForCascadeResults) {
       // Update our own cascade results.
       mozilla::dom::Element* element = aCollection->GetElementToRestyle();
       if (element) {
@@ -291,12 +291,12 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
 
   // build the animations list
   dom::DocumentTimeline* timeline = aElement->OwnerDoc()->Timeline();
-  AnimationPlayerPtrArray newPlayers;
+  AnimationPtrArray newAnimations;
   if (!aStyleContext->IsInDisplayNoneSubtree()) {
-    BuildAnimations(aStyleContext, aElement, timeline, newPlayers);
+    BuildAnimations(aStyleContext, aElement, timeline, newAnimations);
   }
 
-  if (newPlayers.IsEmpty()) {
+  if (newAnimations.IsEmpty()) {
     if (collection) {
       // There might be transitions that run now that animations don't
       // override them.
@@ -323,10 +323,10 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
     // In order to honor what the spec said, we'd copy more data over
     // (or potentially optimize BuildAnimations to avoid rebuilding it
     // in the first place).
-    if (!collection->mPlayers.IsEmpty()) {
+    if (!collection->mAnimations.IsEmpty()) {
 
-      for (size_t newIdx = newPlayers.Length(); newIdx-- != 0;) {
-        Animation* newPlayer = newPlayers[newIdx];
+      for (size_t newIdx = newAnimations.Length(); newIdx-- != 0;) {
+        Animation* newAnim = newAnimations[newIdx];
 
         // Find the matching animation with this name in the old list
         // of animations.  We iterate through both lists in a backwards
@@ -334,19 +334,19 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
         // the new list of animations with a given name than in the old
         // list, it will be the animations towards the of the beginning of
         // the list that do not match and are treated as new animations.
-        nsRefPtr<CSSAnimationPlayer> oldPlayer;
-        size_t oldIdx = collection->mPlayers.Length();
+        nsRefPtr<CSSAnimationPlayer> oldAnim;
+        size_t oldIdx = collection->mAnimations.Length();
         while (oldIdx-- != 0) {
           CSSAnimationPlayer* a =
-            collection->mPlayers[oldIdx]->AsCSSAnimationPlayer();
+            collection->mAnimations[oldIdx]->AsCSSAnimationPlayer();
           MOZ_ASSERT(a, "All players in the CSS Animation collection should"
                         " be CSSAnimationPlayer objects");
-          if (a->Name() == newPlayer->Name()) {
-            oldPlayer = a;
+          if (a->Name() == newAnim->Name()) {
+            oldAnim = a;
             break;
           }
         }
-        if (!oldPlayer) {
+        if (!oldAnim) {
           continue;
         }
 
@@ -354,9 +354,9 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
 
         // Update the old from the new so we can keep the original object
         // identity (and any expando properties attached to it).
-        if (oldPlayer->GetEffect() && newPlayer->GetEffect()) {
-          KeyframeEffectReadonly* oldEffect = oldPlayer->GetEffect();
-          KeyframeEffectReadonly* newEffect = newPlayer->GetEffect();
+        if (oldAnim->GetEffect() && newAnim->GetEffect()) {
+          KeyframeEffectReadonly* oldEffect = oldAnim->GetEffect();
+          KeyframeEffectReadonly* newEffect = newAnim->GetEffect();
           animationChanged =
             oldEffect->Timing() != newEffect->Timing() ||
             oldEffect->Properties() != newEffect->Properties();
@@ -365,56 +365,56 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
         }
 
         // Reset compositor state so animation will be re-synchronized.
-        oldPlayer->ClearIsRunningOnCompositor();
+        oldAnim->ClearIsRunningOnCompositor();
 
         // Handle changes in play state.
         // CSSAnimationPlayer takes care of override behavior so that,
         // for example, if the author has called pause(), that will
         // override the animation-play-state.
-        // (We should check newPlayer->IsStylePaused() but that requires
+        // (We should check newAnim->IsStylePaused() but that requires
         //  downcasting to CSSAnimationPlayer and we happen to know that
-        //  newPlayer will only ever be paused by calling PauseFromStyle
+        //  newAnim will only ever be paused by calling PauseFromStyle
         //  making IsPausedOrPausing synonymous in this case.)
-        if (!oldPlayer->IsStylePaused() && newPlayer->IsPausedOrPausing()) {
-          oldPlayer->PauseFromStyle();
+        if (!oldAnim->IsStylePaused() && newAnim->IsPausedOrPausing()) {
+          oldAnim->PauseFromStyle();
           animationChanged = true;
-        } else if (oldPlayer->IsStylePaused() &&
-                   !newPlayer->IsPausedOrPausing()) {
-          oldPlayer->PlayFromStyle();
+        } else if (oldAnim->IsStylePaused() &&
+                   !newAnim->IsPausedOrPausing()) {
+          oldAnim->PlayFromStyle();
           animationChanged = true;
         }
 
         if (animationChanged) {
-          nsNodeUtils::AnimationChanged(oldPlayer);
+          nsNodeUtils::AnimationChanged(oldAnim);
         }
 
         // Replace new animation with the (updated) old one and remove the
         // old one from the array so we don't try to match it any more.
         //
         // Although we're doing this while iterating this is safe because
-        // we're not changing the length of newPlayers and we've finished
+        // we're not changing the length of newAnimations and we've finished
         // iterating over the list of old iterations.
-        newPlayer->Cancel();
-        newPlayer = nullptr;
-        newPlayers.ReplaceElementAt(newIdx, oldPlayer);
-        collection->mPlayers.RemoveElementAt(oldIdx);
+        newAnim->Cancel();
+        newAnim = nullptr;
+        newAnimations.ReplaceElementAt(newIdx, oldAnim);
+        collection->mAnimations.RemoveElementAt(oldIdx);
 
         // We've touched the old animation's timing properties, so this
-        // could update the old player's relevance.
-        oldPlayer->UpdateRelevance();
+        // could update the old animation's relevance.
+        oldAnim->UpdateRelevance();
       }
     }
   } else {
     collection =
       GetAnimations(aElement, aStyleContext->GetPseudoType(), true);
   }
-  collection->mPlayers.SwapElements(newPlayers);
+  collection->mAnimations.SwapElements(newAnimations);
   collection->mNeedsRefreshes = true;
   collection->Tick();
 
   // Cancel removed animations
-  for (size_t newPlayerIdx = newPlayers.Length(); newPlayerIdx-- != 0; ) {
-    newPlayers[newPlayerIdx]->Cancel();
+  for (size_t newAnimIdx = newAnimations.Length(); newAnimIdx-- != 0; ) {
+    newAnimations[newAnimIdx]->Cancel();
   }
 
   UpdateCascadeResults(aStyleContext, collection);
@@ -488,9 +488,9 @@ void
 nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
                                     dom::Element* aTarget,
                                     dom::DocumentTimeline* aTimeline,
-                                    AnimationPlayerPtrArray& aPlayers)
+                                    AnimationPtrArray& aAnimations)
 {
-  MOZ_ASSERT(aPlayers.IsEmpty(), "expect empty array");
+  MOZ_ASSERT(aAnimations.IsEmpty(), "expect empty array");
 
   ResolvedStyleCache resolvedStyles;
 
@@ -516,7 +516,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
     }
 
     nsRefPtr<CSSAnimationPlayer> dest = new CSSAnimationPlayer(aTimeline);
-    aPlayers.AppendElement(dest);
+    aAnimations.AppendElement(dest);
 
     AnimationTiming timing;
     timing.mIterationDuration =
@@ -533,8 +533,9 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
     dest->SetEffect(destEffect);
 
     // Even in the case where we call PauseFromStyle below, we still need to
-    // call PlayFromStyle first. This is because a newly-created player is idle
-    // and has no effect until it is played (or otherwise given a start time).
+    // call PlayFromStyle first. This is because a newly-created animation is
+    // idle and has no effect until it is played (or otherwise given a start
+    // time).
     dest->PlayFromStyle();
 
     if (src.GetPlayState() == NS_STYLE_ANIMATION_PLAY_STATE_PAUSED) {
@@ -750,10 +751,10 @@ nsAnimationManager::UpdateCascadeResults(
   {
     nsCSSPropertySet propertiesToTrackAsSet;
 
-    for (size_t playerIdx = aElementAnimations->mPlayers.Length();
-         playerIdx-- != 0; ) {
-      const Animation* player = aElementAnimations->mPlayers[playerIdx];
-      const KeyframeEffectReadonly* effect = player->GetEffect();
+    for (size_t animIdx = aElementAnimations->mAnimations.Length();
+         animIdx-- != 0; ) {
+      const Animation* anim = aElementAnimations->mAnimations[animIdx];
+      const KeyframeEffectReadonly* effect = anim->GetEffect();
       if (!effect) {
         continue;
       }
@@ -797,13 +798,13 @@ nsAnimationManager::UpdateCascadeResults(
    */
 
   bool changed = false;
-  for (size_t playerIdx = aElementAnimations->mPlayers.Length();
-       playerIdx-- != 0; ) {
-    CSSAnimationPlayer* player =
-      aElementAnimations->mPlayers[playerIdx]->AsCSSAnimationPlayer();
-    KeyframeEffectReadonly* effect = player->GetEffect();
+  for (size_t animIdx = aElementAnimations->mAnimations.Length();
+       animIdx-- != 0; ) {
+    CSSAnimationPlayer* anim =
+      aElementAnimations->mAnimations[animIdx]->AsCSSAnimationPlayer();
+    KeyframeEffectReadonly* effect = anim->GetEffect();
 
-    player->mInEffectForCascadeResults = player->IsInEffect();
+    anim->mInEffectForCascadeResults = anim->IsInEffect();
 
     if (!effect) {
       continue;
@@ -823,7 +824,7 @@ nsAnimationManager::UpdateCascadeResults(
         }
         prop.mWinsInCascade = newWinsInCascade;
 
-        if (prop.mWinsInCascade && player->mInEffectForCascadeResults) {
+        if (prop.mWinsInCascade && anim->mInEffectForCascadeResults) {
           // This animation is in effect right now, so it overrides
           // earlier animations.  (For animations that aren't in effect,
           // we set mWinsInCascade as though they were, but they don't
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index b3f2b64ce10..dfdeb98927f 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -237,7 +237,7 @@ private:
   void BuildAnimations(nsStyleContext* aStyleContext,
                        mozilla::dom::Element* aTarget,
                        mozilla::dom::DocumentTimeline* aTimeline,
-                       mozilla::AnimationPlayerPtrArray& aAnimations);
+                       mozilla::AnimationPtrArray& aAnimations);
   bool BuildSegment(InfallibleTArray<mozilla::AnimationPropertySegment>&
                       aSegments,
                     nsCSSProperty aProperty,
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index ca9378e77cd..642acf8034e 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -312,14 +312,14 @@ nsTransitionManager::StyleContextChanged(dom::Element *aElement,
       }
     }
 
-    AnimationPlayerPtrArray& players = collection->mPlayers;
-    size_t i = players.Length();
+    AnimationPtrArray& animations = collection->mAnimations;
+    size_t i = animations.Length();
     MOZ_ASSERT(i != 0, "empty transitions list?");
     StyleAnimationValue currentValue;
     do {
       --i;
-      Animation* player = players[i];
-      dom::KeyframeEffectReadonly* effect = player->GetEffect();
+      Animation* anim = animations[i];
+      dom::KeyframeEffectReadonly* effect = anim->GetEffect();
       MOZ_ASSERT(effect && effect->Properties().Length() == 1,
                  "Should have one animation property for a transition");
       MOZ_ASSERT(effect && effect->Properties()[0].mSegments.Length() == 1,
@@ -338,15 +338,15 @@ nsTransitionManager::StyleContextChanged(dom::Element *aElement,
                                              currentValue) ||
           currentValue != segment.mToValue) {
         // stop the transition
-        if (!player->GetEffect()->IsFinishedTransition()) {
-          player->Cancel();
+        if (!anim->GetEffect()->IsFinishedTransition()) {
+          anim->Cancel();
           collection->UpdateAnimationGeneration(mPresContext);
         }
-        players.RemoveElementAt(i);
+        animations.RemoveElementAt(i);
       }
     } while (i != 0);
 
-    if (players.IsEmpty()) {
+    if (animations.IsEmpty()) {
       collection->Destroy();
       collection = nullptr;
     }
@@ -431,10 +431,10 @@ nsTransitionManager::ConsiderStartingTransition(
   size_t currentIndex = nsTArray<ElementPropertyTransition>::NoIndex;
   const ElementPropertyTransition *oldPT = nullptr;
   if (aElementTransitions) {
-    AnimationPlayerPtrArray& players = aElementTransitions->mPlayers;
-    for (size_t i = 0, i_end = players.Length(); i < i_end; ++i) {
+    AnimationPtrArray& animations = aElementTransitions->mAnimations;
+    for (size_t i = 0, i_end = animations.Length(); i < i_end; ++i) {
       const ElementPropertyTransition *iPt =
-        players[i]->GetEffect()->AsTransition();
+        animations[i]->GetEffect()->AsTransition();
       if (iPt->TransitionProperty() == aProperty) {
         haveCurrentTransition = true;
         currentIndex = i;
@@ -474,13 +474,13 @@ nsTransitionManager::ConsiderStartingTransition(
       // in-progress value (which is particularly easy to cause when we're
       // currently in the 'transition-delay').  It also might happen because we
       // just got a style change to a value that can't be interpolated.
-      AnimationPlayerPtrArray& players = aElementTransitions->mPlayers;
-      players[currentIndex]->Cancel();
+      AnimationPtrArray& animations = aElementTransitions->mAnimations;
+      animations[currentIndex]->Cancel();
       oldPT = nullptr; // Clear pointer so it doesn't dangle
-      players.RemoveElementAt(currentIndex);
+      animations.RemoveElementAt(currentIndex);
       aElementTransitions->UpdateAnimationGeneration(mPresContext);
 
-      if (players.IsEmpty()) {
+      if (animations.IsEmpty()) {
         aElementTransitions->Destroy();
         // |aElementTransitions| is now a dangling pointer!
         aElementTransitions = nullptr;
@@ -564,13 +564,13 @@ nsTransitionManager::ConsiderStartingTransition(
   segment.mToKey = 1;
   segment.mTimingFunction.Init(tf);
 
-  nsRefPtr<CSSTransitionPlayer> player = new CSSTransitionPlayer(timeline);
+  nsRefPtr<CSSTransitionPlayer> animation = new CSSTransitionPlayer(timeline);
   // The order of the following two calls is important since PlayFromStyle
-  // will add the player to the PendingAnimationTracker of its effect's
+  // will add the animation to the PendingAnimationTracker of its effect's
   // document. When we come to make effect writeable (bug 1049975) we should
   // remove this dependency.
-  player->SetEffect(pt);
-  player->PlayFromStyle();
+  animation->SetEffect(pt);
+  animation->PlayFromStyle();
 
   if (!aElementTransitions) {
     aElementTransitions =
@@ -581,23 +581,23 @@ nsTransitionManager::ConsiderStartingTransition(
     }
   }
 
-  AnimationPlayerPtrArray& players = aElementTransitions->mPlayers;
+  AnimationPtrArray& animations = aElementTransitions->mAnimations;
 #ifdef DEBUG
-  for (size_t i = 0, i_end = players.Length(); i < i_end; ++i) {
+  for (size_t i = 0, i_end = animations.Length(); i < i_end; ++i) {
     MOZ_ASSERT(
       i == currentIndex ||
-      (players[i]->GetEffect() &&
-       players[i]->GetEffect()->AsTransition()->TransitionProperty()
+      (animations[i]->GetEffect() &&
+       animations[i]->GetEffect()->AsTransition()->TransitionProperty()
          != aProperty),
       "duplicate transitions for property");
   }
 #endif
   if (haveCurrentTransition) {
-    players[currentIndex]->Cancel();
+    animations[currentIndex]->Cancel();
     oldPT = nullptr; // Clear pointer so it doesn't dangle
-    players[currentIndex] = player;
+    animations[currentIndex] = animation;
   } else {
-    if (!players.AppendElement(player)) {
+    if (!animations.AppendElement(animation)) {
       NS_WARNING("out of memory");
       return;
     }
@@ -674,12 +674,12 @@ nsTransitionManager::UpdateCascadeResults(AnimationCollection* aTransitions,
   // property, it doesn't matter what order we iterate the transitions.
   // But let's go the same way as animations.
   bool changed = false;
-  AnimationPlayerPtrArray& players = aTransitions->mPlayers;
-  for (size_t playerIdx = players.Length(); playerIdx-- != 0; ) {
-    MOZ_ASSERT(players[playerIdx]->GetEffect() &&
-               players[playerIdx]->GetEffect()->Properties().Length() == 1,
+  AnimationPtrArray& animations = aTransitions->mAnimations;
+  for (size_t animIdx = animations.Length(); animIdx-- != 0; ) {
+    MOZ_ASSERT(animations[animIdx]->GetEffect() &&
+               animations[animIdx]->GetEffect()->Properties().Length() == 1,
                "Should have one animation property for a transition");
-    AnimationProperty& prop = players[playerIdx]->GetEffect()->Properties()[0];
+    AnimationProperty& prop = animations[animIdx]->GetEffect()->Properties()[0];
     bool newWinsInCascade = !propertiesUsed.HasProperty(prop.mProperty);
     if (prop.mWinsInCascade != newWinsInCascade) {
       changed = true;
@@ -797,22 +797,21 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
                  "Element::UnbindFromTree should have "
                  "destroyed the element transitions object");
 
-      size_t i = collection->mPlayers.Length();
+      size_t i = collection->mAnimations.Length();
       MOZ_ASSERT(i != 0, "empty transitions list?");
       bool transitionStartedOrEnded = false;
       do {
         --i;
-        Animation* player = collection->mPlayers[i];
-        if (!player->GetEffect()->IsFinishedTransition()) {
-          MOZ_ASSERT(player->GetEffect(),
-                     "Transitions should have an effect");
+        Animation* anim = collection->mAnimations[i];
+        if (!anim->GetEffect()->IsFinishedTransition()) {
+          MOZ_ASSERT(anim->GetEffect(), "Transitions should have an effect");
           ComputedTiming computedTiming =
-            player->GetEffect()->GetComputedTiming();
+            anim->GetEffect()->GetComputedTiming();
           if (computedTiming.mPhase == ComputedTiming::AnimationPhase_After) {
             nsCSSProperty prop =
-              player->GetEffect()->AsTransition()->TransitionProperty();
+              anim->GetEffect()->AsTransition()->TransitionProperty();
             TimeDuration duration =
-              player->GetEffect()->Timing().mIterationDuration;
+              anim->GetEffect()->Timing().mIterationDuration;
             events.AppendElement(
               TransitionEventInfo(collection->mElement, prop,
                                   duration,
@@ -825,13 +824,13 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
             // a non-animation style change that would affect it, we need
             // to know not to start a new transition for the transition
             // from the almost-completed value to the final value.
-            player->GetEffect()->SetIsFinishedTransition(true);
+            anim->GetEffect()->SetIsFinishedTransition(true);
             collection->UpdateAnimationGeneration(mPresContext);
             transitionStartedOrEnded = true;
           } else if ((computedTiming.mPhase ==
                       ComputedTiming::AnimationPhase_Active) &&
                      canThrottleTick &&
-                     !player->IsRunningOnCompositor()) {
+                     !anim->IsRunningOnCompositor()) {
             // Start a transition with a delay where we should start the
             // transition proper.
             collection->UpdateAnimationGeneration(mPresContext);
@@ -855,7 +854,7 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
         didThrottle = true;
       }
 
-      if (collection->mPlayers.IsEmpty()) {
+      if (collection->mAnimations.IsEmpty()) {
         collection->Destroy();
         // |collection| is now a dangling pointer!
         collection = nullptr;

From dd08500a37f448e40f412cb05395ce40e546804e Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:10 +0900
Subject: [PATCH 62/80] Bug 1154615 part 7 - Rename CSSAnimationPlayer and
 CSSTransitionPlayer; r=jwatt

---
 dom/animation/Animation.h            | 10 +++---
 layout/style/nsAnimationManager.cpp  | 48 +++++++++++++---------------
 layout/style/nsAnimationManager.h    |  9 +++---
 layout/style/nsTransitionManager.cpp | 10 +++---
 layout/style/nsTransitionManager.h   |  9 +++---
 5 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index da12ed04c70..2e746ff426c 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -39,8 +39,8 @@ class AnimValuesStyleRule;
 class CommonAnimationManager;
 } // namespace css
 
-class CSSAnimationPlayer;
-class CSSTransitionPlayer;
+class CSSAnimation;
+class CSSTransition;
 
 namespace dom {
 
@@ -70,8 +70,8 @@ public:
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) override;
 
-  virtual CSSAnimationPlayer* AsCSSAnimationPlayer() { return nullptr; }
-  virtual CSSTransitionPlayer* AsCSSTransitionPlayer() { return nullptr; }
+  virtual CSSAnimation* AsCSSAnimation() { return nullptr; }
+  virtual CSSTransition* AsCSSTransition() { return nullptr; }
 
   // Flag to pass to DoPlay to indicate that it should not carry out finishing
   // behavior (reset the current time to the beginning of the active duration).
@@ -111,7 +111,7 @@ public:
   virtual void PlayFromJS() { Play(LimitBehavior::AutoRewind); }
   // PauseFromJS is currently only here for symmetry with PlayFromJS but
   // in future we will likely have to flush style in
-  // CSSAnimationPlayer::PauseFromJS so we leave it for now.
+  // CSSAnimation::PauseFromJS so we leave it for now.
   void PauseFromJS() { Pause(); }
 
   void SetEffect(KeyframeEffectReadonly* aEffect);
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index a102b091390..38ff9a3b697 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -26,31 +26,31 @@ using namespace mozilla;
 using namespace mozilla::css;
 using mozilla::dom::Animation;
 using mozilla::dom::KeyframeEffectReadonly;
-using mozilla::CSSAnimationPlayer;
+using mozilla::CSSAnimation;
 
 mozilla::dom::Promise*
-CSSAnimationPlayer::GetReady(ErrorResult& aRv)
+CSSAnimation::GetReady(ErrorResult& aRv)
 {
   FlushStyle();
   return Animation::GetReady(aRv);
 }
 
 void
-CSSAnimationPlayer::Play(LimitBehavior aLimitBehavior)
+CSSAnimation::Play(LimitBehavior aLimitBehavior)
 {
   mPauseShouldStick = false;
   Animation::Play(aLimitBehavior);
 }
 
 void
-CSSAnimationPlayer::Pause()
+CSSAnimation::Pause()
 {
   mPauseShouldStick = true;
   Animation::Pause();
 }
 
 mozilla::dom::AnimationPlayState
-CSSAnimationPlayer::PlayStateFromJS() const
+CSSAnimation::PlayStateFromJS() const
 {
   // Flush style to ensure that any properties controlling animation state
   // (e.g. animation-play-state) are fully updated.
@@ -59,7 +59,7 @@ CSSAnimationPlayer::PlayStateFromJS() const
 }
 
 void
-CSSAnimationPlayer::PlayFromJS()
+CSSAnimation::PlayFromJS()
 {
   // Note that flushing style below might trigger calls to
   // PlayFromStyle()/PauseFromStyle() on this object.
@@ -68,7 +68,7 @@ CSSAnimationPlayer::PlayFromJS()
 }
 
 void
-CSSAnimationPlayer::PlayFromStyle()
+CSSAnimation::PlayFromStyle()
 {
   mIsStylePaused = false;
   if (!mPauseShouldStick) {
@@ -77,7 +77,7 @@ CSSAnimationPlayer::PlayFromStyle()
 }
 
 void
-CSSAnimationPlayer::PauseFromStyle()
+CSSAnimation::PauseFromStyle()
 {
   // Check if the pause state is being overridden
   if (mIsStylePaused) {
@@ -89,7 +89,7 @@ CSSAnimationPlayer::PauseFromStyle()
 }
 
 void
-CSSAnimationPlayer::QueueEvents(EventArray& aEventsToDispatch)
+CSSAnimation::QueueEvents(EventArray& aEventsToDispatch)
 {
   if (!mEffect) {
     return;
@@ -178,7 +178,7 @@ CSSAnimationPlayer::QueueEvents(EventArray& aEventsToDispatch)
 }
 
 CommonAnimationManager*
-CSSAnimationPlayer::GetAnimationManager() const
+CSSAnimation::GetAnimationManager() const
 {
   nsPresContext* context = GetPresContext();
   if (!context) {
@@ -189,7 +189,7 @@ CSSAnimationPlayer::GetAnimationManager() const
 }
 
 /* static */ nsString
-CSSAnimationPlayer::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
+CSSAnimation::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
 {
   switch (aPseudoType) {
     case nsCSSPseudoElements::ePseudo_before:
@@ -215,8 +215,7 @@ nsAnimationManager::QueueEvents(AnimationCollection* aCollection,
                                 EventArray& aEventsToDispatch)
 {
   for (size_t animIdx = aCollection->mAnimations.Length(); animIdx-- != 0; ) {
-    CSSAnimationPlayer* anim =
-      aCollection->mAnimations[animIdx]->AsCSSAnimationPlayer();
+    CSSAnimation* anim = aCollection->mAnimations[animIdx]->AsCSSAnimation();
     MOZ_ASSERT(anim, "Expected a collection of CSS Animations");
     anim->QueueEvents(aEventsToDispatch);
   }
@@ -226,9 +225,7 @@ void
 nsAnimationManager::MaybeUpdateCascadeResults(AnimationCollection* aCollection)
 {
   for (size_t animIdx = aCollection->mAnimations.Length(); animIdx-- != 0; ) {
-    CSSAnimationPlayer* anim =
-      aCollection->mAnimations[animIdx]->AsCSSAnimationPlayer();
-
+    CSSAnimation* anim = aCollection->mAnimations[animIdx]->AsCSSAnimation();
     if (anim->IsInEffect() != anim->mInEffectForCascadeResults) {
       // Update our own cascade results.
       mozilla::dom::Element* element = aCollection->GetElementToRestyle();
@@ -334,13 +331,12 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
         // the new list of animations with a given name than in the old
         // list, it will be the animations towards the of the beginning of
         // the list that do not match and are treated as new animations.
-        nsRefPtr<CSSAnimationPlayer> oldAnim;
+        nsRefPtr<CSSAnimation> oldAnim;
         size_t oldIdx = collection->mAnimations.Length();
         while (oldIdx-- != 0) {
-          CSSAnimationPlayer* a =
-            collection->mAnimations[oldIdx]->AsCSSAnimationPlayer();
-          MOZ_ASSERT(a, "All players in the CSS Animation collection should"
-                        " be CSSAnimationPlayer objects");
+          CSSAnimation* a = collection->mAnimations[oldIdx]->AsCSSAnimation();
+          MOZ_ASSERT(a, "All animations in the CSS Animation collection should"
+                        " be CSSAnimation objects");
           if (a->Name() == newAnim->Name()) {
             oldAnim = a;
             break;
@@ -368,11 +364,11 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
         oldAnim->ClearIsRunningOnCompositor();
 
         // Handle changes in play state.
-        // CSSAnimationPlayer takes care of override behavior so that,
+        // CSSAnimation takes care of override behavior so that,
         // for example, if the author has called pause(), that will
         // override the animation-play-state.
         // (We should check newAnim->IsStylePaused() but that requires
-        //  downcasting to CSSAnimationPlayer and we happen to know that
+        //  downcasting to CSSAnimation and we happen to know that
         //  newAnim will only ever be paused by calling PauseFromStyle
         //  making IsPausedOrPausing synonymous in this case.)
         if (!oldAnim->IsStylePaused() && newAnim->IsPausedOrPausing()) {
@@ -515,7 +511,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
       continue;
     }
 
-    nsRefPtr<CSSAnimationPlayer> dest = new CSSAnimationPlayer(aTimeline);
+    nsRefPtr<CSSAnimation> dest = new CSSAnimation(aTimeline);
     aAnimations.AppendElement(dest);
 
     AnimationTiming timing;
@@ -800,8 +796,8 @@ nsAnimationManager::UpdateCascadeResults(
   bool changed = false;
   for (size_t animIdx = aElementAnimations->mAnimations.Length();
        animIdx-- != 0; ) {
-    CSSAnimationPlayer* anim =
-      aElementAnimations->mAnimations[animIdx]->AsCSSAnimationPlayer();
+    CSSAnimation* anim =
+      aElementAnimations->mAnimations[animIdx]->AsCSSAnimation();
     KeyframeEffectReadonly* effect = anim->GetEffect();
 
     anim->mInEffectForCascadeResults = anim->IsInEffect();
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index dfdeb98927f..372207bcc5d 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -52,10 +52,10 @@ struct AnimationEventInfo {
 
 typedef InfallibleTArray<AnimationEventInfo> EventArray;
 
-class CSSAnimationPlayer final : public dom::Animation
+class CSSAnimation final : public dom::Animation
 {
 public:
- explicit CSSAnimationPlayer(dom::DocumentTimeline* aTimeline)
+ explicit CSSAnimation(dom::DocumentTimeline* aTimeline)
     : dom::Animation(aTimeline)
     , mIsStylePaused(false)
     , mPauseShouldStick(false)
@@ -63,8 +63,7 @@ public:
   {
   }
 
-  virtual CSSAnimationPlayer*
-  AsCSSAnimationPlayer() override { return this; }
+  virtual CSSAnimation* AsCSSAnimation() override { return this; }
 
   virtual dom::Promise* GetReady(ErrorResult& aRv) override;
   virtual void Play(LimitBehavior aLimitBehavior) override;
@@ -88,7 +87,7 @@ public:
   bool mInEffectForCascadeResults;
 
 protected:
-  virtual ~CSSAnimationPlayer() { }
+  virtual ~CSSAnimation() { }
   virtual css::CommonAnimationManager* GetAnimationManager() const override;
 
   static nsString PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType);
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 642acf8034e..8b27f0a4f33 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -82,25 +82,25 @@ ElementPropertyTransition::CurrentValuePortion() const
 }
 
 /*****************************************************************************
- * CSSTransitionPlayer                                                       *
+ * CSSTransition                                                             *
  *****************************************************************************/
 
 mozilla::dom::AnimationPlayState
-CSSTransitionPlayer::PlayStateFromJS() const
+CSSTransition::PlayStateFromJS() const
 {
   FlushStyle();
   return Animation::PlayStateFromJS();
 }
 
 void
-CSSTransitionPlayer::PlayFromJS()
+CSSTransition::PlayFromJS()
 {
   FlushStyle();
   Animation::PlayFromJS();
 }
 
 CommonAnimationManager*
-CSSTransitionPlayer::GetAnimationManager() const
+CSSTransition::GetAnimationManager() const
 {
   nsPresContext* context = GetPresContext();
   if (!context) {
@@ -564,7 +564,7 @@ nsTransitionManager::ConsiderStartingTransition(
   segment.mToKey = 1;
   segment.mTimingFunction.Init(tf);
 
-  nsRefPtr<CSSTransitionPlayer> animation = new CSSTransitionPlayer(timeline);
+  nsRefPtr<CSSTransition> animation = new CSSTransition(timeline);
   // The order of the following two calls is important since PlayFromStyle
   // will add the animation to the PendingAnimationTracker of its effect's
   // document. When we come to make effect writeable (bug 1049975) we should
diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
index 0bab8d20c50..bf267bf1cc9 100644
--- a/layout/style/nsTransitionManager.h
+++ b/layout/style/nsTransitionManager.h
@@ -75,16 +75,15 @@ struct ElementPropertyTransition : public dom::KeyframeEffectReadonly
   double CurrentValuePortion() const;
 };
 
-class CSSTransitionPlayer final : public dom::Animation
+class CSSTransition final : public dom::Animation
 {
 public:
- explicit CSSTransitionPlayer(dom::DocumentTimeline* aTimeline)
+ explicit CSSTransition(dom::DocumentTimeline* aTimeline)
     : dom::Animation(aTimeline)
   {
   }
 
-  virtual CSSTransitionPlayer*
-  AsCSSTransitionPlayer() override { return this; }
+  virtual CSSTransition* AsCSSTransition() override { return this; }
 
   virtual dom::AnimationPlayState PlayStateFromJS() const override;
   virtual void PlayFromJS() override;
@@ -94,7 +93,7 @@ public:
   void PlayFromStyle() { DoPlay(Animation::LimitBehavior::Continue); }
 
 protected:
-  virtual ~CSSTransitionPlayer() { }
+  virtual ~CSSTransition() { }
 
   virtual css::CommonAnimationManager* GetAnimationManager() const override;
 };

From f139f696adcde5d543e2d88e84d7c24f0286660c Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:10 +0900
Subject: [PATCH 63/80] Bug 1154615 part 8 - Rename references to players in
 animation observers; r=jwatt

---
 dom/base/nsDOMMutationObserver.cpp | 34 ++++++++++++-------------
 dom/base/nsDOMMutationObserver.h   | 40 +++++++++++++++---------------
 dom/base/nsIAnimationObserver.h    | 18 +++++++-------
 dom/base/nsNodeUtils.cpp           | 22 ++++++++--------
 dom/base/nsNodeUtils.h             |  6 ++---
 5 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/dom/base/nsDOMMutationObserver.cpp b/dom/base/nsDOMMutationObserver.cpp
index bb890c5c13b..19c4c953bcd 100644
--- a/dom/base/nsDOMMutationObserver.cpp
+++ b/dom/base/nsDOMMutationObserver.cpp
@@ -325,10 +325,10 @@ void nsMutationReceiver::NodeWillBeDestroyed(const nsINode *aNode)
 }
 
 void
-nsAnimationReceiver::RecordAnimationMutation(Animation* aPlayer,
+nsAnimationReceiver::RecordAnimationMutation(Animation* aAnimation,
                                              AnimationMutation aMutationType)
 {
-  KeyframeEffectReadonly* effect = aPlayer->GetEffect();
+  KeyframeEffectReadonly* effect = aAnimation->GetEffect();
   if (!effect) {
     return;
   }
@@ -350,13 +350,13 @@ nsAnimationReceiver::RecordAnimationMutation(Animation* aPlayer,
 
     switch (aMutationType) {
       case eAnimationMutation_Added:
-        nsAutoAnimationMutationBatch::AnimationAdded(aPlayer);
+        nsAutoAnimationMutationBatch::AnimationAdded(aAnimation);
         break;
       case eAnimationMutation_Changed:
-        nsAutoAnimationMutationBatch::AnimationChanged(aPlayer);
+        nsAutoAnimationMutationBatch::AnimationChanged(aAnimation);
         break;
       case eAnimationMutation_Removed:
-        nsAutoAnimationMutationBatch::AnimationRemoved(aPlayer);
+        nsAutoAnimationMutationBatch::AnimationRemoved(aAnimation);
         break;
     }
 
@@ -373,33 +373,33 @@ nsAnimationReceiver::RecordAnimationMutation(Animation* aPlayer,
 
   switch (aMutationType) {
     case eAnimationMutation_Added:
-      m->mAddedAnimations.AppendElement(aPlayer);
+      m->mAddedAnimations.AppendElement(aAnimation);
       break;
     case eAnimationMutation_Changed:
-      m->mChangedAnimations.AppendElement(aPlayer);
+      m->mChangedAnimations.AppendElement(aAnimation);
       break;
     case eAnimationMutation_Removed:
-      m->mRemovedAnimations.AppendElement(aPlayer);
+      m->mRemovedAnimations.AppendElement(aAnimation);
       break;
   }
 }
 
 void
-nsAnimationReceiver::AnimationAdded(Animation* aPlayer)
+nsAnimationReceiver::AnimationAdded(Animation* aAnimation)
 {
-  RecordAnimationMutation(aPlayer, eAnimationMutation_Added);
+  RecordAnimationMutation(aAnimation, eAnimationMutation_Added);
 }
 
 void
-nsAnimationReceiver::AnimationChanged(Animation* aPlayer)
+nsAnimationReceiver::AnimationChanged(Animation* aAnimation)
 {
-  RecordAnimationMutation(aPlayer, eAnimationMutation_Changed);
+  RecordAnimationMutation(aAnimation, eAnimationMutation_Changed);
 }
 
 void
-nsAnimationReceiver::AnimationRemoved(Animation* aPlayer)
+nsAnimationReceiver::AnimationRemoved(Animation* aAnimation)
 {
-  RecordAnimationMutation(aPlayer, eAnimationMutation_Removed);
+  RecordAnimationMutation(aAnimation, eAnimationMutation_Removed);
 }
 
 NS_IMPL_ISUPPORTS_INHERITED(nsAnimationReceiver, nsMutationReceiver,
@@ -1020,11 +1020,11 @@ nsAutoAnimationMutationBatch::Done()
 
     for (const Entry& e : mEntries) {
       if (e.mState == eState_Added) {
-        m->mAddedAnimations.AppendElement(e.mPlayer);
+        m->mAddedAnimations.AppendElement(e.mAnimation);
       } else if (e.mState == eState_Removed) {
-        m->mRemovedAnimations.AppendElement(e.mPlayer);
+        m->mRemovedAnimations.AppendElement(e.mAnimation);
       } else if (e.mState == eState_RemainedPresent && e.mChanged) {
-        m->mChangedAnimations.AppendElement(e.mPlayer);
+        m->mChangedAnimations.AppendElement(e.mAnimation);
       }
     }
 
diff --git a/dom/base/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h
index 671a0b04fc2..7917027fc5b 100644
--- a/dom/base/nsDOMMutationObserver.h
+++ b/dom/base/nsDOMMutationObserver.h
@@ -36,7 +36,7 @@ class nsDOMMutationRecord final : public nsISupports,
   virtual ~nsDOMMutationRecord() {}
 
 public:
-  typedef nsTArray<nsRefPtr<mozilla::dom::Animation>> AnimationPlayerArray;
+  typedef nsTArray<nsRefPtr<mozilla::dom::Animation>> AnimationArray;
 
   nsDOMMutationRecord(nsIAtom* aType, nsISupports* aOwner)
   : mType(aType), mAttrNamespace(NullString()), mPrevValue(NullString()), mOwner(aOwner)
@@ -95,17 +95,17 @@ public:
     aRetVal.SetOwnedString(mPrevValue);
   }
 
-  void GetAddedAnimations(AnimationPlayerArray& aRetVal) const
+  void GetAddedAnimations(AnimationArray& aRetVal) const
   {
     aRetVal = mAddedAnimations;
   }
 
-  void GetRemovedAnimations(AnimationPlayerArray& aRetVal) const
+  void GetRemovedAnimations(AnimationArray& aRetVal) const
   {
     aRetVal = mRemovedAnimations;
   }
 
-  void GetChangedAnimations(AnimationPlayerArray& aRetVal) const
+  void GetChangedAnimations(AnimationArray& aRetVal) const
   {
     aRetVal = mChangedAnimations;
   }
@@ -119,9 +119,9 @@ public:
   nsRefPtr<nsSimpleContentList> mRemovedNodes;
   nsCOMPtr<nsINode>             mPreviousSibling;
   nsCOMPtr<nsINode>             mNextSibling;
-  AnimationPlayerArray          mAddedAnimations;
-  AnimationPlayerArray          mRemovedAnimations;
-  AnimationPlayerArray          mChangedAnimations;
+  AnimationArray                mAddedAnimations;
+  AnimationArray                mRemovedAnimations;
+  AnimationArray                mChangedAnimations;
 
   nsRefPtr<nsDOMMutationRecord> mNext;
   nsCOMPtr<nsISupports>         mOwner;
@@ -434,7 +434,7 @@ private:
     eAnimationMutation_Removed
   };
 
-  void RecordAnimationMutation(mozilla::dom::Animation* aPlayer,
+  void RecordAnimationMutation(mozilla::dom::Animation* aAnimation,
                                AnimationMutation aMutationType);
 };
 
@@ -756,13 +756,13 @@ public:
     return sCurrentBatch->mBatchTarget;
   }
 
-  static void AnimationAdded(mozilla::dom::Animation* aPlayer)
+  static void AnimationAdded(mozilla::dom::Animation* aAnimation)
   {
     if (!IsBatching()) {
       return;
     }
 
-    Entry* entry = sCurrentBatch->FindEntry(aPlayer);
+    Entry* entry = sCurrentBatch->FindEntry(aAnimation);
     if (entry) {
       switch (entry->mState) {
         case eState_RemainedAbsent:
@@ -777,15 +777,15 @@ public:
       }
     } else {
       entry = sCurrentBatch->mEntries.AppendElement();
-      entry->mPlayer = aPlayer;
+      entry->mAnimation = aAnimation;
       entry->mState = eState_Added;
       entry->mChanged = false;
     }
   }
 
-  static void AnimationChanged(mozilla::dom::Animation* aPlayer)
+  static void AnimationChanged(mozilla::dom::Animation* aAnimation)
   {
-    Entry* entry = sCurrentBatch->FindEntry(aPlayer);
+    Entry* entry = sCurrentBatch->FindEntry(aAnimation);
     if (entry) {
       NS_ASSERTION(entry->mState == eState_RemainedPresent ||
                    entry->mState == eState_Added,
@@ -794,15 +794,15 @@ public:
       entry->mChanged = true;
     } else {
       entry = sCurrentBatch->mEntries.AppendElement();
-      entry->mPlayer = aPlayer;
+      entry->mAnimation = aAnimation;
       entry->mState = eState_RemainedPresent;
       entry->mChanged = true;
     }
   }
 
-  static void AnimationRemoved(mozilla::dom::Animation* aPlayer)
+  static void AnimationRemoved(mozilla::dom::Animation* aAnimation)
   {
-    Entry* entry = sCurrentBatch->FindEntry(aPlayer);
+    Entry* entry = sCurrentBatch->FindEntry(aAnimation);
     if (entry) {
       switch (entry->mState) {
         case eState_RemainedPresent:
@@ -817,17 +817,17 @@ public:
       }
     } else {
       entry = sCurrentBatch->mEntries.AppendElement();
-      entry->mPlayer = aPlayer;
+      entry->mAnimation = aAnimation;
       entry->mState = eState_Removed;
       entry->mChanged = false;
     }
   }
 
 private:
-  Entry* FindEntry(mozilla::dom::Animation* aPlayer)
+  Entry* FindEntry(mozilla::dom::Animation* aAnimation)
   {
     for (Entry& e : mEntries) {
-      if (e.mPlayer == aPlayer) {
+      if (e.mAnimation == aAnimation) {
         return &e;
       }
     }
@@ -843,7 +843,7 @@ private:
 
   struct Entry
   {
-    nsRefPtr<mozilla::dom::Animation> mPlayer;
+    nsRefPtr<mozilla::dom::Animation> mAnimation;
     State mState;
     bool mChanged;
   };
diff --git a/dom/base/nsIAnimationObserver.h b/dom/base/nsIAnimationObserver.h
index 403a9e62b87..fe05a4d60f5 100644
--- a/dom/base/nsIAnimationObserver.h
+++ b/dom/base/nsIAnimationObserver.h
@@ -22,36 +22,36 @@ class nsIAnimationObserver : public nsIMutationObserver
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IANIMATION_OBSERVER_IID)
 
-  virtual void AnimationAdded(mozilla::dom::Animation* aPlayer) = 0;
-  virtual void AnimationChanged(mozilla::dom::Animation* aPlayer) = 0;
-  virtual void AnimationRemoved(mozilla::dom::Animation* aPlayer) = 0;
+  virtual void AnimationAdded(mozilla::dom::Animation* aAnimation) = 0;
+  virtual void AnimationChanged(mozilla::dom::Animation* aAnimation) = 0;
+  virtual void AnimationRemoved(mozilla::dom::Animation* aAnimation) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIAnimationObserver, NS_IANIMATION_OBSERVER_IID)
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONADDED                          \
-    virtual void AnimationAdded(mozilla::dom::Animation* aPlayer)      \
+    virtual void AnimationAdded(mozilla::dom::Animation* aAnimation)         \
       override;
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONCHANGED                        \
-    virtual void AnimationChanged(mozilla::dom::Animation* aPlayer)    \
+    virtual void AnimationChanged(mozilla::dom::Animation* aAnimation)       \
       override;
 
 #define NS_DECL_NSIANIMATIONOBSERVER_ANIMATIONREMOVED                        \
-    virtual void AnimationRemoved(mozilla::dom::Animation* aPlayer)    \
+    virtual void AnimationRemoved(mozilla::dom::Animation* aAnimation)       \
       override;
 
 #define NS_IMPL_NSIANIMATIONOBSERVER_STUB(class_)                            \
 void                                                                         \
-class_::AnimationAdded(mozilla::dom::Animation* aPlayer)               \
+class_::AnimationAdded(mozilla::dom::Animation* aAnimation)                  \
 {                                                                            \
 }                                                                            \
 void                                                                         \
-class_::AnimationChanged(mozilla::dom::Animation* aPlayer)             \
+class_::AnimationChanged(mozilla::dom::Animation* aAnimation)                \
 {                                                                            \
 }                                                                            \
 void                                                                         \
-class_::AnimationRemoved(mozilla::dom::Animation* aPlayer)             \
+class_::AnimationRemoved(mozilla::dom::Animation* aAnimation)                \
 {                                                                            \
 }                                                                            \
 NS_IMPL_NSIMUTATIONOBSERVER_CORE_STUB(class_)                                \
diff --git a/dom/base/nsNodeUtils.cpp b/dom/base/nsNodeUtils.cpp
index e536d2cf848..a5abeca2419 100644
--- a/dom/base/nsNodeUtils.cpp
+++ b/dom/base/nsNodeUtils.cpp
@@ -216,9 +216,9 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer,
 }
 
 static inline Element*
-GetTarget(Animation* aPlayer)
+GetTarget(Animation* aAnimation)
 {
-  KeyframeEffectReadonly* effect = aPlayer->GetEffect();
+  KeyframeEffectReadonly* effect = aAnimation->GetEffect();
   if (!effect) {
     return nullptr;
   }
@@ -238,44 +238,44 @@ GetTarget(Animation* aPlayer)
 }
 
 void
-nsNodeUtils::AnimationAdded(Animation* aPlayer)
+nsNodeUtils::AnimationAdded(Animation* aAnimation)
 {
-  Element* target = GetTarget(aPlayer);
+  Element* target = GetTarget(aAnimation);
   if (!target) {
     return;
   }
   nsIDocument* doc = target->OwnerDoc();
 
   if (doc->MayHaveAnimationObservers()) {
-    IMPL_ANIMATION_NOTIFICATION(AnimationAdded, target, (aPlayer));
+    IMPL_ANIMATION_NOTIFICATION(AnimationAdded, target, (aAnimation));
   }
 }
 
 void
-nsNodeUtils::AnimationChanged(Animation* aPlayer)
+nsNodeUtils::AnimationChanged(Animation* aAnimation)
 {
-  Element* target = GetTarget(aPlayer);
+  Element* target = GetTarget(aAnimation);
   if (!target) {
     return;
   }
   nsIDocument* doc = target->OwnerDoc();
 
   if (doc->MayHaveAnimationObservers()) {
-    IMPL_ANIMATION_NOTIFICATION(AnimationChanged, target, (aPlayer));
+    IMPL_ANIMATION_NOTIFICATION(AnimationChanged, target, (aAnimation));
   }
 }
 
 void
-nsNodeUtils::AnimationRemoved(Animation* aPlayer)
+nsNodeUtils::AnimationRemoved(Animation* aAnimation)
 {
-  Element* target = GetTarget(aPlayer);
+  Element* target = GetTarget(aAnimation);
   if (!target) {
     return;
   }
   nsIDocument* doc = target->OwnerDoc();
 
   if (doc->MayHaveAnimationObservers()) {
-    IMPL_ANIMATION_NOTIFICATION(AnimationRemoved, target, (aPlayer));
+    IMPL_ANIMATION_NOTIFICATION(AnimationRemoved, target, (aAnimation));
   }
 }
 
diff --git a/dom/base/nsNodeUtils.h b/dom/base/nsNodeUtils.h
index 46392a360a7..c6dadba06e9 100644
--- a/dom/base/nsNodeUtils.h
+++ b/dom/base/nsNodeUtils.h
@@ -127,9 +127,9 @@ public:
     }
   }
 
-  static void AnimationAdded(mozilla::dom::Animation* aPlayer);
-  static void AnimationChanged(mozilla::dom::Animation* aPlayer);
-  static void AnimationRemoved(mozilla::dom::Animation* aPlayer);
+  static void AnimationAdded(mozilla::dom::Animation* aAnimation);
+  static void AnimationChanged(mozilla::dom::Animation* aAnimation);
+  static void AnimationRemoved(mozilla::dom::Animation* aAnimation);
 
   /**
    * To be called when reference count of aNode drops to zero.

From cb760b7cd2f2096d91ebe3dd2cb159db768afd7f Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 21 Apr 2015 10:22:10 +0900
Subject: [PATCH 64/80] Bug 1154615 part 9 - Rename test files; r=jwatt

---
 ...e.html => test_animation-currenttime.html} |  7 +++----
 ...shed.html => test_animation-finished.html} |  0
 ...ate.html => test_animation-playstate.html} |  0
 ...r-ready.html => test_animation-ready.html} |  0
 ...ime.html => test_animation-starttime.html} |  7 +++----
 ....html => test_element-get-animations.html} |  0
 ...e.html => test_animation-currenttime.html} |  0
 ...r-ready.html => test_animation-ready.html} |  0
 ...ime.html => test_animation-starttime.html} |  7 +++----
 ....html => test_element-get-animations.html} |  0
 dom/animation/test/mochitest.ini              | 20 +++++++++----------
 11 files changed, 19 insertions(+), 22 deletions(-)
 rename dom/animation/test/css-animations/{test_animation-player-currenttime.html => test_animation-currenttime.html} (98%)
 rename dom/animation/test/css-animations/{test_animation-player-finished.html => test_animation-finished.html} (100%)
 rename dom/animation/test/css-animations/{test_animation-player-playstate.html => test_animation-playstate.html} (100%)
 rename dom/animation/test/css-animations/{test_animation-player-ready.html => test_animation-ready.html} (100%)
 rename dom/animation/test/css-animations/{test_animation-player-starttime.html => test_animation-starttime.html} (98%)
 rename dom/animation/test/css-animations/{test_element-get-animation-players.html => test_element-get-animations.html} (100%)
 rename dom/animation/test/css-transitions/{test_animation-player-currenttime.html => test_animation-currenttime.html} (100%)
 rename dom/animation/test/css-transitions/{test_animation-player-ready.html => test_animation-ready.html} (100%)
 rename dom/animation/test/css-transitions/{test_animation-player-starttime.html => test_animation-starttime.html} (97%)
 rename dom/animation/test/css-transitions/{test_element-get-animation-players.html => test_element-get-animations.html} (100%)

diff --git a/dom/animation/test/css-animations/test_animation-player-currenttime.html b/dom/animation/test/css-animations/test_animation-currenttime.html
similarity index 98%
rename from dom/animation/test/css-animations/test_animation-player-currenttime.html
rename to dom/animation/test/css-animations/test_animation-currenttime.html
index 4f1267778fe..2d804c7656e 100644
--- a/dom/animation/test/css-animations/test_animation-player-currenttime.html
+++ b/dom/animation/test/css-animations/test_animation-currenttime.html
@@ -193,11 +193,10 @@ function EventWatcher(watchedNode, eventTypes)
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
 //
-//   http://w3c.github.io/web-animations/#animation-node-phases-and-states
+//   https://w3c.github.io/web-animations/#animation-effect-phases-and-states
 //
-// Note the distinction between "player start time" and "animation start time".
-// The former is the start of the start delay. The latter is the start of the
-// active interval. (If there is no delay, they are the same.)
+// Note the distinction between the "animation start time" which occurs before
+// the start delay and the start of the active interval which occurs after it.
 
 // Called when currentTime is set to zero (the beginning of the start delay).
 function checkStateOnSettingCurrentTimeToZero(animation)
diff --git a/dom/animation/test/css-animations/test_animation-player-finished.html b/dom/animation/test/css-animations/test_animation-finished.html
similarity index 100%
rename from dom/animation/test/css-animations/test_animation-player-finished.html
rename to dom/animation/test/css-animations/test_animation-finished.html
diff --git a/dom/animation/test/css-animations/test_animation-player-playstate.html b/dom/animation/test/css-animations/test_animation-playstate.html
similarity index 100%
rename from dom/animation/test/css-animations/test_animation-player-playstate.html
rename to dom/animation/test/css-animations/test_animation-playstate.html
diff --git a/dom/animation/test/css-animations/test_animation-player-ready.html b/dom/animation/test/css-animations/test_animation-ready.html
similarity index 100%
rename from dom/animation/test/css-animations/test_animation-player-ready.html
rename to dom/animation/test/css-animations/test_animation-ready.html
diff --git a/dom/animation/test/css-animations/test_animation-player-starttime.html b/dom/animation/test/css-animations/test_animation-starttime.html
similarity index 98%
rename from dom/animation/test/css-animations/test_animation-player-starttime.html
rename to dom/animation/test/css-animations/test_animation-starttime.html
index bd98420569e..7fdd9732ce4 100644
--- a/dom/animation/test/css-animations/test_animation-player-starttime.html
+++ b/dom/animation/test/css-animations/test_animation-starttime.html
@@ -193,11 +193,10 @@ function EventWatcher(watchedNode, eventTypes)
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
 //
-//   http://w3c.github.io/web-animations/#animation-node-phases-and-states
+//   https://w3c.github.io/web-animations/#animation-effect-phases-and-states
 //
-// Note the distinction between "player start time" and "animation start time".
-// The former is the start of the start delay. The latter is the start of the
-// active interval. (If there is no delay, they are the same.)
+// Note the distinction between the "animation start time" which occurs before
+// the start delay and the start of the active interval which occurs after it.
 
 // Called when the ready Promise's callbacks should happen
 function checkStateOnReadyPromiseResolved(animation)
diff --git a/dom/animation/test/css-animations/test_element-get-animation-players.html b/dom/animation/test/css-animations/test_element-get-animations.html
similarity index 100%
rename from dom/animation/test/css-animations/test_element-get-animation-players.html
rename to dom/animation/test/css-animations/test_element-get-animations.html
diff --git a/dom/animation/test/css-transitions/test_animation-player-currenttime.html b/dom/animation/test/css-transitions/test_animation-currenttime.html
similarity index 100%
rename from dom/animation/test/css-transitions/test_animation-player-currenttime.html
rename to dom/animation/test/css-transitions/test_animation-currenttime.html
diff --git a/dom/animation/test/css-transitions/test_animation-player-ready.html b/dom/animation/test/css-transitions/test_animation-ready.html
similarity index 100%
rename from dom/animation/test/css-transitions/test_animation-player-ready.html
rename to dom/animation/test/css-transitions/test_animation-ready.html
diff --git a/dom/animation/test/css-transitions/test_animation-player-starttime.html b/dom/animation/test/css-transitions/test_animation-starttime.html
similarity index 97%
rename from dom/animation/test/css-transitions/test_animation-player-starttime.html
rename to dom/animation/test/css-transitions/test_animation-starttime.html
index e662d056960..8cf77bdfb84 100644
--- a/dom/animation/test/css-transitions/test_animation-player-starttime.html
+++ b/dom/animation/test/css-transitions/test_animation-starttime.html
@@ -183,11 +183,10 @@ function EventWatcher(watchedNode, eventTypes)
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
 //
-//   http://w3c.github.io/web-animations/#animation-effect-phases-and-states
+//   https://w3c.github.io/web-animations/#animation-effect-phases-and-states
 //
-// Note the distinction between "player start time" and "animation start time".
-// The former is the start of the start delay. The latter is the start of the
-// active interval. (If there is no delay, they are the same.)
+// Note the distinction between the "animation start time" which occurs before
+// the start delay and the start of the active interval which occurs after it.
 
 // Called when the ready Promise's callbacks should happen
 function checkStateOnReadyPromiseResolved(animation)
diff --git a/dom/animation/test/css-transitions/test_element-get-animation-players.html b/dom/animation/test/css-transitions/test_element-get-animations.html
similarity index 100%
rename from dom/animation/test/css-transitions/test_element-get-animation-players.html
rename to dom/animation/test/css-transitions/test_element-get-animations.html
diff --git a/dom/animation/test/mochitest.ini b/dom/animation/test/mochitest.ini
index 2debd103120..915f1a8cd88 100644
--- a/dom/animation/test/mochitest.ini
+++ b/dom/animation/test/mochitest.ini
@@ -4,22 +4,22 @@ support-files =
 
 [css-animations/test_animations-dynamic-changes.html]
 [css-animations/test_animation-pausing.html]
-[css-animations/test_animation-player-currenttime.html]
-[css-animations/test_animation-player-finished.html]
-[css-animations/test_animation-player-playstate.html]
-[css-animations/test_animation-player-ready.html]
-[css-animations/test_animation-player-starttime.html]
+[css-animations/test_animation-currenttime.html]
+[css-animations/test_animation-finished.html]
+[css-animations/test_animation-playstate.html]
+[css-animations/test_animation-ready.html]
+[css-animations/test_animation-starttime.html]
 [css-animations/test_effect-name.html]
 [css-animations/test_effect-target.html]
-[css-animations/test_element-get-animation-players.html]
+[css-animations/test_element-get-animations.html]
 skip-if = buildapp == 'mulet'
 [css-transitions/test_animation-pausing.html]
-[css-transitions/test_animation-player-currenttime.html]
-[css-transitions/test_animation-player-ready.html]
-[css-transitions/test_animation-player-starttime.html]
+[css-transitions/test_animation-currenttime.html]
+[css-transitions/test_animation-ready.html]
+[css-transitions/test_animation-starttime.html]
 [css-transitions/test_effect-name.html]
 [css-transitions/test_effect-target.html]
-[css-transitions/test_element-get-animation-players.html]
+[css-transitions/test_element-get-animations.html]
 skip-if = buildapp == 'mulet'
 [document-timeline/test_document-timeline.html]
 [document-timeline/test_request_animation_frame.html]

From bd00b54a88f8faabf6d0ef8a499eb23c67245690 Mon Sep 17 00:00:00 2001
From: Dan Glastonbury <dglastonbury@mozilla.com>
Date: Tue, 21 Apr 2015 12:31:36 +1000
Subject: [PATCH 65/80] Bug 1048724 - Look up glBindTransformFeedback symbol.
 r=jgilbert

---
 gfx/gl/GLContext.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 86610090434..5c3b0d5e233 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -980,6 +980,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
                 { (PRFuncPtr*) &mSymbols.fBindBufferBase, { "BindBufferBase", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fBindBufferRange, { "BindBufferRange", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fGenTransformFeedbacks, { "GenTransformFeedbacks", nullptr } },
+                { (PRFuncPtr*) &mSymbols.fBindTransformFeedback, { "BindTransformFeedback", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fDeleteTransformFeedbacks, { "DeleteTransformFeedbacks", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fIsTransformFeedback, { "IsTransformFeedback", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fBeginTransformFeedback, { "BeginTransformFeedback", nullptr } },
@@ -995,6 +996,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
                 { (PRFuncPtr*) &mSymbols.fBindBufferBase, { "BindBufferBaseEXT", "BindBufferBaseNV", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fBindBufferRange, { "BindBufferRangeEXT", "BindBufferRangeNV", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fGenTransformFeedbacks, { "GenTransformFeedbacksNV", nullptr } },
+                { (PRFuncPtr*) &mSymbols.fBindTransformFeedback, { "BindTransformFeedbackNV", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fDeleteTransformFeedbacks, { "DeleteTransformFeedbacksNV", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fIsTransformFeedback, { "IsTransformFeedbackNV", nullptr } },
                 { (PRFuncPtr*) &mSymbols.fBeginTransformFeedback, { "BeginTransformFeedbackEXT", "BeginTransformFeedbackNV", nullptr } },

From 1dca44deb42bc626182ba6b823bbe33d9903a15d Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 20 Apr 2015 19:57:13 -0700
Subject: [PATCH 66/80] Bug 1133755 - Follow-up: change string in tests to
 match code. a=bustage

---
 mobile/android/base/locales/en-US/android_strings.dtd | 8 ++++----
 mobile/android/base/strings.xml.in                    | 8 ++++----
 mobile/android/base/tests/testSettingsMenuItems.java  | 3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 57d8cadef7d..0d1541e3101 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -192,10 +192,10 @@
 <!ENTITY pref_donottrack_title "Do not track">
 <!ENTITY pref_donottrack_summary "&brandShortName; will tell sites that you do not want to be tracked">
 
-<!ENTITY tab_queue_toast_message "Tab queued in &brandShortName;">
+<!ENTITY tab_queue_toast_message2 "Tab queued in &brandShortName;">
 <!ENTITY tab_queue_toast_action "Open now">
 <!ENTITY tab_queue_prompt_title "Opening multiple links?">
-<!ENTITY tab_queue_prompt_text "Open them without switching to &brandShortName; each time.">
+<!ENTITY tab_queue_prompt_text2 "Open them without switching to &brandShortName; each time.">
 <!ENTITY tab_queue_prompt_tip_text "you can change this later in Settings">
 <!ENTITY tab_queue_prompt_positive_action_button "Enable">
 <!ENTITY tab_queue_prompt_negative_action_button "Not now">
@@ -397,8 +397,8 @@ size. -->
 <!ENTITY pref_scroll_title_bar2 "Full-screen browsing">
 <!ENTITY pref_scroll_title_bar_summary "Hide the &brandShortName; title bar when scrolling down a page">
 
-<!ENTITY pref_tab_queue_title "Open multiple links">
-<!ENTITY pref_tab_queue_summary "Queue links for later instead of switching to &brandShortName; each time">
+<!ENTITY pref_tab_queue_title2 "Open multiple links">
+<!ENTITY pref_tab_queue_summary2 "Queue links for later instead of switching to &brandShortName; each time">
 
 <!-- Localization note (page_removed): This string appears in a toast message when
      any page is removed frome about:home. This includes pages that are in history,
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 5852a0d660c..9b253c68f9b 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -239,14 +239,14 @@
   <string name="pref_update_autodownload_disabled">&pref_update_autodownload_never;</string>
   <string name="pref_update_autodownload_enabled">&pref_update_autodownload_always;</string>
 
-  <string name="pref_tab_queue_title">&pref_tab_queue_title;</string>
-  <string name="pref_tab_queue_summary">&pref_tab_queue_summary;</string>
+  <string name="pref_tab_queue_title">&pref_tab_queue_title2;</string>
+  <string name="pref_tab_queue_summary">&pref_tab_queue_summary2;</string>
   <string name="tab_queue_prompt_title">&tab_queue_prompt_title;</string>
-  <string name="tab_queue_prompt_text">&tab_queue_prompt_text;</string>
+  <string name="tab_queue_prompt_text">&tab_queue_prompt_text2;</string>
   <string name="tab_queue_prompt_tip_text">&tab_queue_prompt_tip_text;</string>
   <string name="tab_queue_prompt_positive_action_button">&tab_queue_prompt_positive_action_button;</string>
   <string name="tab_queue_prompt_negative_action_button">&tab_queue_prompt_negative_action_button;</string>
-  <string name="tab_queue_toast_message">&tab_queue_toast_message;</string>
+  <string name="tab_queue_toast_message">&tab_queue_toast_message2;</string>
   <string name="tab_queue_toast_action">&tab_queue_toast_action;</string>
   <string name="tab_queue_notification_text_singular">&tab_queue_notification_text_singular;</string>
   <string name="tab_queue_notification_text_plural">&tab_queue_notification_text_plural;</string>
diff --git a/mobile/android/base/tests/testSettingsMenuItems.java b/mobile/android/base/tests/testSettingsMenuItems.java
index e1e268e1da0..a4b1a174761 100644
--- a/mobile/android/base/tests/testSettingsMenuItems.java
+++ b/mobile/android/base/tests/testSettingsMenuItems.java
@@ -207,7 +207,8 @@ public class testSettingsMenuItems extends PixelTest {
 
         // Tab Queue
         if (AppConstants.NIGHTLY_BUILD && AppConstants.MOZ_ANDROID_TAB_QUEUE) {
-            String[] tabQueue = { mStringHelper.TAB_QUEUE_LABEL, "Prevent tabs from opening immediately, but open all queued tabs the next time " + mStringHelper.BRAND_NAME + " loads." };
+            final String expected = "Queue links for later instead of switching to " + mStringHelper.BRAND_NAME + " each time";
+            String[] tabQueue = { mStringHelper.TAB_QUEUE_LABEL, expected };
             settingsMap.get(PATH_CUSTOMIZE).add(tabQueue);
         }
 

From 97a519faa06d07e371e2a4d3b6217b8e1d368ce1 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Mon, 20 Apr 2015 22:48:10 -0500
Subject: [PATCH 67/80] Bug 1156598. Remove old, dead scroll layer item code.
 r=mstange

---
 layout/base/FrameLayerBuilder.cpp    |  60 +--
 layout/base/nsDisplayItemTypesList.h |   1 -
 layout/base/nsDisplayList.cpp        | 626 ++-------------------------
 layout/base/nsDisplayList.h          | 127 +-----
 layout/base/nsLayoutUtils.cpp        | 240 +++++++++-
 layout/base/nsLayoutUtils.h          |  10 +
 layout/generic/nsGfxScrollFrame.cpp  |  43 +-
 layout/generic/nsIFrame.h            |   2 -
 8 files changed, 314 insertions(+), 795 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index a51f1c2c73c..0eeabbee319 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -3329,31 +3329,6 @@ ContainerState::ChooseAnimatedGeometryRoot(const nsDisplayList& aList,
   return false;
 }
 
-/* Checks if aPotentialScrollItem is a scroll layer item and aPotentialScrollbarItem
- * is an overlay scrollbar item for the same scroll frame.
- */
-static bool
-IsScrollLayerItemAndOverlayScrollbarForScrollFrame(
-  nsDisplayItem* aPotentialScrollItem, nsDisplayItem* aPotentialScrollbarItem)
-{
-  if (aPotentialScrollItem->GetType() == nsDisplayItem::TYPE_SCROLL_LAYER &&
-      aPotentialScrollbarItem &&
-      aPotentialScrollbarItem->GetType() == nsDisplayItem::TYPE_OWN_LAYER &&
-      LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars)) {
-    nsDisplayScrollLayer* scrollItem =
-      static_cast<nsDisplayScrollLayer*>(aPotentialScrollItem);
-    nsDisplayOwnLayer* layerItem =
-      static_cast<nsDisplayOwnLayer*>(aPotentialScrollbarItem);
-    if ((layerItem->GetFlags() &
-         (nsDisplayOwnLayer::VERTICAL_SCROLLBAR |
-          nsDisplayOwnLayer::HORIZONTAL_SCROLLBAR)) &&
-        layerItem->Frame()->GetParent() == scrollItem->GetScrollFrame()) {
-      return true;
-    }
-  }
-  return false;
-}
-
 nsIntRegion
 ContainerState::ComputeOpaqueRect(nsDisplayItem* aItem,
                                   const nsIFrame* aAnimatedGeometryRoot,
@@ -3453,27 +3428,11 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
         aList->RemoveBottom();
         item->~nsDisplayItem();
         item = aboveItem;
-      } else if (IsScrollLayerItemAndOverlayScrollbarForScrollFrame(aboveItem, item)) {
-        // If an overlay scrollbar item is between a scroll layer item and the
-        // other scroll layer items that we need to merge with just move the
-        // scrollbar item up, that way it will be on top of the scrolled content
-        // and we can try to merge all the scroll layer items.
-        aList->RemoveBottom();
-        aList->AppendToBottom(item);
-        item = aboveItem;
       } else {
         break;
       }
     }
 
-    nsDisplayList* itemSameCoordinateSystemChildren
-      = item->GetSameCoordinateSystemChildren();
-    if (item->ShouldFlattenAway(mBuilder)) {
-      aList->AppendToBottom(itemSameCoordinateSystemChildren);
-      item->~nsDisplayItem();
-      continue;
-    }
-
     nsDisplayItem::Type itemType = item->GetType();
     if (itemType == nsDisplayItem::TYPE_SCROLL_INFO_LAYER &&
         mLayerBuilder->GetContainingContainerState()) {
@@ -3489,6 +3448,14 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
       continue;
     }
 
+    nsDisplayList* itemSameCoordinateSystemChildren
+      = item->GetSameCoordinateSystemChildren();
+    if (item->ShouldFlattenAway(mBuilder)) {
+      aList->AppendToBottom(itemSameCoordinateSystemChildren);
+      item->~nsDisplayItem();
+      continue;
+    }
+
     savedItems.AppendToTop(item);
 
     NS_ASSERTION(mAppUnitsPerDevPixel == AppUnitsPerDevPixel(item),
@@ -3732,11 +3699,9 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
         SetOuterVisibleRegionForLayer(ownLayer, itemVisibleRect,
             layerContentsVisibleRect.width >= 0 ? &layerContentsVisibleRect : nullptr);
       }
-      if (itemType == nsDisplayItem::TYPE_SCROLL_LAYER ||
-          itemType == nsDisplayItem::TYPE_SCROLL_INFO_LAYER) {
-        nsDisplayScrollLayer* scrollItem = static_cast<nsDisplayScrollLayer*>(item);
-        newLayerEntry->mOpaqueForAnimatedGeometryRootParent =
-            scrollItem->IsDisplayPortOpaque();
+      if (itemType == nsDisplayItem::TYPE_SCROLL_INFO_LAYER) {
+        nsDisplayScrollInfoLayer* scrollItem = static_cast<nsDisplayScrollInfoLayer*>(item);
+        newLayerEntry->mOpaqueForAnimatedGeometryRootParent = false;
         newLayerEntry->mBaseFrameMetrics =
             scrollItem->ComputeFrameMetrics(ownLayer, mParameters);
       } else if ((itemType == nsDisplayItem::TYPE_SUBDOCUMENT ||
@@ -4450,8 +4415,7 @@ ContainerState::Finish(uint32_t* aTextContentFlags, LayerManagerData* aData,
         scrollInfoLayerEntry.mLayer = scrollInfoLayer;
         scrollInfoLayerEntry.mAnimatedGeometryRoot = animatedGeometryRoot;
         scrollInfoLayerEntry.mFixedPosFrameForLayerData = fixedPosFrame;
-        scrollInfoLayerEntry.mOpaqueForAnimatedGeometryRootParent =
-            item->IsDisplayPortOpaque();
+        scrollInfoLayerEntry.mOpaqueForAnimatedGeometryRootParent = false;
         scrollInfoLayerEntry.mBaseFrameMetrics =
             item->ComputeFrameMetrics(scrollInfoLayer, mParameters);
         SetupScrollingMetadata(&scrollInfoLayerEntry);
diff --git a/layout/base/nsDisplayItemTypesList.h b/layout/base/nsDisplayItemTypesList.h
index 16c3f781337..b7ab5fc7eca 100644
--- a/layout/base/nsDisplayItemTypesList.h
+++ b/layout/base/nsDisplayItemTypesList.h
@@ -45,7 +45,6 @@ DECLARE_DISPLAY_ITEM_TYPE(PRINT_PLUGIN)
 DECLARE_DISPLAY_ITEM_TYPE(REMOTE)
 DECLARE_DISPLAY_ITEM_TYPE(REMOTE_SHADOW)
 DECLARE_DISPLAY_ITEM_TYPE(RESOLUTION)
-DECLARE_DISPLAY_ITEM_TYPE(SCROLL_LAYER)
 DECLARE_DISPLAY_ITEM_TYPE(SCROLL_INFO_LAYER)
 DECLARE_DISPLAY_ITEM_TYPE(SELECTION_OVERLAY)
 DECLARE_DISPLAY_ITEM_TYPE(SOLID_COLOR)
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 9a49811758f..949b99f16a6 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -737,237 +737,6 @@ static void UnmarkFrameForDisplay(nsIFrame* aFrame) {
   }
 }
 
-/* static */ FrameMetrics
-nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
-                                          nsIFrame* aScrollFrame,
-                                          nsIContent* aContent,
-                                          const nsIFrame* aReferenceFrame,
-                                          Layer* aLayer,
-                                          ViewID aScrollParentId,
-                                          const nsRect& aViewport,
-                                          bool aIsRoot,
-                                          const ContainerLayerParameters& aContainerParameters)
-{
-  nsPresContext* presContext = aForFrame->PresContext();
-  int32_t auPerDevPixel = presContext->AppUnitsPerDevPixel();
-
-  nsIPresShell* presShell = presContext->GetPresShell();
-  FrameMetrics metrics;
-  metrics.SetViewport(CSSRect::FromAppUnits(aViewport));
-
-  ViewID scrollId = FrameMetrics::NULL_SCROLL_ID;
-  if (aContent) {
-    scrollId = nsLayoutUtils::FindOrCreateIDFor(aContent);
-    nsRect dp;
-    if (nsLayoutUtils::GetDisplayPort(aContent, &dp)) {
-      metrics.SetDisplayPort(CSSRect::FromAppUnits(dp));
-      nsLayoutUtils::LogTestDataForPaint(aLayer->Manager(), scrollId, "displayport",
-          metrics.GetDisplayPort());
-    }
-    if (nsLayoutUtils::GetCriticalDisplayPort(aContent, &dp)) {
-      metrics.SetCriticalDisplayPort(CSSRect::FromAppUnits(dp));
-    }
-    DisplayPortMarginsPropertyData* marginsData =
-        static_cast<DisplayPortMarginsPropertyData*>(aContent->GetProperty(nsGkAtoms::DisplayPortMargins));
-    if (marginsData) {
-      metrics.SetDisplayPortMargins(marginsData->mMargins);
-    }
-  }
-
-  nsIScrollableFrame* scrollableFrame = nullptr;
-  if (aScrollFrame)
-    scrollableFrame = aScrollFrame->GetScrollTargetFrame();
-
-  metrics.SetScrollableRect(CSSRect::FromAppUnits(
-    nsLayoutUtils::CalculateScrollableRectForFrame(scrollableFrame, aForFrame)));
-
-  if (scrollableFrame) {
-    nsPoint scrollPosition = scrollableFrame->GetScrollPosition();
-    metrics.SetScrollOffset(CSSPoint::FromAppUnits(scrollPosition));
-
-    nsPoint smoothScrollPosition = scrollableFrame->LastScrollDestination();
-    metrics.SetSmoothScrollOffset(CSSPoint::FromAppUnits(smoothScrollPosition));
-
-    // If the frame was scrolled since the last layers update, and by
-    // something other than the APZ code, we want to tell the APZ to update
-    // its scroll offset.
-    nsIAtom* lastScrollOrigin = scrollableFrame->LastScrollOrigin();
-    if (lastScrollOrigin && lastScrollOrigin != nsGkAtoms::apz) {
-      metrics.SetScrollOffsetUpdated(scrollableFrame->CurrentScrollGeneration());
-    }
-    nsIAtom* lastSmoothScrollOrigin = scrollableFrame->LastSmoothScrollOrigin();
-    if (lastSmoothScrollOrigin) {
-      metrics.SetSmoothScrollOffsetUpdated(scrollableFrame->CurrentScrollGeneration());
-    }
-
-    nsSize lineScrollAmount = scrollableFrame->GetLineScrollAmount();
-    LayoutDeviceIntSize lineScrollAmountInDevPixels =
-      LayoutDeviceIntSize::FromAppUnitsRounded(lineScrollAmount, presContext->AppUnitsPerDevPixel());
-    metrics.SetLineScrollAmount(lineScrollAmountInDevPixels);
-
-    nsSize pageScrollAmount = scrollableFrame->GetPageScrollAmount();
-    LayoutDeviceIntSize pageScrollAmountInDevPixels =
-      LayoutDeviceIntSize::FromAppUnitsRounded(pageScrollAmount, presContext->AppUnitsPerDevPixel());
-    metrics.SetPageScrollAmount(pageScrollAmountInDevPixels);
-
-    if (!aScrollFrame->GetParent() ||
-        EventStateManager::CanVerticallyScrollFrameWithWheel(aScrollFrame->GetParent()))
-    {
-      metrics.SetAllowVerticalScrollWithWheel();
-    }
-  }
-
-  metrics.SetScrollId(scrollId);
-  metrics.SetIsRoot(aIsRoot);
-  metrics.SetScrollParentId(aScrollParentId);
-
-  // Only the root scrollable frame for a given presShell should pick up
-  // the presShell's resolution. All the other frames are 1.0.
-  if (aScrollFrame == presShell->GetRootScrollFrame()) {
-    metrics.SetPresShellResolution(presShell->GetResolution());
-  } else {
-    metrics.SetPresShellResolution(1.0f);
-  }
-  // The cumulative resolution is the resolution at which the scroll frame's
-  // content is actually rendered. It includes the pres shell resolutions of
-  // all the pres shells from here up to the root, as well as any css-driven
-  // resolution. We don't need to compute it as it's already stored in the
-  // container parameters.
-  metrics.SetCumulativeResolution(aContainerParameters.Scale());
-
-  LayoutDeviceToScreenScale2D resolutionToScreen(
-      presShell->GetCumulativeResolution()
-    * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame ? aScrollFrame : aForFrame));
-  metrics.SetExtraResolution(metrics.GetCumulativeResolution() / resolutionToScreen);
-
-  metrics.SetDevPixelsPerCSSPixel(CSSToLayoutDeviceScale(
-    (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel));
-
-  // Initially, AsyncPanZoomController should render the content to the screen
-  // at the painted resolution.
-  const LayerToParentLayerScale layerToParentLayerScale(1.0f);
-  metrics.SetZoom(metrics.GetCumulativeResolution() * metrics.GetDevPixelsPerCSSPixel()
-                  * layerToParentLayerScale);
-
-  // Calculate the composition bounds as the size of the scroll frame and
-  // its origin relative to the reference frame.
-  // If aScrollFrame is null, we are in a document without a root scroll frame,
-  // so it's a xul document. In this case, use the size of the viewport frame.
-  nsIFrame* frameForCompositionBoundsCalculation = aScrollFrame ? aScrollFrame : aForFrame;
-  nsRect compositionBounds(frameForCompositionBoundsCalculation->GetOffsetToCrossDoc(aReferenceFrame),
-                           frameForCompositionBoundsCalculation->GetSize());
-  if (scrollableFrame) {
-    // If we have a scrollable frame, restrict the composition bounds to its
-    // scroll port. The scroll port excludes the frame borders and the scroll
-    // bars, which we don't want to be part of the composition bounds.
-    nsRect scrollPort = scrollableFrame->GetScrollPortRect();
-    compositionBounds = nsRect(compositionBounds.TopLeft() + scrollPort.TopLeft(),
-                               scrollPort.Size());
-  }
-  ParentLayerRect frameBounds = LayoutDeviceRect::FromAppUnits(compositionBounds, auPerDevPixel)
-                              * metrics.GetCumulativeResolution()
-                              * layerToParentLayerScale;
-  metrics.mCompositionBounds = frameBounds;
-
-  // For the root scroll frame of the root content document (RCD-RSF), the above calculation
-  // will yield the size of the viewport frame as the composition bounds, which
-  // doesn't actually correspond to what is visible when
-  // nsIDOMWindowUtils::setCSSViewport has been called to modify the visible area of
-  // the prescontext that the viewport frame is reflowed into. In that case if our
-  // document has a widget then the widget's bounds will correspond to what is
-  // visible. If we don't have a widget the root view's bounds correspond to what
-  // would be visible because they don't get modified by setCSSViewport.
-  bool isRootScrollFrame = aScrollFrame == presShell->GetRootScrollFrame();
-  bool isRootContentDocRootScrollFrame = isRootScrollFrame
-                                      && presContext->IsRootContentDocument();
-  if (isRootContentDocRootScrollFrame) {
-    if (nsIFrame* rootFrame = presShell->GetRootFrame()) {
-      // On Android, we need to do things a bit differently to get things
-      // right (see bug 983208, bug 988882). We use the bounds of the nearest
-      // widget, but clamp the height to the frame bounds height. This clamping
-      // is done to get correct results for a page where the page is sized to
-      // the screen and thus the dynamic toolbar never disappears. In such a
-      // case, we want the composition bounds to exclude the toolbar height,
-      // but the widget bounds includes it. We don't currently have a good way
-      // of knowing about the toolbar height, but clamping to the frame bounds
-      // height gives the correct answer in the cases we care about.
-#ifdef MOZ_WIDGET_ANDROID
-      nsIWidget* widget = rootFrame->GetNearestWidget();
-#else
-      nsView* view = rootFrame->GetView();
-      nsIWidget* widget = view ? view->GetWidget() : nullptr;
-#endif
-      if (widget) {
-        nsIntRect widgetBounds;
-        widget->GetBounds(widgetBounds);
-        widgetBounds.MoveTo(0,0);
-        metrics.mCompositionBounds = ParentLayerRect(ViewAs<ParentLayerPixel>(widgetBounds));
-#ifdef MOZ_WIDGET_ANDROID
-        if (frameBounds.height < metrics.mCompositionBounds.height) {
-          metrics.mCompositionBounds.height = frameBounds.height;
-        }
-#endif
-      } else {
-        LayoutDeviceIntSize contentSize;
-        if (nsLayoutUtils::GetContentViewerSize(presContext, contentSize)) {
-          LayoutDeviceToParentLayerScale scale;
-          if (presContext->GetParentPresContext()) {
-            float res = presContext->GetParentPresContext()->PresShell()->GetCumulativeResolution();
-            scale = LayoutDeviceToParentLayerScale(res);
-          }
-          metrics.mCompositionBounds.SizeTo(contentSize * scale);
-        }
-      }
-
-      // Exclude any non-overlay scroll bars from the composition bounds.
-      // This is only done for the RCD-RSF case, because otherwise the scroll
-      // port size is used and that already excludes the scroll bars.
-      if (scrollableFrame && !LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars)) {
-        nsMargin sizes = scrollableFrame->GetActualScrollbarSizes();
-        // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
-        ParentLayerMargin boundMargins = CSSMargin::FromAppUnits(sizes) * CSSToParentLayerScale(1.0f);
-        metrics.mCompositionBounds.Deflate(boundMargins);
-      }
-    }
-  }
-
-  metrics.SetRootCompositionSize(
-    nsLayoutUtils::CalculateRootCompositionSize(aScrollFrame ? aScrollFrame : aForFrame,
-                                                isRootContentDocRootScrollFrame, metrics));
-
-  if (gfxPrefs::APZPrintTree()) {
-    if (nsIContent* content = frameForCompositionBoundsCalculation->GetContent()) {
-      nsAutoString contentDescription;
-      content->Describe(contentDescription);
-      metrics.SetContentDescription(NS_LossyConvertUTF16toASCII(contentDescription));
-    }
-  }
-
-  metrics.SetPresShellId(presShell->GetPresShellId());
-
-  // If the scroll frame's content is marked 'scrollgrab', record this
-  // in the FrameMetrics so APZ knows to provide the scroll grabbing
-  // behaviour.
-  if (aScrollFrame && nsContentUtils::HasScrollgrab(aScrollFrame->GetContent())) {
-    metrics.SetHasScrollgrab(true);
-  }
-
-  // Also compute and set the background color.
-  // This is needed for APZ overscrolling support.
-  if (aScrollFrame) {
-    if (isRootScrollFrame) {
-      metrics.SetBackgroundColor(presShell->GetCanvasBackground());
-    } else {
-      nsStyleContext* backgroundStyle;
-      if (nsCSSRendering::FindBackground(aScrollFrame, &backgroundStyle)) {
-        metrics.SetBackgroundColor(backgroundStyle->StyleBackground()->mBackgroundColor);
-      }
-    }
-  }
-
-  return metrics;
-}
-
 nsDisplayListBuilder::~nsDisplayListBuilder() {
   NS_ASSERTION(mFramesMarkedForDisplay.Length() == 0,
                "All frames should have been unmarked");
@@ -1716,7 +1485,7 @@ already_AddRefed<LayerManager> nsDisplayList::PaintRoot(nsDisplayListBuilder* aB
     }
 
     root->SetFrameMetrics(
-      nsDisplayScrollLayer::ComputeFrameMetrics(frame,
+      nsLayoutUtils::ComputeFrameMetrics(frame,
                          presShell->GetRootScrollFrame(),
                          content,
                          aBuilder->FindReferenceFrameFor(frame),
@@ -4299,7 +4068,7 @@ nsDisplaySubDocument::ComputeFrameMetrics(Layer* aLayer,
                     mFrame->GetOffsetToCrossDoc(ReferenceFrame());
 
   return MakeUnique<FrameMetrics>(
-    nsDisplayScrollLayer::ComputeFrameMetrics(
+    nsLayoutUtils::ComputeFrameMetrics(
       mFrame, rootScrollFrame, rootScrollFrame->GetContent(), ReferenceFrame(),
       aLayer, mScrollParentId, viewport,
       isRootContentDocument, params));
@@ -4504,126 +4273,75 @@ bool nsDisplayStickyPosition::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplay
   return true;
 }
 
-nsDisplayScrollLayer::nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder,
-                                           nsDisplayList* aList,
-                                           nsIFrame* aForFrame,
-                                           nsIFrame* aScrolledFrame,
-                                           nsIFrame* aScrollFrame)
-  : nsDisplayWrapList(aBuilder, aForFrame, aList)
+nsDisplayScrollInfoLayer::nsDisplayScrollInfoLayer(
+  nsDisplayListBuilder* aBuilder,
+  nsIFrame* aScrolledFrame,
+  nsIFrame* aScrollFrame)
+  : nsDisplayWrapList(aBuilder, aScrollFrame)
   , mScrollFrame(aScrollFrame)
   , mScrolledFrame(aScrolledFrame)
   , mScrollParentId(aBuilder->GetCurrentScrollParentId())
-  , mDisplayPortContentsOpaque(false)
+  , mHoisted(false)
 {
 #ifdef NS_BUILD_REFCNT_LOGGING
-  MOZ_COUNT_CTOR(nsDisplayScrollLayer);
+  MOZ_COUNT_CTOR(nsDisplayScrollInfoLayer);
 #endif
-
-  NS_ASSERTION(mScrolledFrame && mScrolledFrame->GetContent(),
-               "Need a child frame with content");
-}
-
-nsDisplayScrollLayer::nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder,
-                                           nsDisplayItem* aItem,
-                                           nsIFrame* aForFrame,
-                                           nsIFrame* aScrolledFrame,
-                                           nsIFrame* aScrollFrame)
-  : nsDisplayWrapList(aBuilder, aForFrame, aItem)
-  , mScrollFrame(aScrollFrame)
-  , mScrolledFrame(aScrolledFrame)
-  , mScrollParentId(aBuilder->GetCurrentScrollParentId())
-  , mDisplayPortContentsOpaque(false)
-{
-#ifdef NS_BUILD_REFCNT_LOGGING
-  MOZ_COUNT_CTOR(nsDisplayScrollLayer);
-#endif
-
-  NS_ASSERTION(mScrolledFrame && mScrolledFrame->GetContent(),
-               "Need a child frame with content");
-}
-
-nsDisplayScrollLayer::nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder,
-                                           nsIFrame* aForFrame,
-                                           nsIFrame* aScrolledFrame,
-                                           nsIFrame* aScrollFrame)
-  : nsDisplayWrapList(aBuilder, aForFrame)
-  , mScrollFrame(aScrollFrame)
-  , mScrolledFrame(aScrolledFrame)
-  , mScrollParentId(aBuilder->GetCurrentScrollParentId())
-  , mDisplayPortContentsOpaque(false)
-{
-#ifdef NS_BUILD_REFCNT_LOGGING
-  MOZ_COUNT_CTOR(nsDisplayScrollLayer);
-#endif
-
-  NS_ASSERTION(mScrolledFrame && mScrolledFrame->GetContent(),
-               "Need a child frame with content");
 }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
-nsDisplayScrollLayer::~nsDisplayScrollLayer()
+nsDisplayScrollInfoLayer::~nsDisplayScrollInfoLayer()
 {
-  MOZ_COUNT_DTOR(nsDisplayScrollLayer);
+  MOZ_COUNT_DTOR(nsDisplayScrollInfoLayer);
 }
 #endif
 
-nsRect
-nsDisplayScrollLayer::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
-{
-  nsIScrollableFrame* sf = do_QueryFrame(mScrollFrame);
-  if (sf) {
-    *aSnap = false;
-    return sf->GetScrollPortRect() + aBuilder->ToReferenceFrame(mScrollFrame);
-  }
-  return nsDisplayWrapList::GetBounds(aBuilder, aSnap);
-}
-
-nsRect
-nsDisplayScrollLayer::GetScrolledContentRectToDraw(nsDisplayListBuilder* aBuilder,
-                                                   nsRect* aDisplayPort)
-{
-  if (aDisplayPort) {
-    // The visible region for the children may be much bigger than the hole we
-    // are viewing the children from, so that the compositor process has enough
-    // content to asynchronously pan while content is being refreshed.
-    // XXX mScrollFrame seems wrong here; we should add the offset of the
-    // scrollport
-    return *aDisplayPort + mScrollFrame->GetOffsetToCrossDoc(ReferenceFrame());
-  }
-  bool snap;
-  return GetBounds(aBuilder, &snap);
-}
-
 already_AddRefed<Layer>
-nsDisplayScrollLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
-                                 LayerManager* aManager,
-                                 const ContainerLayerParameters& aContainerParameters)
+nsDisplayScrollInfoLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
+                                     LayerManager* aManager,
+                                     const ContainerLayerParameters& aContainerParameters)
 {
+  // In general for APZ with event-regions we no longer have a need for
+  // scrollinfo layers. However, in some cases, there might be content that
+  // cannot be layerized, and so needs to scroll synchronously. To handle those
+  // cases (which are indicated by setting mHoisted to true), we still want to
+  // generate scrollinfo layers.
+  if (!mHoisted) {
+    return nullptr;
+  }
+
   ContainerLayerParameters params = aContainerParameters;
   if (mScrolledFrame->GetContent() &&
       nsLayoutUtils::GetCriticalDisplayPort(mScrolledFrame->GetContent(), nullptr)) {
     params.mInLowPrecisionDisplayPort = true;
   }
 
-  if (mList.IsOpaque()) {
-    nsRect displayport;
-    bool usingDisplayport =
-      nsLayoutUtils::GetDisplayPort(mScrolledFrame->GetContent(), &displayport);
-    mDisplayPortContentsOpaque = mList.GetBounds(aBuilder).Contains(
-        GetScrolledContentRectToDraw(aBuilder, usingDisplayport ? &displayport : nullptr));
-  } else {
-    mDisplayPortContentsOpaque = false;
-  }
-
   return aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
                            params, nullptr,
                            FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
 }
 
+LayerState
+nsDisplayScrollInfoLayer::GetLayerState(nsDisplayListBuilder* aBuilder,
+                                    LayerManager* aManager,
+                                    const ContainerLayerParameters& aParameters)
+{
+  // See comment in BuildLayer
+  return mHoisted
+    ? LAYER_ACTIVE_EMPTY
+    : LAYER_NONE;
+}
+
+bool
+nsDisplayScrollInfoLayer::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
+{
+  // See comment in BuildLayer
+  return !mHoisted;
+}
+
 UniquePtr<FrameMetrics>
-nsDisplayScrollLayer::ComputeFrameMetrics(Layer* aLayer,
-                                          const ContainerLayerParameters& aContainerParameters)
+nsDisplayScrollInfoLayer::ComputeFrameMetrics(Layer* aLayer,
+                                              const ContainerLayerParameters& aContainerParameters)
 {
   ContainerLayerParameters params = aContainerParameters;
   if (mScrolledFrame->GetContent() &&
@@ -4636,275 +4354,21 @@ nsDisplayScrollLayer::ComputeFrameMetrics(Layer* aLayer,
                     mScrollFrame->GetOffsetToCrossDoc(ReferenceFrame());
 
   return UniquePtr<FrameMetrics>(new FrameMetrics(
-    ComputeFrameMetrics(
+    nsLayoutUtils::ComputeFrameMetrics(
       mScrolledFrame, mScrollFrame, mScrollFrame->GetContent(),
       ReferenceFrame(), aLayer,
       mScrollParentId, viewport, false, params)));
 }
 
-bool
-nsDisplayScrollLayer::ShouldBuildLayerEvenIfInvisible(nsDisplayListBuilder* aBuilder)
-{
-  if (nsLayoutUtils::GetDisplayPort(mScrolledFrame->GetContent(), nullptr)) {
-    return true;
-  }
 
-  return nsDisplayWrapList::ShouldBuildLayerEvenIfInvisible(aBuilder);
-}
-
-bool
-nsDisplayScrollLayer::ComputeVisibility(nsDisplayListBuilder* aBuilder,
-                                        nsRegion* aVisibleRegion)
-{
-  if (aBuilder->IsForPluginGeometry()) {
-    return nsDisplayWrapList::ComputeVisibility(aBuilder, aVisibleRegion);
-  }
-  nsRect displayport;
-  bool usingDisplayPort =
-    nsLayoutUtils::GetDisplayPort(mScrolledFrame->GetContent(), &displayport);
-  nsRect scrolledContentRect = GetScrolledContentRectToDraw(aBuilder,
-      usingDisplayPort ? &displayport : nullptr);
-
-  nsRect boundedRect = scrolledContentRect.Intersect(mList.GetBounds(aBuilder));
-  nsRegion childVisibleRegion = scrolledContentRect;
-  bool visible = mList.ComputeVisibilityForSublist(
-    aBuilder, &childVisibleRegion, boundedRect,
-    usingDisplayPort ? mScrollFrame : nullptr);
-
-  // If APZ is enabled then don't allow this computation to influence
-  // aVisibleRegion, on the assumption that the layer can be asynchronously
-  // scrolled so we'll definitely need all the content under it.
-  if (!nsLayoutUtils::UsesAsyncScrolling()) {
-    bool snap;
-    nsRect bounds = GetBounds(aBuilder, &snap);
-    nsRegion removed;
-    removed.Sub(bounds, childVisibleRegion);
-    aBuilder->SubtractFromVisibleRegion(aVisibleRegion, removed);
-  }
-
-  return visible;
-}
-
-LayerState
-nsDisplayScrollLayer::GetLayerState(nsDisplayListBuilder* aBuilder,
-                                    LayerManager* aManager,
-                                    const ContainerLayerParameters& aParameters)
-{
-  // Force this as a layer so we can scroll asynchronously.
-  // This causes incorrect rendering for rounded clips!
-  return LAYER_ACTIVE_FORCE;
-}
-
-// Check if we are going to clip an abs pos item that we don't contain.
-// Root scroll frames clip all their descendants, so we don't need to worry
-// about them.
-bool
-WouldCauseIncorrectClippingOnAbsPosItem(nsDisplayListBuilder* aBuilder,
-                                        nsDisplayScrollLayer* aItem)
-{
-  nsIFrame* scrollFrame = aItem->GetScrollFrame();
-  nsIPresShell* presShell = scrollFrame->PresContext()->PresShell();
-  if (scrollFrame == presShell->GetRootScrollFrame()) {
-    return false;
-  }
-  nsIFrame* scrolledFrame = aItem->GetScrolledFrame();
-  nsIFrame* frame = aItem->Frame();
-  if (frame == scrolledFrame || !frame->IsAbsolutelyPositioned() ||
-      nsLayoutUtils::IsAncestorFrameCrossDoc(scrollFrame, frame, presShell->GetRootFrame())) {
-    return false;
-  }
-  if (!aItem->GetClip().IsRectAffectedByClip(aItem->GetChildren()->GetBounds(aBuilder))) {
-    return false;
-  }
-  return true;
-}
-
-bool
-nsDisplayScrollLayer::TryMerge(nsDisplayListBuilder* aBuilder,
-                               nsDisplayItem* aItem)
-{
-  if (aItem->GetType() != TYPE_SCROLL_LAYER) {
-    return false;
-  }
-  nsDisplayScrollLayer* other = static_cast<nsDisplayScrollLayer*>(aItem);
-  if (other->mScrolledFrame != this->mScrolledFrame) {
-    return false;
-  }
-  if (aItem->GetClip() != GetClip()) {
-    return false;
-  }
-
-  if (WouldCauseIncorrectClippingOnAbsPosItem(aBuilder, this) ||
-      WouldCauseIncorrectClippingOnAbsPosItem(aBuilder, other)) {
-    return false;
-  }
-
-  NS_ASSERTION(other->mReferenceFrame == mReferenceFrame,
-               "Must have the same reference frame!");
-
-  FrameProperties props = mScrolledFrame->Properties();
-  props.Set(nsIFrame::ScrollLayerCount(),
-    reinterpret_cast<void*>(GetScrollLayerCount() - 1));
-
-  // Swap frames with the other item before doing MergeFrom.
-  // XXX - This ensures that the frame associated with a scroll layer after
-  // merging is the first, rather than the last. This tends to change less,
-  // ensuring we're more likely to retain the associated gfx layer.
-  // See Bug 729534 and Bug 731641.
-  nsIFrame* tmp = mFrame;
-  mFrame = other->mFrame;
-  other->mFrame = tmp;
-  MergeFromTrackingMergedFrames(other);
-  return true;
-}
 
 void
-PropagateClip(nsDisplayListBuilder* aBuilder, const DisplayItemClip& aClip,
-              nsDisplayList* aList)
-{
-  for (nsDisplayItem* i = aList->GetBottom(); i != nullptr; i = i->GetAbove()) {
-    DisplayItemClip clip(i->GetClip());
-    clip.IntersectWith(aClip);
-    i->SetClip(aBuilder, clip);
-    nsDisplayList* list = i->GetSameCoordinateSystemChildren();
-    if (list) {
-      PropagateClip(aBuilder, aClip, list);
-    }
-  }
-}
-
-bool
-nsDisplayScrollLayer::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
-{
-  bool badAbsPosClip = WouldCauseIncorrectClippingOnAbsPosItem(aBuilder, this);
-  if (GetScrollLayerCount() > 1 || badAbsPosClip) {
-    // Propagate our clip to our children. The clip for the scroll frame is
-    // on this item, but not our child items so that they can draw non-visible
-    // parts of the display port. But if we are flattening we failed and can't
-    // draw the extra content, so it needs to be clipped.
-    // But don't induce our clip on abs pos frames that we shouldn't be clipping.
-    if (!badAbsPosClip) {
-      PropagateClip(aBuilder, GetClip(), &mList);
-    }
-
-    // Output something so the failure can be noted.
-    nsresult status;
-    mScrolledFrame->GetContent()->GetProperty(nsGkAtoms::AsyncScrollLayerCreationFailed, &status);
-    if (status == NS_PROPTABLE_PROP_NOT_THERE) {
-      mScrolledFrame->GetContent()->SetProperty(nsGkAtoms::AsyncScrollLayerCreationFailed, nullptr);
-      if (badAbsPosClip) {
-        printf_stderr("Async scrollable layer creation failed: scroll layer would induce incorrent clipping to an abs pos item.\n");
-      } else {
-        printf_stderr("Async scrollable layer creation failed: scroll layer can't have scrollable and non-scrollable items interleaved.\n");
-      }
-#ifdef MOZ_DUMP_PAINTING
-      std::stringstream ss;
-      nsFrame::PrintDisplayItem(aBuilder, this, ss, true, false);
-      printf_stderr("%s\n", ss.str().c_str());
-#endif
-    }
-
-    return true;
-  }
-  if (mFrame != mScrolledFrame) {
-    mMergedFrames.AppendElement(mFrame);
-    mFrame = mScrolledFrame;
-  }
-  return false;
-}
-
-intptr_t
-nsDisplayScrollLayer::GetScrollLayerCount()
-{
-  FrameProperties props = mScrolledFrame->Properties();
-#ifdef DEBUG
-  bool hasCount = false;
-  intptr_t result = reinterpret_cast<intptr_t>(
-    props.Get(nsIFrame::ScrollLayerCount(), &hasCount));
-  // If this aborts, then the property was either not added before scroll
-  // layers were created or the property was deleted to early. If the latter,
-  // make sure that nsDisplayScrollInfoLayer is on the bottom of the list so
-  // that it is processed last.
-  MOZ_ASSERT(hasCount, "nsDisplayScrollLayer should always be defined");
-  return result;
-#else
-  return reinterpret_cast<intptr_t>(props.Get(nsIFrame::ScrollLayerCount()));
-#endif
-}
-
-void
-nsDisplayScrollLayer::WriteDebugInfo(std::stringstream& aStream)
+nsDisplayScrollInfoLayer::WriteDebugInfo(std::stringstream& aStream)
 {
   aStream << " (scrollframe " << mScrollFrame
           << " scrolledFrame " << mScrolledFrame << ")";
 }
 
-nsDisplayScrollInfoLayer::nsDisplayScrollInfoLayer(
-  nsDisplayListBuilder* aBuilder,
-  nsIFrame* aScrolledFrame,
-  nsIFrame* aScrollFrame)
-  : nsDisplayScrollLayer(aBuilder, aScrollFrame, aScrolledFrame, aScrollFrame)
-  , mHoisted(false)
-{
-#ifdef NS_BUILD_REFCNT_LOGGING
-  MOZ_COUNT_CTOR(nsDisplayScrollInfoLayer);
-#endif
-}
-
-nsDisplayScrollInfoLayer::~nsDisplayScrollInfoLayer()
-{
-  MOZ_COUNT_DTOR(nsDisplayScrollInfoLayer);
-}
-
-nsRect
-nsDisplayScrollInfoLayer::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
-{
-  return nsDisplayWrapList::GetBounds(aBuilder, aSnap);
-}
-
-already_AddRefed<Layer>
-nsDisplayScrollInfoLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
-                                     LayerManager* aManager,
-                                     const ContainerLayerParameters& aContainerParameters)
-{
-  // In general for APZ with event-regions we no longer have a need for
-  // scrollinfo layers. However, in some cases, there might be content that
-  // cannot be layerized, and so needs to scroll synchronously. To handle those
-  // cases (which are indicated by setting mHoisted to true), we still want to
-  // generate scrollinfo layers.
-  return mHoisted
-    ? nsDisplayScrollLayer::BuildLayer(aBuilder, aManager, aContainerParameters)
-    : nullptr;
-}
-
-LayerState
-nsDisplayScrollInfoLayer::GetLayerState(nsDisplayListBuilder* aBuilder,
-                                        LayerManager* aManager,
-                                        const ContainerLayerParameters& aParameters)
-{
-  // See comment in BuildLayer
-  return mHoisted
-    ? LAYER_ACTIVE_EMPTY
-    : LAYER_NONE;
-}
-
-bool
-nsDisplayScrollInfoLayer::TryMerge(nsDisplayListBuilder* aBuilder,
-                                   nsDisplayItem* aItem)
-{
-  return false;
-}
-
-bool
-nsDisplayScrollInfoLayer::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
-{
-  // Layer metadata for a particular scroll frame needs to be unique. Only
-  // one nsDisplayScrollLayer (with rendered content) or one
-  // nsDisplayScrollInfoLayer (with only the metadata) should survive the
-  // visibility computation.
-  return GetScrollLayerCount() == 1;
-}
-
 nsDisplayZoom::nsDisplayZoom(nsDisplayListBuilder* aBuilder,
                              nsIFrame* aFrame, nsDisplayList* aList,
                              int32_t aAPD, int32_t aParentAPD,
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 0e468705c07..b3ba4f4afa0 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1049,7 +1049,7 @@ public:
   /**
    * Pairing this with the GetUnderlyingFrame() pointer gives a key that
    * uniquely identifies this display item in the display item tree.
-   * XXX check ScrollLayerWrapper/nsOptionEventGrabberWrapper/nsXULEventRedirectorWrapper
+   * XXX check nsOptionEventGrabberWrapper/nsXULEventRedirectorWrapper
    */
   virtual uint32_t GetPerFrameKey() { return uint32_t(GetType()); }
   /**
@@ -3175,58 +3175,28 @@ public:
 };
 
 /**
- * This potentially creates a layer for the given list of items, whose
- * visibility is determined by the displayport for the given frame instead of
- * normal visibility computation.
- *
- * Here in content, we can use this to render more content than is actually
- * visible. Then, the compositing process can manipulate the generated layer
- * through transformations so that asynchronous scrolling can be implemented.
- *
- * Note that setting the displayport will not change any hit testing! The
- * content process will know nothing about what the user is actually seeing,
- * so it can only do hit testing for what is supposed to be the visible region.
- *
- * It is possible for scroll boxes to have content that can be both above and
- * below content outside of the scroll box. We cannot create layers for these
- * cases. This is accomplished by wrapping display items with
- * nsDisplayScrollLayers. nsDisplayScrollLayers with the same scroll frame will
- * be merged together. If more than one nsDisplayScrollLayer exists after
- * merging, all nsDisplayScrollLayers will be flattened out so that no new
- * layer is created at all.
+ * This creates an empty scrollable layer. It has no child layers.
+ * It is used to record the existence of a scrollable frame in the layer
+ * tree.
  */
-class nsDisplayScrollLayer : public nsDisplayWrapList
+class nsDisplayScrollInfoLayer : public nsDisplayWrapList
 {
 public:
-  /**
-   * @param aScrolledFrame This will determine what the displayport is. It should be
-   *                       the root content frame of the scrolled area. Note
-   *                       that nsDisplayScrollLayer will expect for
-   *                       ScrollLayerCount to be defined on aScrolledFrame.
-   * @param aScrollFrame The viewport frame you see this content through.
-   */
-  nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
-                       nsIFrame* aForFrame, nsIFrame* aScrolledFrame,
-                       nsIFrame* aScrollFrame);
-  nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem,
-                       nsIFrame* aForFrame, nsIFrame* aScrolledFrame,
-                       nsIFrame* aScrollFrame);
-  nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder,
-                       nsIFrame* aForFrame, nsIFrame* aScrolledFrame,
-                       nsIFrame* aScrollFrame);
-  NS_DISPLAY_DECL_NAME("ScrollLayer", TYPE_SCROLL_LAYER)
+  nsDisplayScrollInfoLayer(nsDisplayListBuilder* aBuilder,
+                           nsIFrame* aScrolledFrame, nsIFrame* aScrollFrame);
+  NS_DISPLAY_DECL_NAME("ScrollInfoLayer", TYPE_SCROLL_INFO_LAYER)
+
 
 #ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayScrollLayer();
+  virtual ~nsDisplayScrollInfoLayer();
 #endif
 
-  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) override;
-
   virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
                                              LayerManager* aManager,
                                              const ContainerLayerParameters& aContainerParameters) override;
 
-  virtual bool ShouldBuildLayerEvenIfInvisible(nsDisplayListBuilder* aBuilder) override;
+  virtual bool ShouldBuildLayerEvenIfInvisible(nsDisplayListBuilder* aBuilder) override
+  { return true; }
 
   virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
                                    bool* aSnap) override {
@@ -3234,92 +3204,23 @@ public:
     return nsRegion();
   }
 
-  virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
-                                 nsRegion* aVisibleRegion) override;
-
   virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
                                    LayerManager* aManager,
                                    const ContainerLayerParameters& aParameters) override;
 
-  virtual bool TryMerge(nsDisplayListBuilder* aBuilder,
-                          nsDisplayItem* aItem) override;
-
   virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override;
 
-  // Get the number of nsDisplayScrollLayers for a scroll frame. Note that this
-  // number does not include nsDisplayScrollInfoLayers. If this number is not 1
-  // after merging, all the nsDisplayScrollLayers should flatten away.
-  intptr_t GetScrollLayerCount();
-
-  virtual nsIFrame* GetScrollFrame() { return mScrollFrame; }
-  virtual nsIFrame* GetScrolledFrame() { return mScrolledFrame; }
-
   virtual void WriteDebugInfo(std::stringstream& aStream) override;
 
-  bool IsDisplayPortOpaque() { return mDisplayPortContentsOpaque; }
-
-  static FrameMetrics ComputeFrameMetrics(nsIFrame* aForFrame,
-                                          nsIFrame* aScrollFrame,
-                                          nsIContent* aContent,
-                                          const nsIFrame* aReferenceFrame,
-                                          Layer* aLayer,
-                                          ViewID aScrollParentId,
-                                          const nsRect& aViewport,
-                                          bool aIsRoot,
-                                          const ContainerLayerParameters& aContainerParameters);
-
   mozilla::UniquePtr<FrameMetrics> ComputeFrameMetrics(Layer* aLayer,
                                                        const ContainerLayerParameters& aContainerParameters);
 
-protected:
-  nsRect GetScrolledContentRectToDraw(nsDisplayListBuilder* aBuilder,
-                                      nsRect* aDisplayPort);
+  void MarkHoisted() { mHoisted = true; }
 
+protected:
   nsIFrame* mScrollFrame;
   nsIFrame* mScrolledFrame;
   ViewID mScrollParentId;
-  bool mDisplayPortContentsOpaque;
-};
-
-/**
- * Like nsDisplayScrollLayer, but only has metadata on the scroll frame. This
- * creates a layer that has no Thebes child layer, but still allows the
- * compositor process to know of the scroll frame's existence.
- *
- * After visibility computation, nsDisplayScrollInfoLayers should only exist if
- * nsDisplayScrollLayers were all flattened away.
- *
- * Important!! Add info layers to the bottom of the list so they are only
- * considered after the others have flattened out!
- */
-class nsDisplayScrollInfoLayer : public nsDisplayScrollLayer
-{
-public:
-  nsDisplayScrollInfoLayer(nsDisplayListBuilder* aBuilder,
-                           nsIFrame* aScrolledFrame, nsIFrame* aScrollFrame);
-  NS_DISPLAY_DECL_NAME("ScrollInfoLayer", TYPE_SCROLL_INFO_LAYER)
-
-  virtual ~nsDisplayScrollInfoLayer();
-
-  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) override;
-
-  virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
-                                             LayerManager* aManager,
-                                             const ContainerLayerParameters& aContainerParameters) override;
-
-  virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
-                                   LayerManager* aManager,
-                                   const ContainerLayerParameters& aParameters) override;
-  virtual bool ShouldBuildLayerEvenIfInvisible(nsDisplayListBuilder* aBuilder) override
-  { return true; }
-  virtual bool TryMerge(nsDisplayListBuilder* aBuilder,
-                          nsDisplayItem* aItem) override;
-
-  virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override;
-
-  void MarkHoisted() { mHoisted = true; }
-
-private:
   bool mHoisted;
 };
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 13465eac8c4..a5b7af3bbf7 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -98,6 +98,7 @@
 #include "mozilla/layers/APZCTreeManager.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/EventDispatcher.h"
+#include "mozilla/EventStateManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
@@ -107,7 +108,6 @@
 #include "nsAnimationManager.h"
 #include "nsTransitionManager.h"
 #include "RestyleManager.h"
-#include "mozilla/EventDispatcher.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -1827,13 +1827,6 @@ nsLayoutUtils::GetAnimatedGeometryRootFor(nsDisplayItem* aItem,
                                           LayerManager* aManager)
 {
   nsIFrame* f = aItem->Frame();
-  if (aItem->GetType() == nsDisplayItem::TYPE_SCROLL_LAYER) {
-    nsDisplayScrollLayer* scrollLayerItem =
-      static_cast<nsDisplayScrollLayer*>(aItem);
-    nsIFrame* scrolledFrame = scrollLayerItem->GetScrolledFrame();
-    return GetAnimatedGeometryRootForFrame(aBuilder, scrolledFrame,
-        aBuilder->FindReferenceFrameFor(scrolledFrame));
-  }
   if (aItem->ShouldFixToViewport(aManager)) {
     // Make its active scrolled root be the active scrolled root of
     // the enclosing viewport, since it shouldn't be scrolled by scrolled
@@ -8084,6 +8077,237 @@ nsLayoutUtils::SetCSSViewport(nsIPresShell* aPresShell, CSSSize aSize)
   aPresShell->ResizeReflowOverride(width, height);
 }
 
+/* static */ FrameMetrics
+nsLayoutUtils::ComputeFrameMetrics(nsIFrame* aForFrame,
+                                   nsIFrame* aScrollFrame,
+                                   nsIContent* aContent,
+                                   const nsIFrame* aReferenceFrame,
+                                   Layer* aLayer,
+                                   ViewID aScrollParentId,
+                                   const nsRect& aViewport,
+                                   bool aIsRoot,
+                                   const ContainerLayerParameters& aContainerParameters)
+{
+  nsPresContext* presContext = aForFrame->PresContext();
+  int32_t auPerDevPixel = presContext->AppUnitsPerDevPixel();
+
+  nsIPresShell* presShell = presContext->GetPresShell();
+  FrameMetrics metrics;
+  metrics.SetViewport(CSSRect::FromAppUnits(aViewport));
+
+  ViewID scrollId = FrameMetrics::NULL_SCROLL_ID;
+  if (aContent) {
+    scrollId = nsLayoutUtils::FindOrCreateIDFor(aContent);
+    nsRect dp;
+    if (nsLayoutUtils::GetDisplayPort(aContent, &dp)) {
+      metrics.SetDisplayPort(CSSRect::FromAppUnits(dp));
+      nsLayoutUtils::LogTestDataForPaint(aLayer->Manager(), scrollId, "displayport",
+          metrics.GetDisplayPort());
+    }
+    if (nsLayoutUtils::GetCriticalDisplayPort(aContent, &dp)) {
+      metrics.SetCriticalDisplayPort(CSSRect::FromAppUnits(dp));
+    }
+    DisplayPortMarginsPropertyData* marginsData =
+        static_cast<DisplayPortMarginsPropertyData*>(aContent->GetProperty(nsGkAtoms::DisplayPortMargins));
+    if (marginsData) {
+      metrics.SetDisplayPortMargins(marginsData->mMargins);
+    }
+  }
+
+  nsIScrollableFrame* scrollableFrame = nullptr;
+  if (aScrollFrame)
+    scrollableFrame = aScrollFrame->GetScrollTargetFrame();
+
+  metrics.SetScrollableRect(CSSRect::FromAppUnits(
+    nsLayoutUtils::CalculateScrollableRectForFrame(scrollableFrame, aForFrame)));
+
+  if (scrollableFrame) {
+    nsPoint scrollPosition = scrollableFrame->GetScrollPosition();
+    metrics.SetScrollOffset(CSSPoint::FromAppUnits(scrollPosition));
+
+    nsPoint smoothScrollPosition = scrollableFrame->LastScrollDestination();
+    metrics.SetSmoothScrollOffset(CSSPoint::FromAppUnits(smoothScrollPosition));
+
+    // If the frame was scrolled since the last layers update, and by
+    // something other than the APZ code, we want to tell the APZ to update
+    // its scroll offset.
+    nsIAtom* lastScrollOrigin = scrollableFrame->LastScrollOrigin();
+    if (lastScrollOrigin && lastScrollOrigin != nsGkAtoms::apz) {
+      metrics.SetScrollOffsetUpdated(scrollableFrame->CurrentScrollGeneration());
+    }
+    nsIAtom* lastSmoothScrollOrigin = scrollableFrame->LastSmoothScrollOrigin();
+    if (lastSmoothScrollOrigin) {
+      metrics.SetSmoothScrollOffsetUpdated(scrollableFrame->CurrentScrollGeneration());
+    }
+
+    nsSize lineScrollAmount = scrollableFrame->GetLineScrollAmount();
+    LayoutDeviceIntSize lineScrollAmountInDevPixels =
+      LayoutDeviceIntSize::FromAppUnitsRounded(lineScrollAmount, presContext->AppUnitsPerDevPixel());
+    metrics.SetLineScrollAmount(lineScrollAmountInDevPixels);
+
+    nsSize pageScrollAmount = scrollableFrame->GetPageScrollAmount();
+    LayoutDeviceIntSize pageScrollAmountInDevPixels =
+      LayoutDeviceIntSize::FromAppUnitsRounded(pageScrollAmount, presContext->AppUnitsPerDevPixel());
+    metrics.SetPageScrollAmount(pageScrollAmountInDevPixels);
+
+    if (!aScrollFrame->GetParent() ||
+        EventStateManager::CanVerticallyScrollFrameWithWheel(aScrollFrame->GetParent()))
+    {
+      metrics.SetAllowVerticalScrollWithWheel();
+    }
+  }
+
+  metrics.SetScrollId(scrollId);
+  metrics.SetIsRoot(aIsRoot);
+  metrics.SetScrollParentId(aScrollParentId);
+
+  // Only the root scrollable frame for a given presShell should pick up
+  // the presShell's resolution. All the other frames are 1.0.
+  if (aScrollFrame == presShell->GetRootScrollFrame()) {
+    metrics.SetPresShellResolution(presShell->GetResolution());
+  } else {
+    metrics.SetPresShellResolution(1.0f);
+  }
+  // The cumulative resolution is the resolution at which the scroll frame's
+  // content is actually rendered. It includes the pres shell resolutions of
+  // all the pres shells from here up to the root, as well as any css-driven
+  // resolution. We don't need to compute it as it's already stored in the
+  // container parameters.
+  metrics.SetCumulativeResolution(aContainerParameters.Scale());
+
+  LayoutDeviceToScreenScale2D resolutionToScreen(
+      presShell->GetCumulativeResolution()
+    * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame ? aScrollFrame : aForFrame));
+  metrics.SetExtraResolution(metrics.GetCumulativeResolution() / resolutionToScreen);
+
+  metrics.SetDevPixelsPerCSSPixel(CSSToLayoutDeviceScale(
+    (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel));
+
+  // Initially, AsyncPanZoomController should render the content to the screen
+  // at the painted resolution.
+  const LayerToParentLayerScale layerToParentLayerScale(1.0f);
+  metrics.SetZoom(metrics.GetCumulativeResolution() * metrics.GetDevPixelsPerCSSPixel()
+                  * layerToParentLayerScale);
+
+  // Calculate the composition bounds as the size of the scroll frame and
+  // its origin relative to the reference frame.
+  // If aScrollFrame is null, we are in a document without a root scroll frame,
+  // so it's a xul document. In this case, use the size of the viewport frame.
+  nsIFrame* frameForCompositionBoundsCalculation = aScrollFrame ? aScrollFrame : aForFrame;
+  nsRect compositionBounds(frameForCompositionBoundsCalculation->GetOffsetToCrossDoc(aReferenceFrame),
+                           frameForCompositionBoundsCalculation->GetSize());
+  if (scrollableFrame) {
+    // If we have a scrollable frame, restrict the composition bounds to its
+    // scroll port. The scroll port excludes the frame borders and the scroll
+    // bars, which we don't want to be part of the composition bounds.
+    nsRect scrollPort = scrollableFrame->GetScrollPortRect();
+    compositionBounds = nsRect(compositionBounds.TopLeft() + scrollPort.TopLeft(),
+                               scrollPort.Size());
+  }
+  ParentLayerRect frameBounds = LayoutDeviceRect::FromAppUnits(compositionBounds, auPerDevPixel)
+                              * metrics.GetCumulativeResolution()
+                              * layerToParentLayerScale;
+  metrics.mCompositionBounds = frameBounds;
+
+  // For the root scroll frame of the root content document (RCD-RSF), the above calculation
+  // will yield the size of the viewport frame as the composition bounds, which
+  // doesn't actually correspond to what is visible when
+  // nsIDOMWindowUtils::setCSSViewport has been called to modify the visible area of
+  // the prescontext that the viewport frame is reflowed into. In that case if our
+  // document has a widget then the widget's bounds will correspond to what is
+  // visible. If we don't have a widget the root view's bounds correspond to what
+  // would be visible because they don't get modified by setCSSViewport.
+  bool isRootScrollFrame = aScrollFrame == presShell->GetRootScrollFrame();
+  bool isRootContentDocRootScrollFrame = isRootScrollFrame
+                                      && presContext->IsRootContentDocument();
+  if (isRootContentDocRootScrollFrame) {
+    if (nsIFrame* rootFrame = presShell->GetRootFrame()) {
+      // On Android, we need to do things a bit differently to get things
+      // right (see bug 983208, bug 988882). We use the bounds of the nearest
+      // widget, but clamp the height to the frame bounds height. This clamping
+      // is done to get correct results for a page where the page is sized to
+      // the screen and thus the dynamic toolbar never disappears. In such a
+      // case, we want the composition bounds to exclude the toolbar height,
+      // but the widget bounds includes it. We don't currently have a good way
+      // of knowing about the toolbar height, but clamping to the frame bounds
+      // height gives the correct answer in the cases we care about.
+#ifdef MOZ_WIDGET_ANDROID
+      nsIWidget* widget = rootFrame->GetNearestWidget();
+#else
+      nsView* view = rootFrame->GetView();
+      nsIWidget* widget = view ? view->GetWidget() : nullptr;
+#endif
+      if (widget) {
+        nsIntRect widgetBounds;
+        widget->GetBounds(widgetBounds);
+        widgetBounds.MoveTo(0,0);
+        metrics.mCompositionBounds = ParentLayerRect(ViewAs<ParentLayerPixel>(widgetBounds));
+#ifdef MOZ_WIDGET_ANDROID
+        if (frameBounds.height < metrics.mCompositionBounds.height) {
+          metrics.mCompositionBounds.height = frameBounds.height;
+        }
+#endif
+      } else {
+        LayoutDeviceIntSize contentSize;
+        if (nsLayoutUtils::GetContentViewerSize(presContext, contentSize)) {
+          LayoutDeviceToParentLayerScale scale;
+          if (presContext->GetParentPresContext()) {
+            float res = presContext->GetParentPresContext()->PresShell()->GetCumulativeResolution();
+            scale = LayoutDeviceToParentLayerScale(res);
+          }
+          metrics.mCompositionBounds.SizeTo(contentSize * scale);
+        }
+      }
+
+      // Exclude any non-overlay scroll bars from the composition bounds.
+      // This is only done for the RCD-RSF case, because otherwise the scroll
+      // port size is used and that already excludes the scroll bars.
+      if (scrollableFrame && !LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars)) {
+        nsMargin sizes = scrollableFrame->GetActualScrollbarSizes();
+        // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
+        ParentLayerMargin boundMargins = CSSMargin::FromAppUnits(sizes) * CSSToParentLayerScale(1.0f);
+        metrics.mCompositionBounds.Deflate(boundMargins);
+      }
+    }
+  }
+
+  metrics.SetRootCompositionSize(
+    nsLayoutUtils::CalculateRootCompositionSize(aScrollFrame ? aScrollFrame : aForFrame,
+                                                isRootContentDocRootScrollFrame, metrics));
+
+  if (gfxPrefs::APZPrintTree()) {
+    if (nsIContent* content = frameForCompositionBoundsCalculation->GetContent()) {
+      nsAutoString contentDescription;
+      content->Describe(contentDescription);
+      metrics.SetContentDescription(NS_LossyConvertUTF16toASCII(contentDescription));
+    }
+  }
+
+  metrics.SetPresShellId(presShell->GetPresShellId());
+
+  // If the scroll frame's content is marked 'scrollgrab', record this
+  // in the FrameMetrics so APZ knows to provide the scroll grabbing
+  // behaviour.
+  if (aScrollFrame && nsContentUtils::HasScrollgrab(aScrollFrame->GetContent())) {
+    metrics.SetHasScrollgrab(true);
+  }
+
+  // Also compute and set the background color.
+  // This is needed for APZ overscrolling support.
+  if (aScrollFrame) {
+    if (isRootScrollFrame) {
+      metrics.SetBackgroundColor(presShell->GetCanvasBackground());
+    } else {
+      nsStyleContext* backgroundStyle;
+      if (nsCSSRendering::FindBackground(aScrollFrame, &backgroundStyle)) {
+        metrics.SetBackgroundColor(backgroundStyle->StyleBackground()->mBackgroundColor);
+      }
+    }
+  }
+
+  return metrics;
+}
+
 /* static */ uint32_t
 nsLayoutUtils::GetTouchActionFromFrame(nsIFrame* aFrame)
 {
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 62348b8de17..5ebcc3e7dbf 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -2604,6 +2604,16 @@ public:
    */
   static void SetCSSViewport(nsIPresShell* aPresShell, CSSSize aSize);
 
+  static FrameMetrics ComputeFrameMetrics(nsIFrame* aForFrame,
+                                          nsIFrame* aScrollFrame,
+                                          nsIContent* aContent,
+                                          const nsIFrame* aReferenceFrame,
+                                          Layer* aLayer,
+                                          ViewID aScrollParentId,
+                                          const nsRect& aViewport,
+                                          bool aIsRoot,
+                                          const ContainerLayerParameters& aContainerParameters);
+
 private:
   static uint32_t sFontSizeInflationEmPerLine;
   static uint32_t sFontSizeInflationMinTwips;
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 2c5e4f0a82c..79f33870aeb 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2605,43 +2605,6 @@ ScrollFrameHelper::AppendScrollPartsTo(nsDisplayListBuilder*   aBuilder,
   }
 }
 
-class ScrollLayerWrapper : public nsDisplayWrapper
-{
-public:
-  ScrollLayerWrapper(nsIFrame* aScrollFrame, nsIFrame* aScrolledFrame)
-    : mCount(0)
-    , mProps(aScrolledFrame->Properties())
-    , mScrollFrame(aScrollFrame)
-    , mScrolledFrame(aScrolledFrame)
-  {
-    SetCount(0);
-  }
-
-  virtual nsDisplayItem* WrapList(nsDisplayListBuilder* aBuilder,
-                                  nsIFrame* aFrame,
-                                  nsDisplayList* aList) override {
-    SetCount(++mCount);
-    return new (aBuilder) nsDisplayScrollLayer(aBuilder, aList, mScrolledFrame, mScrolledFrame, mScrollFrame);
-  }
-
-  virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
-                                  nsDisplayItem* aItem) override {
-
-    SetCount(++mCount);
-    return new (aBuilder) nsDisplayScrollLayer(aBuilder, aItem, aItem->Frame(), mScrolledFrame, mScrollFrame);
-  }
-
-protected:
-  void SetCount(intptr_t aCount) {
-    mProps.Set(nsIFrame::ScrollLayerCount(), reinterpret_cast<void*>(aCount));
-  }
-
-  intptr_t mCount;
-  FrameProperties mProps;
-  nsIFrame* mScrollFrame;
-  nsIFrame* mScrolledFrame;
-};
-
 /* static */ bool ScrollFrameHelper::sImageVisPrefsCached = false;
 /* static */ uint32_t ScrollFrameHelper::sHorzExpandScrollPort = 0;
 /* static */ uint32_t ScrollFrameHelper::sVertExpandScrollPort = 1;
@@ -3032,10 +2995,6 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   }
 
   if (shouldBuildLayer) {
-    // ScrollLayerWrapper must always be created because it initializes the
-    // scroll layer count. The display lists depend on this.
-    ScrollLayerWrapper wrapper(mOuter, mScrolledFrame);
-
     // Make sure that APZ will dispatch events back to content so we can create
     // a displayport for this frame. We'll add the item later on.
     nsDisplayLayerEventRegions* inactiveRegionItem = nullptr;
@@ -3110,7 +3069,7 @@ ScrollFrameHelper::ComputeFrameMetrics(Layer* aLayer,
 
   nsRect scrollport = mScrollPort + toReferenceFrame;
   *aOutput->AppendElement() =
-      nsDisplayScrollLayer::ComputeFrameMetrics(
+      nsLayoutUtils::ComputeFrameMetrics(
         mScrolledFrame, mOuter, mOuter->GetContent(),
         aContainerReferenceFrame, aLayer, mScrollParentID,
         scrollport, isRoot, aParameters);
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index a3453427aa6..8021d56145a 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -860,8 +860,6 @@ public:
   NS_DECLARE_FRAME_PROPERTY(UsedPaddingProperty, DeleteValue<nsMargin>)
   NS_DECLARE_FRAME_PROPERTY(UsedBorderProperty, DeleteValue<nsMargin>)
 
-  NS_DECLARE_FRAME_PROPERTY(ScrollLayerCount, nullptr)
-
   NS_DECLARE_FRAME_PROPERTY(LineBaselineOffset, nullptr)
 
   NS_DECLARE_FRAME_PROPERTY(CachedBackgroundImage, ReleaseValue<gfxASurface>)

From e69fca60263d0f3a1ccb485dfa10546e8bf4b117 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 20 Apr 2015 22:43:59 -0500
Subject: [PATCH 68/80] Bug 1154556 - OdinMonkey: remove a dead field from
 AsmJSActivation (r=bbouvier)

---
 js/src/vm/Stack.cpp | 6 ------
 js/src/vm/Stack.h   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 5c3a7708f1b..63e554292a8 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1614,18 +1614,12 @@ AsmJSActivation::AsmJSActivation(JSContext* cx, AsmJSModule& module)
   : Activation(cx, AsmJS),
     module_(module),
     entrySP_(nullptr),
-    profiler_(nullptr),
     resumePC_(nullptr),
     fp_(nullptr),
     exitReason_(AsmJSExit::None)
 {
     (void) entrySP_;  // squelch GCC warning
 
-    // NB: this is a hack and can be removed once Ion switches over to
-    // JS::ProfilingFrameIterator.
-    if (cx->runtime()->spsProfiler.enabled())
-        profiler_ = &cx->runtime()->spsProfiler;
-
     prevAsmJSForModule_ = module.activation();
     module.activation() = this;
 
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 80308113ee1..56b73ff35a8 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1523,7 +1523,6 @@ class AsmJSActivation : public Activation
     AsmJSActivation* prevAsmJS_;
     AsmJSActivation* prevAsmJSForModule_;
     void* entrySP_;
-    SPSProfiler* profiler_;
     void* resumePC_;
     uint8_t* fp_;
     AsmJSExit::Reason exitReason_;

From 8dc87dde6265f45aed1148335993a142356dd631 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 20 Apr 2015 22:48:00 -0500
Subject: [PATCH 69/80] Bug 1154556 - OdinMonkey: simplify icache flushing
 (r=bbouvier)

---
 js/src/asmjs/AsmJSLink.cpp     | 20 +++++---------------
 js/src/asmjs/AsmJSModule.cpp   | 15 +++++++++------
 js/src/asmjs/AsmJSValidate.cpp |  5 +++--
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/js/src/asmjs/AsmJSLink.cpp b/js/src/asmjs/AsmJSLink.cpp
index 523e5b9c3db..9e080af8562 100644
--- a/js/src/asmjs/AsmJSLink.cpp
+++ b/js/src/asmjs/AsmJSLink.cpp
@@ -60,8 +60,6 @@ CloneModule(JSContext* cx, MutableHandle<AsmJSModuleObject*> moduleObj)
     if (!moduleObj->module().clone(cx, &module))
         return false;
 
-    module->staticallyLink(cx);
-
     AsmJSModuleObject* newModuleObj = AsmJSModuleObject::create(cx, &module);
     if (!newModuleObj)
         return false;
@@ -1049,27 +1047,19 @@ LinkAsmJS(JSContext* cx, unsigned argc, JS::Value* vp)
     RootedFunction fun(cx, &args.callee().as<JSFunction>());
     Rooted<AsmJSModuleObject*> moduleObj(cx, &ModuleFunctionToModuleObject(fun));
 
-    // All ICache flushing of the module being linked has been inhibited under the
-    // assumption that the module is flushed after dynamic linking (when the last code
-    // mutation occurs).  Thus, enter an AutoFlushICache context for the entire module
-    // now.  The module range is set below.
-    AutoFlushICache afc("LinkAsmJS");
 
     // When a module is linked, it is dynamically specialized to the given
     // arguments (buffer, ffis). Thus, if the module is linked again (it is just
     // a function so it can be called multiple times), we need to clone a new
     // module.
-    if (moduleObj->module().isDynamicallyLinked()) {
-        if (!CloneModule(cx, &moduleObj))
-            return false;
-    } else {
-        // CloneModule already calls setAutoFlushICacheRange internally before patching
-        // the cloned module, so avoid calling twice.
-        moduleObj->module().setAutoFlushICacheRange();
-    }
+    if (moduleObj->module().isDynamicallyLinked() && !CloneModule(cx, &moduleObj))
+        return false;
 
     AsmJSModule& module = moduleObj->module();
 
+    AutoFlushICache afc("LinkAsmJS");
+    module.setAutoFlushICacheRange();
+
     // Link the module by performing the link-time validation checks in the
     // asm.js spec and then patching the generated module to associate it with
     // the given heap (ArrayBuffer) and a new global data segment (the closure
diff --git a/js/src/asmjs/AsmJSModule.cpp b/js/src/asmjs/AsmJSModule.cpp
index 9a8975763ea..172ca8c79a4 100644
--- a/js/src/asmjs/AsmJSModule.cpp
+++ b/js/src/asmjs/AsmJSModule.cpp
@@ -930,6 +930,9 @@ AsmJSModule::detachHeap(JSContext* cx)
     MOZ_ASSERT_IF(active(), activation()->exitReason() == AsmJSExit::Reason_JitFFI ||
                             activation()->exitReason() == AsmJSExit::Reason_SlowFFI);
 
+    AutoFlushICache afc("AsmJSModule::detachHeap");
+    setAutoFlushICacheRange();
+
     restoreHeapToInitialState(maybeHeap_);
 
     MOZ_ASSERT(hasDetachedHeap());
@@ -1654,11 +1657,13 @@ AsmJSModule::clone(JSContext* cx, ScopedJSDeletePtr<AsmJSModule>* moduleOut) con
         }
     }
 
-    // We already know the exact extent of areas that need to be patched, just make sure we
-    // flush all of them at once.
+
+    // Delay flushing until dynamic linking.
+    AutoFlushICache afc("AsmJSModule::clone", /* inhibit = */ true);
     out.setAutoFlushICacheRange();
 
     out.restoreToInitialState(maybeHeap_, code_, cx);
+    out.staticallyLink(cx);
     return true;
 }
 
@@ -2250,10 +2255,8 @@ js::LookupAsmJSModuleInCache(ExclusiveContext* cx,
     parser.tokenStream.advance(module->srcEndBeforeCurly());
 
     {
-        // No need to flush the instruction cache now, it will be flushed when
-        // dynamically linking. We already know the exact extent of areas that need
-        // to be patched, just make sure we flush all of them at once.
-        AutoFlushICache afc("LookupAsmJSModuleInCache", /* inhibit= */ true);
+        // Delay flushing until dynamic linking.
+        AutoFlushICache afc("LookupAsmJSModuleInCache", /* inhibit = */ true);
         module->setAutoFlushICacheRange();
 
         module->staticallyLink(cx);
diff --git a/js/src/asmjs/AsmJSValidate.cpp b/js/src/asmjs/AsmJSValidate.cpp
index e6935cee7c2..ac471c8f079 100644
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -9379,8 +9379,9 @@ CheckModule(ExclusiveContext* cx, AsmJSParser& parser, ParseNode* stmtList,
     if (tk != TOK_EOF && tk != TOK_RC)
         return m.fail(nullptr, "top-level export (return) must be the last statement");
 
-    // The instruction cache is flushed when dynamically linking, so can inhibit now.
-    AutoFlushICache afc("CheckModule", /* inhibit= */ true);
+    // Delay flushing until dynamic linking. The inhibited range is set by the
+    // masm.executableCopy() called transitively by FinishModule.
+    AutoFlushICache afc("CheckModule", /* inhibit = */ true);
 
     ScopedJSDeletePtr<AsmJSModule> module;
     if (!FinishModule(m, &module))

From ffd5704c4f17c7c7c9ec688c4bb8f8cff338f1bf Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 20 Apr 2015 22:59:34 -0500
Subject: [PATCH 70/80] Bug 1154556 - OdinMonkey: fix staticalllyLink to handle
 cloned, profile-enabled code (r=bbouvier)

---
 js/src/asmjs/AsmJSModule.cpp                  | 37 +++++++--
 js/src/asmjs/AsmJSModule.h                    |  3 +
 js/src/jit-test/tests/asm.js/testProfiling.js | 77 +++++++++++--------
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/js/src/asmjs/AsmJSModule.cpp b/js/src/asmjs/AsmJSModule.cpp
index 172ca8c79a4..424628cc6dd 100644
--- a/js/src/asmjs/AsmJSModule.cpp
+++ b/js/src/asmjs/AsmJSModule.cpp
@@ -761,17 +761,40 @@ AsmJSModule::staticallyLink(ExclusiveContext* cx)
         RelativeLink link = staticLinkData_.relativeLinks[i];
         uint8_t* patchAt = code_ + link.patchAtOffset;
         uint8_t* target = code_ + link.targetOffset;
+
+        // In the case of function-pointer tables and long-jumps on MIPS, the
+        // RelativeLink is used to patch a pointer to the function entry. If
+        // profiling is enabled (by cloning a module with profiling enabled),
+        // the target should be the profiling entry.
+        if (profilingEnabled_) {
+            const CodeRange* codeRange = lookupCodeRange(target);
+            if (codeRange && codeRange->isFunction() && link.targetOffset == codeRange->entry())
+                target = code_ + codeRange->profilingEntry();
+        }
+
         if (link.isRawPointerPatch())
             *(uint8_t**)(patchAt) = target;
         else
             Assembler::PatchInstructionImmediate(patchAt, PatchedImmPtr(target));
     }
 
-    for (size_t imm = 0; imm < AsmJSImm_Limit; imm++) {
-        const AsmJSModule::OffsetVector& offsets = staticLinkData_.absoluteLinks[imm];
-        void* target = AddressOf(AsmJSImmKind(imm), cx);
+    for (size_t immIndex = 0; immIndex < AsmJSImm_Limit; immIndex++) {
+        AsmJSImmKind imm = AsmJSImmKind(immIndex);
+        const OffsetVector& offsets = staticLinkData_.absoluteLinks[imm];
         for (size_t i = 0; i < offsets.length(); i++) {
-            Assembler::PatchDataWithValueCheck(CodeLocationLabel(code_ + offsets[i]),
+            uint8_t* patchAt = code_ + offsets[i];
+            void* target = AddressOf(imm, cx);
+
+            // Builtin calls are another case where, when profiling is enabled,
+            // we must point to the profiling entry.
+            AsmJSExit::BuiltinKind builtin;
+            if (profilingEnabled_ && ImmKindIsBuiltin(imm, &builtin)) {
+                const CodeRange* codeRange = lookupCodeRange(patchAt);
+                if (codeRange->isFunction())
+                    target = code_ + builtinThunkOffsets_[builtin];
+            }
+
+            Assembler::PatchDataWithValueCheck(CodeLocationLabel(patchAt),
                                                PatchedImmPtr(target),
                                                PatchedImmPtr((void*)-1));
         }
@@ -780,7 +803,7 @@ AsmJSModule::staticallyLink(ExclusiveContext* cx)
     // Initialize global data segment
 
     for (size_t i = 0; i < exits_.length(); i++) {
-        AsmJSModule::ExitDatum& exitDatum = exitIndexToGlobalDatum(i);
+        ExitDatum& exitDatum = exitIndexToGlobalDatum(i);
         exitDatum.exit = interpExitTrampoline(exits_[i]);
         exitDatum.fun = nullptr;
         exitDatum.baselineScript = nullptr;
@@ -1752,7 +1775,7 @@ AsmJSModule::setProfilingEnabled(bool enabled, JSContext* cx)
         if (codeRange->kind() != CodeRange::Function)
             continue;
 
-        uint8_t* profilingEntry = code_ + codeRange->begin();
+        uint8_t* profilingEntry = code_ + codeRange->profilingEntry();
         uint8_t* entry = code_ + codeRange->entry();
         MOZ_ASSERT_IF(profilingEnabled_, callee == profilingEntry);
         MOZ_ASSERT_IF(!profilingEnabled_, callee == entry);
@@ -1781,7 +1804,7 @@ AsmJSModule::setProfilingEnabled(bool enabled, JSContext* cx)
         for (size_t j = 0; j < funcPtrTable.numElems(); j++) {
             void* callee = array[j];
             const CodeRange* codeRange = lookupCodeRange(callee);
-            uint8_t* profilingEntry = code_ + codeRange->begin();
+            uint8_t* profilingEntry = code_ + codeRange->profilingEntry();
             uint8_t* entry = code_ + codeRange->entry();
             MOZ_ASSERT_IF(profilingEnabled_, callee == profilingEntry);
             MOZ_ASSERT_IF(!profilingEnabled_, callee == entry);
diff --git a/js/src/asmjs/AsmJSModule.h b/js/src/asmjs/AsmJSModule.h
index f7220abc9c6..ed573143296 100644
--- a/js/src/asmjs/AsmJSModule.h
+++ b/js/src/asmjs/AsmJSModule.h
@@ -581,6 +581,9 @@ class AsmJSModule
         uint32_t begin() const {
             return begin_;
         }
+        uint32_t profilingEntry() const {
+            return begin();
+        }
         uint32_t entry() const {
             MOZ_ASSERT(isFunction());
             return begin_ + u.func.beginToEntry_;
diff --git a/js/src/jit-test/tests/asm.js/testProfiling.js b/js/src/jit-test/tests/asm.js/testProfiling.js
index 2a1a87b30a6..664f5ef43be 100644
--- a/js/src/jit-test/tests/asm.js/testProfiling.js
+++ b/js/src/jit-test/tests/asm.js/testProfiling.js
@@ -63,15 +63,15 @@ var ffi = function(enable) {
 }
 var f = asmLink(asmCompile('global','ffis',USE_ASM + "var ffi=ffis.ffi; function g(i) { i=i|0; ffi(i|0) } function f(i) { i=i|0; g(i|0) } return f"), null, {ffi});
 f(0);
-assertStackContainsSeq(stacks, "", true);
+assertStackContainsSeq(stacks, "");
 f(+1);
-assertStackContainsSeq(stacks, "", true);
+assertStackContainsSeq(stacks, "");
 f(0);
-assertStackContainsSeq(stacks, "<,g,f,>", true);
+assertStackContainsSeq(stacks, "<,g,f,>");
 f(-1);
-assertStackContainsSeq(stacks, "<,g,f,>", true);
+assertStackContainsSeq(stacks, "<,g,f,>");
 f(0);
-assertStackContainsSeq(stacks, "", true);
+assertStackContainsSeq(stacks, "");
 
 // Enable profiling for the rest of the tests.
 enableSPSProfiling();
@@ -82,43 +82,58 @@ assertEq(f(), 42);
 var stacks = disableSingleStepProfiling();
 assertStackContainsSeq(stacks, ">,f,>,>");
 
-var f = asmLink(asmCompile(USE_ASM + "function g(i) { i=i|0; return (i+1)|0 } function f() { return g(42)|0 } return f"));
-enableSingleStepProfiling();
-assertEq(f(), 43);
-var stacks = disableSingleStepProfiling();
-assertStackContainsSeq(stacks, ">,f,>,g,f,>,f,>,>");
+var m = asmCompile(USE_ASM + "function g(i) { i=i|0; return (i+1)|0 } function f() { return g(42)|0 } return f");
+for (var i = 0; i < 3; i++) {
+    var f = asmLink(m);
+    enableSingleStepProfiling();
+    assertEq(f(), 43);
+    var stacks = disableSingleStepProfiling();
+    assertStackContainsSeq(stacks, ">,f,>,g,f,>,f,>,>");
+}
 
-var f = asmLink(asmCompile(USE_ASM + "function g1() { return 1 } function g2() { return 2 } function f(i) { i=i|0; return TBL[i&1]()|0 } var TBL=[g1,g2]; return f"));
-enableSingleStepProfiling();
-assertEq(f(0), 1);
-assertEq(f(1), 2);
-var stacks = disableSingleStepProfiling();
-assertStackContainsSeq(stacks, ">,f,>,g1,f,>,f,>,>,>,f,>,g2,f,>,f,>,>");
+var m = asmCompile(USE_ASM + "function g1() { return 1 } function g2() { return 2 } function f(i) { i=i|0; return TBL[i&1]()|0 } var TBL=[g1,g2]; return f");
+for (var i = 0; i < 3; i++) {
+    var f = asmLink(m);
+    enableSingleStepProfiling();
+    assertEq(f(0), 1);
+    assertEq(f(1), 2);
+    var stacks = disableSingleStepProfiling();
+    assertStackContainsSeq(stacks, ">,f,>,g1,f,>,f,>,>,>,f,>,g2,f,>,f,>,>");
+}
 
 function testBuiltinD2D(name) {
-    var f = asmLink(asmCompile('g', USE_ASM + "var fun=g.Math." + name + "; function f(d) { d=+d; return +fun(d) } return f"), this);
-    enableSingleStepProfiling();
-    assertEq(f(.1), eval("Math." + name + "(.1)"));
-    var stacks = disableSingleStepProfiling();
-    assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    var m = asmCompile('g', USE_ASM + "var fun=g.Math." + name + "; function f(d) { d=+d; return +fun(d) } return f");
+    for (var i = 0; i < 3; i++) {
+        var f = asmLink(m, this);
+        enableSingleStepProfiling();
+        assertEq(f(.1), eval("Math." + name + "(.1)"));
+        var stacks = disableSingleStepProfiling();
+        assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    }
 }
 for (name of ['sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'ceil', 'floor', 'exp', 'log'])
     testBuiltinD2D(name);
 function testBuiltinF2F(name) {
-    var f = asmLink(asmCompile('g', USE_ASM + "var tof=g.Math.fround; var fun=g.Math." + name + "; function f(d) { d=tof(d); return tof(fun(d)) } return f"), this);
-    enableSingleStepProfiling();
-    assertEq(f(.1), eval("Math.fround(Math." + name + "(Math.fround(.1)))"));
-    var stacks = disableSingleStepProfiling();
-    assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    var m = asmCompile('g', USE_ASM + "var tof=g.Math.fround; var fun=g.Math." + name + "; function f(d) { d=tof(d); return tof(fun(d)) } return f");
+    for (var i = 0; i < 3; i++) {
+        var f = asmLink(m, this);
+        enableSingleStepProfiling();
+        assertEq(f(.1), eval("Math.fround(Math." + name + "(Math.fround(.1)))"));
+        var stacks = disableSingleStepProfiling();
+        assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    }
 }
 for (name of ['ceil', 'floor'])
     testBuiltinF2F(name);
 function testBuiltinDD2D(name) {
-    var f = asmLink(asmCompile('g', USE_ASM + "var fun=g.Math." + name + "; function f(d, e) { d=+d; e=+e; return +fun(d,e) } return f"), this);
-    enableSingleStepProfiling();
-    assertEq(f(.1, .2), eval("Math." + name + "(.1, .2)"));
-    var stacks = disableSingleStepProfiling();
-    assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    var m = asmCompile('g', USE_ASM + "var fun=g.Math." + name + "; function f(d, e) { d=+d; e=+e; return +fun(d,e) } return f");
+    for (var i = 0; i < 3; i++) {
+        var f = asmLink(m, this);
+        enableSingleStepProfiling();
+        assertEq(f(.1, .2), eval("Math." + name + "(.1, .2)"));
+        var stacks = disableSingleStepProfiling();
+        assertStackContainsSeq(stacks, ">,f,>,Math." + name + ",f,>,f,>,>");
+    }
 }
 for (name of ['atan2', 'pow'])
     testBuiltinDD2D(name);

From 3e2efc9d2ab60776ba6cda1262001664de855d28 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 20 Apr 2015 23:18:59 -0500
Subject: [PATCH 71/80] Bug 1156600 - asmjscache: fix assert when reading
 metadata file for cache write fails (r=janv)

---
 dom/asmjscache/AsmJSCache.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dom/asmjscache/AsmJSCache.cpp b/dom/asmjscache/AsmJSCache.cpp
index b265e49f9c7..dce1c5c3371 100644
--- a/dom/asmjscache/AsmJSCache.cpp
+++ b/dom/asmjscache/AsmJSCache.cpp
@@ -1004,7 +1004,12 @@ MainProcessRunnable::Run()
     case eFailedToReadMetadata: {
       MOZ_ASSERT(NS_IsMainThread());
 
-      CacheMiss();
+      if (mOpenMode == eOpenForRead) {
+        CacheMiss();
+        return NS_OK;
+      }
+
+      Fail();
       return NS_OK;
     }
 

From be5f000d5ba2e69a1d309d4746df8dd45189c793 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 18 Apr 2015 12:32:38 -0400
Subject: [PATCH 72/80] Bug 1155987 - Unregister the service workers registered
 in tests; r=nsm

Without this, test_periodic_update.html is going to try to update all
of them which is unnecessary.
---
 .../test/serviceworkers/controller/index.html  |  8 +++++++-
 .../test/serviceworkers/test_controller.html   | 15 ++++++++++++++-
 .../test_installation_simple.html              | 18 ++++++++++++++++--
 .../test_match_all_client_id.html              |  1 +
 .../test_match_all_client_properties.html      |  1 +
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/dom/workers/test/serviceworkers/controller/index.html b/dom/workers/test/serviceworkers/controller/index.html
index 07a7f326c8e..740e24f15cf 100644
--- a/dom/workers/test/serviceworkers/controller/index.html
+++ b/dom/workers/test/serviceworkers/controller/index.html
@@ -50,7 +50,13 @@
 
         my_ok(navigator.serviceWorker.controller.scriptURL.match(/worker\.js$/),
               "Controller is still worker.js");
-        finish();
+
+        e.unregister().then(function(result) {
+          my_ok(result, "Unregistering the SW should succeed");
+          finish();
+        }, function(e) {
+          dump("Error unregistering the SW: " + e + "\n");
+        });
       });
     } else {
       my_ok(false, "Should've been controlled!");
diff --git a/dom/workers/test/serviceworkers/test_controller.html b/dom/workers/test/serviceworkers/test_controller.html
index 483f488397b..789d7746dae 100644
--- a/dom/workers/test/serviceworkers/test_controller.html
+++ b/dom/workers/test/serviceworkers/test_controller.html
@@ -17,10 +17,22 @@
 
   var content;
   var iframe;
+  var registration;
 
   function simpleRegister() {
     // We use the control scope for the less specific registration. The window will register a worker on controller/
-    return navigator.serviceWorker.register("worker.js", { scope: "./control" });
+    return navigator.serviceWorker.register("worker.js", { scope: "./control" })
+      .then(function(reg) {
+        registration = reg;
+      });;
+  }
+
+  function unregister() {
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed: " + e + "\n");
+    });
   }
 
   function testController() {
@@ -50,6 +62,7 @@
   function runTest() {
     simpleRegister()
       .then(testController)
+      .then(unregister)
       .then(function() {
         SimpleTest.finish();
       }).catch(function(e) {
diff --git a/dom/workers/test/serviceworkers/test_installation_simple.html b/dom/workers/test/serviceworkers/test_installation_simple.html
index e09444553ee..f5dee7e5267 100644
--- a/dom/workers/test/serviceworkers/test_installation_simple.html
+++ b/dom/workers/test/serviceworkers/test_installation_simple.html
@@ -69,6 +69,11 @@
       var worker = wr.installing;
       ok(worker && wr.scope.match(/realworker$/) &&
          worker.scriptURL.match(/worker.js$/), "Valid worker instance should be available.");
+      return wr.unregister().then(function(success) {
+        ok(success, "The worker should be unregistered successfully");
+      }, function(e) {
+        dump("Error unregistering the worker: " + e + "\n");
+      });
     }, function(e) {
       info("Error: " + e.name);
       ok(false, "realWorker Registration should have succeeded!");
@@ -117,8 +122,12 @@
       reject = rej;
     });
 
+    var reg;
     function continueTest() {
-      navigator.serviceWorker.register("worker2.js", { scope: "simpleregister/" });
+      navigator.serviceWorker.register("worker2.js", { scope: "simpleregister/" })
+        .then(function(r) {
+          reg = r;
+        });;
     }
 
     window.onmessage = function(e) {
@@ -130,7 +139,12 @@
         // MaybeStopControlling() when this document is unloaded. At that point
         // the pref has been disabled, so the ServiceWorkerManager is not available.
         frame.setAttribute("src", new URL("about:blank").href);
-        resolve();
+        reg.unregister().then(function(success) {
+          ok(success, "The worker should be unregistered successfully");
+          resolve();
+        }, function(e) {
+          dump("Error unregistering the worker: " + e + "\n");
+        });
       } else if (e.data.type == "check") {
         ok(e.data.status, e.data.msg);
       }
diff --git a/dom/workers/test/serviceworkers/test_match_all_client_id.html b/dom/workers/test/serviceworkers/test_match_all_client_id.html
index 2a945bc5306..5d79f4053fd 100644
--- a/dom/workers/test/serviceworkers/test_match_all_client_id.html
+++ b/dom/workers/test/serviceworkers/test_match_all_client_id.html
@@ -70,6 +70,7 @@
     start()
       .then(testAuxiliaryWindow)
       .then(testNestedWindow)
+      .then(unregister)
       .catch(function(e) {
         ok(false, "Some test failed with error " + e);
       }).then(SimpleTest.finish);
diff --git a/dom/workers/test/serviceworkers/test_match_all_client_properties.html b/dom/workers/test/serviceworkers/test_match_all_client_properties.html
index 3ab598a7618..830c8ef6297 100644
--- a/dom/workers/test/serviceworkers/test_match_all_client_properties.html
+++ b/dom/workers/test/serviceworkers/test_match_all_client_properties.html
@@ -77,6 +77,7 @@
     start()
       .then(testAuxiliaryWindow)
       .then(testNestedWindow)
+      .then(unregister)
       .catch(function(e) {
         ok(false, "Some test failed with error " + e);
       }).then(SimpleTest.finish);

From 9e01f290aff397f4c6aa9a82382ec4508214969b Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 18 Apr 2015 12:55:15 -0400
Subject: [PATCH 73/80] Bug 1155988 - Use the ready promise more often in
 service worker tests; r=nsm

---
 .../test/mochitest/serviceworker_driver.js    | 13 ++----------
 .../fetch/context/register.html               | 20 ++++---------------
 .../fetch/https/clonedresponse/register.html  | 20 ++++---------------
 .../serviceworkers/fetch/https/register.html  | 20 ++++---------------
 .../fetch/sandbox/register.html               | 20 ++++---------------
 .../serviceworkers/periodic/register.html     | 18 +++--------------
 .../test/serviceworkers/test_close.html       | 13 ++----------
 .../test_empty_serviceworker.html             | 13 ++----------
 .../test_serviceworker_interfaces.html        | 13 ++----------
 .../test_serviceworker_not_sharedworker.html  | 13 ++----------
 10 files changed, 29 insertions(+), 134 deletions(-)

diff --git a/dom/cache/test/mochitest/serviceworker_driver.js b/dom/cache/test/mochitest/serviceworker_driver.js
index f7c87f8377b..6875abbed45 100644
--- a/dom/cache/test/mochitest/serviceworker_driver.js
+++ b/dom/cache/test/mochitest/serviceworker_driver.js
@@ -38,16 +38,7 @@ function serviceWorkerTestExec(testFile) {
       document.body.appendChild(iframe);
     }
 
-    navigator.serviceWorker.register("worker_wrapper.js", {scope: "."})
-      .then(function(registration) {
-        if (registration.installing) {
-          registration.installing.onstatechange = function(e) {
-            e.target.onstatechange = null;
-            setupSW(registration);
-          };
-        } else {
-          setupSW(registration);
-        }
-      });
+    navigator.serviceWorker.ready.then(setupSW);
+    navigator.serviceWorker.register("worker_wrapper.js", {scope: "."});
   });
 }
diff --git a/dom/workers/test/serviceworkers/fetch/context/register.html b/dom/workers/test/serviceworkers/fetch/context/register.html
index 7dcdf66da55..6528d0eae96 100644
--- a/dom/workers/test/serviceworkers/fetch/context/register.html
+++ b/dom/workers/test/serviceworkers/fetch/context/register.html
@@ -4,23 +4,11 @@
     window.parent.postMessage({status: "ok", result: !!v, message: msg}, "*");
   }
 
-  var isDone = false;
   function done(reg) {
-    if (!isDone) {
-      ok(reg.waiting || reg.active, "Either active or waiting worker should be available.");
-      window.parent.postMessage({status: "registrationdone"}, "*");
-      isDone = true;
-    }
+    ok(reg.active, "The active worker should be available.");
+    window.parent.postMessage({status: "registrationdone"}, "*");
   }
 
-  navigator.serviceWorker.register("context_test.js", {scope: "."})
-    .then(function(registration) {
-      if (registration.installing) {
-        registration.installing.onstatechange = function(e) {
-          done(registration);
-        };
-      } else {
-        done(registration);
-      }
-    });
+  navigator.serviceWorker.ready.then(done);
+  navigator.serviceWorker.register("context_test.js", {scope: "."});
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/https/clonedresponse/register.html b/dom/workers/test/serviceworkers/fetch/https/clonedresponse/register.html
index d2f168b8bd6..41774f70d18 100644
--- a/dom/workers/test/serviceworkers/fetch/https/clonedresponse/register.html
+++ b/dom/workers/test/serviceworkers/fetch/https/clonedresponse/register.html
@@ -4,23 +4,11 @@
     window.parent.postMessage({status: "ok", result: !!v, message: msg}, "*");
   }
 
-  var isDone = false;
   function done(reg) {
-    if (!isDone) {
-      ok(reg.waiting || reg.active, "Either active or waiting worker should be available.");
-      window.parent.postMessage({status: "registrationdone"}, "*");
-      isDone = true;
-    }
+    ok(reg.active, "The active worker should be available.");
+    window.parent.postMessage({status: "registrationdone"}, "*");
   }
 
-  navigator.serviceWorker.register("https_test.js", {scope: "."})
-    .then(function(registration) {
-      if (registration.installing) {
-        registration.installing.onstatechange = function(e) {
-          done(registration);
-        };
-      } else {
-        done(registration);
-      }
-    });
+  navigator.serviceWorker.ready.then(done);
+  navigator.serviceWorker.register("https_test.js", {scope: "."});
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/https/register.html b/dom/workers/test/serviceworkers/fetch/https/register.html
index d2f168b8bd6..41774f70d18 100644
--- a/dom/workers/test/serviceworkers/fetch/https/register.html
+++ b/dom/workers/test/serviceworkers/fetch/https/register.html
@@ -4,23 +4,11 @@
     window.parent.postMessage({status: "ok", result: !!v, message: msg}, "*");
   }
 
-  var isDone = false;
   function done(reg) {
-    if (!isDone) {
-      ok(reg.waiting || reg.active, "Either active or waiting worker should be available.");
-      window.parent.postMessage({status: "registrationdone"}, "*");
-      isDone = true;
-    }
+    ok(reg.active, "The active worker should be available.");
+    window.parent.postMessage({status: "registrationdone"}, "*");
   }
 
-  navigator.serviceWorker.register("https_test.js", {scope: "."})
-    .then(function(registration) {
-      if (registration.installing) {
-        registration.installing.onstatechange = function(e) {
-          done(registration);
-        };
-      } else {
-        done(registration);
-      }
-    });
+  navigator.serviceWorker.ready.then(done);
+  navigator.serviceWorker.register("https_test.js", {scope: "."});
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/sandbox/register.html b/dom/workers/test/serviceworkers/fetch/sandbox/register.html
index 9f742274c4b..427b1a8da97 100644
--- a/dom/workers/test/serviceworkers/fetch/sandbox/register.html
+++ b/dom/workers/test/serviceworkers/fetch/sandbox/register.html
@@ -4,23 +4,11 @@
     window.parent.postMessage({status: "ok", result: !!v, message: msg}, "*");
   }
 
-  var isDone = false;
   function done(reg) {
-    if (!isDone) {
-      ok(reg.waiting || reg.active, "Either active or waiting worker should be available.");
-      window.parent.postMessage({status: "registrationdone"}, "*");
-      isDone = true;
-    }
+    ok(reg.active, "The active worker should be available.");
+    window.parent.postMessage({status: "registrationdone"}, "*");
   }
 
-  navigator.serviceWorker.register("sandbox_test.js", {scope: "."})
-    .then(function(registration) {
-      if (registration.installing) {
-        registration.installing.onstatechange = function(e) {
-          done(registration);
-        };
-      } else {
-        done(registration);
-      }
-    });
+  navigator.serviceWorker.ready.then(done);
+  navigator.serviceWorker.register("sandbox_test.js", {scope: "."});
 </script>
diff --git a/dom/workers/test/serviceworkers/periodic/register.html b/dom/workers/test/serviceworkers/periodic/register.html
index a5e73c130b6..1db75bea8ac 100644
--- a/dom/workers/test/serviceworkers/periodic/register.html
+++ b/dom/workers/test/serviceworkers/periodic/register.html
@@ -1,21 +1,9 @@
 <!DOCTYPE html>
 <script>
-  var isDone = false;
   function done() {
-    if (!isDone) {
-      parent.callback();
-      isDone = true;
-    }
+    parent.callback();
   }
 
-  navigator.serviceWorker.register("../periodic.sjs", {scope: "."})
-    .then(function(registration) {
-      if (registration.installing) {
-        registration.installing.onstatechange = function(e) {
-          done();
-        };
-      } else {
-        done();
-      }
-    });
+  navigator.serviceWorker.ready.then(done);
+  navigator.serviceWorker.register("../periodic.sjs", {scope: "."});
 </script>
diff --git a/dom/workers/test/serviceworkers/test_close.html b/dom/workers/test/serviceworkers/test_close.html
index 04c9402d784..78057a88181 100644
--- a/dom/workers/test/serviceworkers/test_close.html
+++ b/dom/workers/test/serviceworkers/test_close.html
@@ -19,17 +19,8 @@
 
   var iframe;
   function runTest() {
-    navigator.serviceWorker.register("close_test.js", {scope: "."})
-      .then(function(registration) {
-        if (registration.installing) {
-          registration.installing.onstatechange = function(e) {
-            setupSW(registration);
-            e.target.onstatechange = null;
-          };
-        } else {
-          setupSW(registration);
-        }
-      });
+    navigator.serviceWorker.ready.then(setupSW);
+    navigator.serviceWorker.register("close_test.js", {scope: "."});
 
     function setupSW(registration) {
       var worker = registration.waiting ||
diff --git a/dom/workers/test/serviceworkers/test_empty_serviceworker.html b/dom/workers/test/serviceworkers/test_empty_serviceworker.html
index 242a267d124..c93906a2758 100644
--- a/dom/workers/test/serviceworkers/test_empty_serviceworker.html
+++ b/dom/workers/test/serviceworkers/test_empty_serviceworker.html
@@ -17,17 +17,8 @@
 <script class="testbody" type="text/javascript">
 
   function runTest() {
-    navigator.serviceWorker.register("empty.js", {scope: "."})
-      .then(function(registration) {
-        if (registration.installing) {
-          registration.installing.onstatechange = function(e) {
-            e.target.onstatechange = null;
-            done(registration);
-          };
-        } else {
-          done(registration);
-        }
-      });
+    navigator.serviceWorker.ready.then(done);
+    navigator.serviceWorker.register("empty.js", {scope: "."});
   }
 
   function done(registration) {
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
index 90625d09a1f..ff0ecb68568 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
+++ b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
@@ -85,17 +85,8 @@
   }
 
   function runTest() {
-    navigator.serviceWorker.register("serviceworker_wrapper.js", {scope: "."})
-      .then(function(registration) {
-        if (registration.installing) {
-          registration.installing.onstatechange = function(e) {
-            setupSW(registration);
-            e.target.onstatechange = null;
-          };
-        } else {
-          setupSW(registration);
-        }
-      });
+    navigator.serviceWorker.ready.then(setupSW);
+    navigator.serviceWorker.register("serviceworker_wrapper.js", {scope: "."});
   }
 
   SimpleTest.waitForExplicitFinish();
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html b/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
index 5fc433bcbeb..e76613dace6 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
+++ b/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
@@ -20,18 +20,9 @@
   var iframe;
   const SCOPE = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/";
   function runTest() {
+    navigator.serviceWorker.ready.then(setupSW);
     navigator.serviceWorker.register("serviceworker_not_sharedworker.js",
-                                     {scope: SCOPE})
-      .then(function(registration) {
-        if (registration.installing) {
-          registration.installing.onstatechange = function(e) {
-            e.target.onstatechange = null;
-            setupSW(registration);
-          };
-        } else {
-          setupSW(registration);
-        }
-      });
+                                     {scope: SCOPE});
   }
 
   var sw, worker;

From 32f7d685f40de69c6bc8ba31eb5d26b2b9f82c96 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 18 Apr 2015 13:08:41 -0400
Subject: [PATCH 74/80] Bug 1155989 - Dump the rejection of the promise
 returned by ServiceWorkerRegistration.unregister() in our tests; r=nsm

---
 dom/push/test/test_has_permissions.html                     | 2 ++
 dom/push/test/test_multiple_register.html                   | 2 ++
 dom/push/test/test_permissions.html                         | 2 ++
 dom/push/test/test_register.html                            | 2 ++
 .../test/serviceworkers/fetch/context/unregister.html       | 2 ++
 .../fetch/https/clonedresponse/unregister.html              | 2 ++
 dom/workers/test/serviceworkers/fetch/https/unregister.html | 2 ++
 .../test/serviceworkers/fetch/sandbox/unregister.html       | 2 ++
 dom/workers/test/serviceworkers/periodic/unregister.html    | 2 ++
 dom/workers/test/serviceworkers/test_client_focus.html      | 2 ++
 dom/workers/test/serviceworkers/test_close.html             | 6 +++++-
 .../test/serviceworkers/test_empty_serviceworker.html       | 3 +++
 dom/workers/test/serviceworkers/test_importscript.html      | 2 ++
 dom/workers/test/serviceworkers/test_match_all.html         | 2 ++
 .../test/serviceworkers/test_match_all_advanced.html        | 2 ++
 .../test/serviceworkers/test_match_all_client_id.html       | 2 ++
 .../serviceworkers/test_match_all_client_properties.html    | 2 ++
 dom/workers/test/serviceworkers/test_post_message.html      | 2 ++
 .../test/serviceworkers/test_post_message_advanced.html     | 2 ++
 .../test/serviceworkers/test_post_message_source.html       | 2 ++
 .../test/serviceworkers/test_serviceworker_interfaces.html  | 3 +++
 .../serviceworkers/test_serviceworker_not_sharedworker.html | 3 +++
 22 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/dom/push/test/test_has_permissions.html b/dom/push/test/test_has_permissions.html
index af4c7532b51..aad0e1c2d00 100644
--- a/dom/push/test/test_has_permissions.html
+++ b/dom/push/test/test_has_permissions.html
@@ -35,6 +35,8 @@ http://creativecommons.org/licenses/publicdomain/
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/push/test/test_multiple_register.html b/dom/push/test/test_multiple_register.html
index 0fa98ff9033..4557d0abd1f 100644
--- a/dom/push/test/test_multiple_register.html
+++ b/dom/push/test/test_multiple_register.html
@@ -35,6 +35,8 @@ http://creativecommons.org/licenses/publicdomain/
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/push/test/test_permissions.html b/dom/push/test/test_permissions.html
index 1d9a8eacb76..e147bcd52df 100644
--- a/dom/push/test/test_permissions.html
+++ b/dom/push/test/test_permissions.html
@@ -35,6 +35,8 @@ http://creativecommons.org/licenses/publicdomain/
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/push/test/test_register.html b/dom/push/test/test_register.html
index 9e7265f26d1..ca5b8554c5f 100644
--- a/dom/push/test/test_register.html
+++ b/dom/push/test/test_register.html
@@ -67,6 +67,8 @@ http://creativecommons.org/licenses/publicdomain/
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/fetch/context/unregister.html b/dom/workers/test/serviceworkers/fetch/context/unregister.html
index f811dd3c00a..1f13508fa70 100644
--- a/dom/workers/test/serviceworkers/fetch/context/unregister.html
+++ b/dom/workers/test/serviceworkers/fetch/context/unregister.html
@@ -5,6 +5,8 @@
       if (success) {
         window.parent.postMessage({status: "unregistrationdone"}, "*");
       }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   });
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/https/clonedresponse/unregister.html b/dom/workers/test/serviceworkers/fetch/https/clonedresponse/unregister.html
index f811dd3c00a..1f13508fa70 100644
--- a/dom/workers/test/serviceworkers/fetch/https/clonedresponse/unregister.html
+++ b/dom/workers/test/serviceworkers/fetch/https/clonedresponse/unregister.html
@@ -5,6 +5,8 @@
       if (success) {
         window.parent.postMessage({status: "unregistrationdone"}, "*");
       }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   });
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/https/unregister.html b/dom/workers/test/serviceworkers/fetch/https/unregister.html
index f811dd3c00a..1f13508fa70 100644
--- a/dom/workers/test/serviceworkers/fetch/https/unregister.html
+++ b/dom/workers/test/serviceworkers/fetch/https/unregister.html
@@ -5,6 +5,8 @@
       if (success) {
         window.parent.postMessage({status: "unregistrationdone"}, "*");
       }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   });
 </script>
diff --git a/dom/workers/test/serviceworkers/fetch/sandbox/unregister.html b/dom/workers/test/serviceworkers/fetch/sandbox/unregister.html
index f811dd3c00a..1f13508fa70 100644
--- a/dom/workers/test/serviceworkers/fetch/sandbox/unregister.html
+++ b/dom/workers/test/serviceworkers/fetch/sandbox/unregister.html
@@ -5,6 +5,8 @@
       if (success) {
         window.parent.postMessage({status: "unregistrationdone"}, "*");
       }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   });
 </script>
diff --git a/dom/workers/test/serviceworkers/periodic/unregister.html b/dom/workers/test/serviceworkers/periodic/unregister.html
index b8aac2b2d2e..e2b94799a7e 100644
--- a/dom/workers/test/serviceworkers/periodic/unregister.html
+++ b/dom/workers/test/serviceworkers/periodic/unregister.html
@@ -7,6 +7,8 @@
       } else {
         dump("Unregister failed\n");
       }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   });
 </script>
diff --git a/dom/workers/test/serviceworkers/test_client_focus.html b/dom/workers/test/serviceworkers/test_client_focus.html
index 81a3c73ea78..e1b08c7ca38 100644
--- a/dom/workers/test/serviceworkers/test_client_focus.html
+++ b/dom/workers/test/serviceworkers/test_client_focus.html
@@ -30,6 +30,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_close.html b/dom/workers/test/serviceworkers/test_close.html
index 78057a88181..d2f72b9ef93 100644
--- a/dom/workers/test/serviceworkers/test_close.html
+++ b/dom/workers/test/serviceworkers/test_close.html
@@ -38,7 +38,11 @@
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "done") {
         navigator.serviceWorker.getRegistration().then(function(registration) {
-          registration.unregister().then(function() {
+          registration.unregister().then(function(result) {
+            ok(result, "Unregistering the service worker should succeed");
+            SimpleTest.finish();
+          }, function(e) {
+            dump("Unregistering the SW failed with " + e + "\n");
             SimpleTest.finish();
           });
         });
diff --git a/dom/workers/test/serviceworkers/test_empty_serviceworker.html b/dom/workers/test/serviceworkers/test_empty_serviceworker.html
index c93906a2758..e4295189618 100644
--- a/dom/workers/test/serviceworkers/test_empty_serviceworker.html
+++ b/dom/workers/test/serviceworkers/test_empty_serviceworker.html
@@ -26,6 +26,9 @@
     registration.unregister().then(function(success) {
       ok(success, "unregister worked");
       SimpleTest.finish();
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
+      SimpleTest.finish();
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_importscript.html b/dom/workers/test/serviceworkers/test_importscript.html
index b1f04c85ece..45e50642565 100644
--- a/dom/workers/test/serviceworkers/test_importscript.html
+++ b/dom/workers/test/serviceworkers/test_importscript.html
@@ -21,6 +21,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_match_all.html b/dom/workers/test/serviceworkers/test_match_all.html
index c6d3bdbee9c..f4e65a730e9 100644
--- a/dom/workers/test/serviceworkers/test_match_all.html
+++ b/dom/workers/test/serviceworkers/test_match_all.html
@@ -31,6 +31,8 @@
 
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_match_all_advanced.html b/dom/workers/test/serviceworkers/test_match_all_advanced.html
index 3d9823192d8..a458ed70ba4 100644
--- a/dom/workers/test/serviceworkers/test_match_all_advanced.html
+++ b/dom/workers/test/serviceworkers/test_match_all_advanced.html
@@ -33,6 +33,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_match_all_client_id.html b/dom/workers/test/serviceworkers/test_match_all_client_id.html
index 5d79f4053fd..c3cc5756a23 100644
--- a/dom/workers/test/serviceworkers/test_match_all_client_id.html
+++ b/dom/workers/test/serviceworkers/test_match_all_client_id.html
@@ -25,6 +25,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_match_all_client_properties.html b/dom/workers/test/serviceworkers/test_match_all_client_properties.html
index 830c8ef6297..14e3445a4b7 100644
--- a/dom/workers/test/serviceworkers/test_match_all_client_properties.html
+++ b/dom/workers/test/serviceworkers/test_match_all_client_properties.html
@@ -25,6 +25,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_post_message.html b/dom/workers/test/serviceworkers/test_post_message.html
index 2a1bf99c33f..7df4bef1fcc 100644
--- a/dom/workers/test/serviceworkers/test_post_message.html
+++ b/dom/workers/test/serviceworkers/test_post_message.html
@@ -25,6 +25,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_post_message_advanced.html b/dom/workers/test/serviceworkers/test_post_message_advanced.html
index 7d4c9ba2774..ca769586159 100644
--- a/dom/workers/test/serviceworkers/test_post_message_advanced.html
+++ b/dom/workers/test/serviceworkers/test_post_message_advanced.html
@@ -55,6 +55,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_post_message_source.html b/dom/workers/test/serviceworkers/test_post_message_source.html
index 3cf6c45abc2..4353e59b498 100644
--- a/dom/workers/test/serviceworkers/test_post_message_source.html
+++ b/dom/workers/test/serviceworkers/test_post_message_source.html
@@ -25,6 +25,8 @@
   function unregister() {
     return registration.unregister().then(function(result) {
       ok(result, "Unregister should return true.");
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
     });
   }
 
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
index ff0ecb68568..3ba95a4f4b4 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
+++ b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
@@ -19,6 +19,9 @@
         registration.unregister().then(function(success) {
           ok(success, "The service worker should be unregistered successfully");
 
+          SimpleTest.finish();
+        }, function(e) {
+          dump("Unregistering the SW failed with " + e + "\n");
           SimpleTest.finish();
         });
       } else if (event.data.type == 'status') {
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html b/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
index e76613dace6..96dd9f15992 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
+++ b/dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
@@ -41,6 +41,9 @@
           registration.unregister().then(function(success) {
             ok(success, "unregister should succeed");
             SimpleTest.finish();
+          }, function(e) {
+            dump("Unregistering the SW failed with " + e + "\n");
+            SimpleTest.finish();
           });
         };
         worker.port.postMessage({msg: "whoareyou"});

From 0068905cda8d8556a91ada48096c1af8453fc9ef Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 20 Apr 2015 11:17:06 -0400
Subject: [PATCH 75/80] Bug 1156432 - Part 1: Unregister the service worker
 when we are done with it; r=nsm

This lets us for example use the --run-until-failure mochitest option.
---
 dom/workers/test/serviceworkers/test_fetch_event.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dom/workers/test/serviceworkers/test_fetch_event.html b/dom/workers/test/serviceworkers/test_fetch_event.html
index 354d5677c70..764be87b131 100644
--- a/dom/workers/test/serviceworkers/test_fetch_event.html
+++ b/dom/workers/test/serviceworkers/test_fetch_event.html
@@ -16,15 +16,25 @@
 <script class="testbody" type="text/javascript">
   SimpleTest.requestCompleteLog();
 
+  var registration;
   function simpleRegister() {
     var p = navigator.serviceWorker.register("fetch_event_worker.js", { scope: "./fetch" });
     return p.then(function(swr) {
+      registration = swr;
       return new Promise(function(resolve) {
         swr.installing.onstatechange = resolve;
       });
     });
   }
 
+  function unregister() {
+    return registration.unregister().then(function(success) {
+      ok(success, "Service worker should be unregistered successfully");
+    }, function(e) {
+      dump("SW unregistration error: " + e + "\n");
+    });
+  }
+
   function testController() {
     var p = new Promise(function(resolve, reject) {
       var reloaded = false;
@@ -51,6 +61,7 @@
   function runTest() {
     simpleRegister()
       .then(testController)
+      .then(unregister)
       .then(function() {
         SimpleTest.finish();
       }).catch(function(e) {

From 74b49dc0864ec6131ec36dd3ffabd394c43192a1 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 20 Apr 2015 11:18:22 -0400
Subject: [PATCH 76/80] Bug 1156432 - Part 2: Use different error messages for
 the hello-after-extracting.gz test; r=nsm

This helps make it eaiser to tell whether this or the hello.gz
test failed by just looking at the logs.
---
 dom/workers/test/serviceworkers/fetch/fetch_tests.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/workers/test/serviceworkers/fetch/fetch_tests.js b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
index 2f4a93d3cb0..15bc0bbed45 100644
--- a/dom/workers/test/serviceworkers/fetch/fetch_tests.js
+++ b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
@@ -110,10 +110,10 @@ fetchXHR('hello.gz', function(xhr) {
 });
 
 fetchXHR('hello-after-extracting.gz', function(xhr) {
-  my_ok(xhr.status == 200, "gzip load should be successful");
-  my_ok(xhr.responseText == expectedUncompressedResponse, "gzip load should have synthesized response.");
-  my_ok(xhr.getResponseHeader("Content-Encoding") == "gzip", "Content-Encoding should be gzip.");
-  my_ok(xhr.getResponseHeader("Content-Length") == "35", "Content-Length should be of original gzipped file.");
+  my_ok(xhr.status == 200, "gzip load after extracting should be successful");
+  my_ok(xhr.responseText == expectedUncompressedResponse, "gzip load after extracting should have synthesized response.");
+  my_ok(xhr.getResponseHeader("Content-Encoding") == "gzip", "Content-Encoding after extracting should be gzip.");
+  my_ok(xhr.getResponseHeader("Content-Length") == "35", "Content-Length after extracting should be of original gzipped file.");
   finish();
 });
 

From aec82340741c83340b0b3b3d91f38370bd32697b Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Tue, 21 Apr 2015 16:32:15 +1200
Subject: [PATCH 77/80] Bug 1154513 - [EME] GMP crash crashes browser in
 Nightly - Remember if actor is destroyed, so that no messages are sent from
 subsequent Shutdown() - r=cpearce

---
 dom/media/gmp/GMPAudioDecoderParent.cpp | 6 +++++-
 dom/media/gmp/GMPAudioDecoderParent.h   | 1 +
 dom/media/gmp/GMPDecryptorParent.cpp    | 6 +++++-
 dom/media/gmp/GMPDecryptorParent.h      | 1 +
 dom/media/gmp/GMPVideoDecoderParent.cpp | 6 +++++-
 dom/media/gmp/GMPVideoDecoderParent.h   | 1 +
 dom/media/gmp/GMPVideoEncoderParent.cpp | 6 +++++-
 dom/media/gmp/GMPVideoEncoderParent.h   | 1 +
 8 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/dom/media/gmp/GMPAudioDecoderParent.cpp b/dom/media/gmp/GMPAudioDecoderParent.cpp
index e75357572ce..92e77ca989d 100644
--- a/dom/media/gmp/GMPAudioDecoderParent.cpp
+++ b/dom/media/gmp/GMPAudioDecoderParent.cpp
@@ -32,6 +32,7 @@ namespace gmp {
 GMPAudioDecoderParent::GMPAudioDecoderParent(GMPContentParent* aPlugin)
   : mIsOpen(false)
   , mShuttingDown(false)
+  , mActorDestroyed(false)
   , mPlugin(aPlugin)
   , mCallback(nullptr)
 {
@@ -174,7 +175,9 @@ GMPAudioDecoderParent::Shutdown()
   }
 
   mIsOpen = false;
-  unused << SendDecodingComplete();
+  if (!mActorDestroyed) {
+    unused << SendDecodingComplete();
+  }
 
   return NS_OK;
 }
@@ -184,6 +187,7 @@ void
 GMPAudioDecoderParent::ActorDestroy(ActorDestroyReason aWhy)
 {
   mIsOpen = false;
+  mActorDestroyed = true;
   if (mCallback) {
     // May call Close() (and Shutdown()) immediately or with a delay
     mCallback->Terminated();
diff --git a/dom/media/gmp/GMPAudioDecoderParent.h b/dom/media/gmp/GMPAudioDecoderParent.h
index 075b820c13f..8379f6f89fe 100644
--- a/dom/media/gmp/GMPAudioDecoderParent.h
+++ b/dom/media/gmp/GMPAudioDecoderParent.h
@@ -55,6 +55,7 @@ private:
 
   bool mIsOpen;
   bool mShuttingDown;
+  bool mActorDestroyed;
   nsRefPtr<GMPContentParent> mPlugin;
   GMPAudioDecoderCallbackProxy* mCallback;
 };
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp
index dd1fb8bc3ba..efff6339c73 100644
--- a/dom/media/gmp/GMPDecryptorParent.cpp
+++ b/dom/media/gmp/GMPDecryptorParent.cpp
@@ -14,6 +14,7 @@ namespace gmp {
 GMPDecryptorParent::GMPDecryptorParent(GMPContentParent* aPlugin)
   : mIsOpen(false)
   , mShuttingDown(false)
+  , mActorDestroyed(false)
   , mPlugin(aPlugin)
   , mCallback(nullptr)
 #ifdef DEBUG
@@ -347,7 +348,9 @@ GMPDecryptorParent::Shutdown()
   }
 
   mIsOpen = false;
-  unused << SendDecryptingComplete();
+  if (!mActorDestroyed) {
+    unused << SendDecryptingComplete();
+  }
 }
 
 // Note: Keep this sync'd up with Shutdown
@@ -355,6 +358,7 @@ void
 GMPDecryptorParent::ActorDestroy(ActorDestroyReason aWhy)
 {
   mIsOpen = false;
+  mActorDestroyed = true;
   if (mCallback) {
     // May call Close() (and Shutdown()) immediately or with a delay
     mCallback->Terminated();
diff --git a/dom/media/gmp/GMPDecryptorParent.h b/dom/media/gmp/GMPDecryptorParent.h
index 660fc0b4c74..fb634672d7e 100644
--- a/dom/media/gmp/GMPDecryptorParent.h
+++ b/dom/media/gmp/GMPDecryptorParent.h
@@ -111,6 +111,7 @@ private:
 
   bool mIsOpen;
   bool mShuttingDown;
+  bool mActorDestroyed;
   nsRefPtr<GMPContentParent> mPlugin;
   nsCString mPluginId;
   GMPDecryptorProxyCallback* mCallback;
diff --git a/dom/media/gmp/GMPVideoDecoderParent.cpp b/dom/media/gmp/GMPVideoDecoderParent.cpp
index 138c72dea11..a651fdecfa9 100644
--- a/dom/media/gmp/GMPVideoDecoderParent.cpp
+++ b/dom/media/gmp/GMPVideoDecoderParent.cpp
@@ -47,6 +47,7 @@ GMPVideoDecoderParent::GMPVideoDecoderParent(GMPContentParent* aPlugin)
   : GMPSharedMemManager(aPlugin)
   , mIsOpen(false)
   , mShuttingDown(false)
+  , mActorDestroyed(false)
   , mPlugin(aPlugin)
   , mCallback(nullptr)
   , mVideoHost(this)
@@ -213,7 +214,9 @@ GMPVideoDecoderParent::Shutdown()
   }
 
   mIsOpen = false;
-  unused << SendDecodingComplete();
+  if (!mActorDestroyed) {
+    unused << SendDecodingComplete();
+  }
 
   return NS_OK;
 }
@@ -223,6 +226,7 @@ void
 GMPVideoDecoderParent::ActorDestroy(ActorDestroyReason aWhy)
 {
   mIsOpen = false;
+  mActorDestroyed = true;
   mVideoHost.DoneWithAPI();
 
   if (mCallback) {
diff --git a/dom/media/gmp/GMPVideoDecoderParent.h b/dom/media/gmp/GMPVideoDecoderParent.h
index ffa3a8832bb..f07b57fdfaf 100644
--- a/dom/media/gmp/GMPVideoDecoderParent.h
+++ b/dom/media/gmp/GMPVideoDecoderParent.h
@@ -81,6 +81,7 @@ private:
 
   bool mIsOpen;
   bool mShuttingDown;
+  bool mActorDestroyed;
   nsRefPtr<GMPContentParent> mPlugin;
   GMPVideoDecoderCallbackProxy* mCallback;
   GMPVideoHostImpl mVideoHost;
diff --git a/dom/media/gmp/GMPVideoEncoderParent.cpp b/dom/media/gmp/GMPVideoEncoderParent.cpp
index a5c0fa32e9b..428ca016f20 100644
--- a/dom/media/gmp/GMPVideoEncoderParent.cpp
+++ b/dom/media/gmp/GMPVideoEncoderParent.cpp
@@ -54,6 +54,7 @@ GMPVideoEncoderParent::GMPVideoEncoderParent(GMPContentParent *aPlugin)
 : GMPSharedMemManager(aPlugin),
   mIsOpen(false),
   mShuttingDown(false),
+  mActorDestroyed(false),
   mPlugin(aPlugin),
   mCallback(nullptr),
   mVideoHost(this)
@@ -235,7 +236,9 @@ GMPVideoEncoderParent::Shutdown()
   mVideoHost.DoneWithAPI();
 
   mIsOpen = false;
-  unused << SendEncodingComplete();
+  if (!mActorDestroyed) {
+    unused << SendEncodingComplete();
+  }
 }
 
 static void
@@ -250,6 +253,7 @@ GMPVideoEncoderParent::ActorDestroy(ActorDestroyReason aWhy)
 {
   LOGD(("%s::%s: %p (%d)", __CLASS__, __FUNCTION__, this, (int) aWhy));
   mIsOpen = false;
+  mActorDestroyed = true;
   if (mCallback) {
     // May call Close() (and Shutdown()) immediately or with a delay
     mCallback->Terminated();
diff --git a/dom/media/gmp/GMPVideoEncoderParent.h b/dom/media/gmp/GMPVideoEncoderParent.h
index 169adf981b6..0c43a985fc0 100644
--- a/dom/media/gmp/GMPVideoEncoderParent.h
+++ b/dom/media/gmp/GMPVideoEncoderParent.h
@@ -77,6 +77,7 @@ private:
 
   bool mIsOpen;
   bool mShuttingDown;
+  bool mActorDestroyed;
   nsRefPtr<GMPContentParent> mPlugin;
   GMPVideoEncoderCallbackProxy* mCallback;
   GMPVideoHostImpl mVideoHost;

From 6e3618d4cf43fdb3e119a6309a7f63e37bc60df1 Mon Sep 17 00:00:00 2001
From: Lars T Hansen <lhansen@mozilla.com>
Date: Tue, 21 Apr 2015 06:39:12 +0200
Subject: [PATCH 78/80] Bug 1156386 - UXTH instruction.  r=dougc

---
 js/src/jit/arm/Simulator-arm.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/js/src/jit/arm/Simulator-arm.cpp b/js/src/jit/arm/Simulator-arm.cpp
index b391a30915d..fd00b46b9fa 100644
--- a/js/src/jit/arm/Simulator-arm.cpp
+++ b/js/src/jit/arm/Simulator-arm.cpp
@@ -3108,6 +3108,19 @@ Simulator::decodeType3(SimInstruction* instr)
                                                           instr->bits(11, 10));
                             set_register(rd, rn_val + (rm_val & 0xFF));
                         }
+                    } else if ((instr->bit(20) == 1) && (instr->bits(9, 6) == 1)) {
+                        if (instr->bits(19, 16) == 0xF) {
+                            // Uxth.
+                            uint32_t rm_val = rotateBytes(get_register(instr->rmValue()),
+                                                          instr->bits(11, 10));
+                            set_register(rd, (rm_val & 0xFFFF));
+                        } else {
+                            // Uxtah.
+                            uint32_t rn_val = get_register(rn);
+                            uint32_t rm_val = rotateBytes(get_register(instr->rmValue()),
+                                                          instr->bits(11, 10));
+                            set_register(rd, rn_val + (rm_val & 0xFFFF));
+                        }
                     } else {
                         MOZ_CRASH();
                     }

From f0f3080678511fe0906ad0bcf0391da029c48ae0 Mon Sep 17 00:00:00 2001
From: Lars T Hansen <lhansen@mozilla.com>
Date: Tue, 21 Apr 2015 06:39:16 +0200
Subject: [PATCH 79/80] Bug 1154705 - clone test functions to trigger inlining.
 r=jandem

---
 js/src/jit-test/tests/atomics/basic-tests.js | 69 +++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/js/src/jit-test/tests/atomics/basic-tests.js b/js/src/jit-test/tests/atomics/basic-tests.js
index ef2f1693fde..edb5d9b8a32 100644
--- a/js/src/jit-test/tests/atomics/basic-tests.js
+++ b/js/src/jit-test/tests/atomics/basic-tests.js
@@ -16,6 +16,13 @@ function dprint(...xs) {
     print(s);
 }
 
+// Clone a function so that we get reliable inlining of primitives with --ion-eager.
+// For eg testMethod and testFunction that are polymorphic in the array a,
+// the inliner gets confused and stops inlining after Int8 -- not what we want.
+function CLONE(f) {
+    return this.eval("(" + f.toSource() + ")");
+}
+
 function testMethod(a, ...indices) {
     dprint("Method: " + a.constructor.name);
     var poison;
@@ -202,7 +209,7 @@ function testRangeCAS(a) {
     assertEq(a[0], 0);
 }
 
-// Ad-hoc tests for extreme and out-of-range values 
+// Ad-hoc tests for extreme and out-of-range values.
 // None of these should throw
 
 function testInt8Extremes(a) {
@@ -238,7 +245,7 @@ function testInt8Extremes(a) {
     Atomics.and(a, 10, 256);	// Preserve none
     assertEq(a[10], 0);
     assertEq(Atomics.load(a, 10), 0);
-    
+
     assertEq(a[11], 0);
 }
 
@@ -271,7 +278,7 @@ function testUint8Extremes(a) {
     Atomics.and(a, 10, 256);	// Preserve none
     assertEq(a[10], 0);
     assertEq(Atomics.load(a, 10), 0);
-    
+
     assertEq(a[11], 0);
 }
 
@@ -355,13 +362,13 @@ function runTests() {
     t1[0] = 0;
 
     // Test that invoking as Atomics.whatever() works, on correct arguments
-    testMethod(new SharedInt8Array(sab), 0, 42, 4095);
-    testMethod(new SharedUint8Array(sab), 0, 42, 4095);
-    testMethod(new SharedUint8ClampedArray(sab), 0, 42, 4095);
-    testMethod(new SharedInt16Array(sab), 0, 42, 2047);
-    testMethod(new SharedUint16Array(sab), 0, 42, 2047);
-    testMethod(new SharedInt32Array(sab), 0, 42, 1023);
-    testMethod(new SharedUint32Array(sab), 0, 42, 1023);
+    CLONE(testMethod)(new SharedInt8Array(sab), 0, 42, 4095);
+    CLONE(testMethod)(new SharedUint8Array(sab), 0, 42, 4095);
+    CLONE(testMethod)(new SharedUint8ClampedArray(sab), 0, 42, 4095);
+    CLONE(testMethod)(new SharedInt16Array(sab), 0, 42, 2047);
+    CLONE(testMethod)(new SharedUint16Array(sab), 0, 42, 2047);
+    CLONE(testMethod)(new SharedInt32Array(sab), 0, 42, 1023);
+    CLONE(testMethod)(new SharedUint32Array(sab), 0, 42, 1023);
 
     // Test that invoking as v = Atomics.whatever; v() works, on correct arguments
     gAtomics_compareExchange = Atomics.compareExchange;
@@ -374,36 +381,36 @@ function runTests() {
     gAtomics_or = Atomics.or;
     gAtomics_xor = Atomics.xor;
 
-    testFunction(new SharedInt8Array(sab), 0, 42, 4095);
-    testFunction(new SharedUint8Array(sab), 0, 42, 4095);
-    testFunction(new SharedUint8ClampedArray(sab), 0, 42, 4095);
-    testFunction(new SharedInt16Array(sab), 0, 42, 2047);
-    testFunction(new SharedUint16Array(sab), 0, 42, 2047);
-    testFunction(new SharedInt32Array(sab), 0, 42, 1023);
-    testFunction(new SharedUint32Array(sab), 0, 42, 1023);
+    CLONE(testFunction)(new SharedInt8Array(sab), 0, 42, 4095);
+    CLONE(testFunction)(new SharedUint8Array(sab), 0, 42, 4095);
+    CLONE(testFunction)(new SharedUint8ClampedArray(sab), 0, 42, 4095);
+    CLONE(testFunction)(new SharedInt16Array(sab), 0, 42, 2047);
+    CLONE(testFunction)(new SharedUint16Array(sab), 0, 42, 2047);
+    CLONE(testFunction)(new SharedInt32Array(sab), 0, 42, 1023);
+    CLONE(testFunction)(new SharedUint32Array(sab), 0, 42, 1023);
 
     // Test various range and type conditions
     var v8 = new SharedInt8Array(sab);
     var v32 = new SharedInt32Array(sab);
 
-    testTypeCAS(v8);
-    testTypeCAS(v32);
+    CLONE(testTypeCAS)(v8);
+    CLONE(testTypeCAS)(v32);
 
-    testTypeBinop(v8, Atomics.add);
-    testTypeBinop(v8, Atomics.sub);
-    testTypeBinop(v8, Atomics.and);
-    testTypeBinop(v8, Atomics.or);
-    testTypeBinop(v8, Atomics.xor);
+    CLONE(testTypeBinop)(v8, Atomics.add);
+    CLONE(testTypeBinop)(v8, Atomics.sub);
+    CLONE(testTypeBinop)(v8, Atomics.and);
+    CLONE(testTypeBinop)(v8, Atomics.or);
+    CLONE(testTypeBinop)(v8, Atomics.xor);
 
-    testTypeBinop(v32, Atomics.add);
-    testTypeBinop(v32, Atomics.sub);
-    testTypeBinop(v32, Atomics.and);
-    testTypeBinop(v32, Atomics.or);
-    testTypeBinop(v32, Atomics.xor);
+    CLONE(testTypeBinop)(v32, Atomics.add);
+    CLONE(testTypeBinop)(v32, Atomics.sub);
+    CLONE(testTypeBinop)(v32, Atomics.and);
+    CLONE(testTypeBinop)(v32, Atomics.or);
+    CLONE(testTypeBinop)(v32, Atomics.xor);
 
     // Test out-of-range references
-    testRangeCAS(v8);
-    testRangeCAS(v32);
+    CLONE(testRangeCAS)(v8);
+    CLONE(testRangeCAS)(v32);
 
     // Test extreme values
     testInt8Extremes(new SharedInt8Array(sab));

From cbf2779c473d1b8129bb445c52edb9cf7edfcf79 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 21 Apr 2015 09:11:44 +0300
Subject: [PATCH 80/80] Avoid infinite recursion when lazy-loading devtools
 modules and stepping into promise code in chrome debugging (bug 1149910).
 r=jlongster,fitzgen

---
 toolkit/devtools/Loader.jsm                   | 23 +++++++++++++++----
 .../server/actors/utils/TabSources.js         | 12 +++++++---
 toolkit/devtools/server/actors/webbrowser.js  |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/toolkit/devtools/Loader.jsm b/toolkit/devtools/Loader.jsm
index 19bbb6f40c7..e6a3e22737a 100644
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@@ -316,10 +316,25 @@ DevToolsLoader.prototype = {
    */
   lazyRequireGetter: function (obj, property, module, destructure) {
     Object.defineProperty(obj, property, {
-      get: () => destructure
-        ? this.require(module)[property]
-        : this.require(module || property),
-      configurable: true
+      get: () => {
+        // Redefine this accessor property as a data property.
+        // Delete it first, to rule out "too much recursion" in case obj is
+        // a proxy whose defineProperty handler might unwittingly trigger this
+        // getter again.
+        delete obj[property];
+        let value = destructure
+          ? this.require(module)[property]
+          : this.require(module || property);
+        Object.defineProperty(obj, property, {
+          value,
+          writable: true,
+          configurable: true,
+          enumerable: true
+        });
+        return value;
+      },
+      configurable: true,
+      enumerable: true
     });
   },
 
diff --git a/toolkit/devtools/server/actors/utils/TabSources.js b/toolkit/devtools/server/actors/utils/TabSources.js
index ec19152cc3d..c647cd27e60 100644
--- a/toolkit/devtools/server/actors/utils/TabSources.js
+++ b/toolkit/devtools/server/actors/utils/TabSources.js
@@ -1,10 +1,16 @@
-const Services = require("Services");
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
 const { Ci, Cu } = require("chrome");
+const Services = require("Services");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+const { dbg_assert, fetch } = DevToolsUtils;
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const { dbg_assert, fetch } = require("devtools/toolkit/DevToolsUtils");
 const { OriginalLocation, GeneratedLocation, getOffsetColumn } = require("devtools/server/actors/common");
-const { resolve } = require("promise");
+const { resolve } = Promise;
 
 loader.lazyRequireGetter(this, "SourceActor", "devtools/server/actors/script", true);
 loader.lazyRequireGetter(this, "isEvalSource", "devtools/server/actors/script", true);
diff --git a/toolkit/devtools/server/actors/webbrowser.js b/toolkit/devtools/server/actors/webbrowser.js
index f86a0bec9af..6d1b76a5418 100644
--- a/toolkit/devtools/server/actors/webbrowser.js
+++ b/toolkit/devtools/server/actors/webbrowser.js
@@ -8,6 +8,7 @@
 
 let { Ci, Cu } = require("chrome");
 let Services = require("Services");
+let promise = require("promise");
 let { ActorPool, createExtraActors, appendExtraActors } = require("devtools/server/actors/common");
 let { DebuggerServer } = require("devtools/server/main");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
@@ -15,7 +16,6 @@ let { dbg_assert } = DevToolsUtils;
 let { TabSources, isHiddenSource } = require("./utils/TabSources");
 let makeDebugger = require("./utils/make-debugger");
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 loader.lazyRequireGetter(this, "RootActor", "devtools/server/actors/root", true);