Merge commit '7d604b16de7b24652e23788c221f511099d4d90b' into embedlite

Conflicts:
	content/media/MediaDecoder.cpp
	content/media/moz.build
	embedding/moz.build
	gfx/layers/client/TextureClient.cpp
	gfx/layers/opengl/CompositorOGL.cpp
	layout/base/FrameLayerBuilder.cpp

.gdbinit

@@ -177,5 +177,5 @@ def js
 end
 
 def ft
-  call nsFrame::DumpFrameTree($arg0)
+  call $arg0->DumpFrameTree()
 end

.gitignore

@@ -12,6 +12,9 @@ ID
 # Vim swap files.
 .*.sw[a-z]
 
+# Emacs directory variable files.
+**/.dir-locals.el
+
 # User files that may appear at the root
 /.mozconfig*
 /mozconfig
@@ -61,3 +64,6 @@ GTAGS
 GRTAGS
 GSYMS
 GPATH
+
+# Git clone directory for updating web-platform-tests
+testing/web-platform/sync/

.hgignore

@@ -11,6 +11,9 @@
 ^\.sw.$
 .[^/]*\.sw.$
 
+# Emacs directory variable files.
+\.dir-locals\.el
+
 # User files that may appear at the root
 ^\.mozconfig
 ^mozconfig*
@@ -75,3 +78,6 @@ GPATH
 # Unit tests for Loop
 ^browser/components/loop/standalone/content/config\.js$
 ^browser/components/loop/standalone/node_modules/
+
+# Git clone directory for updating web-platform-tests
+^testing/web-platform/sync/

.hgtags

@@ -103,3 +103,4 @@ ba2cc1eda988a1614d8986ae145d28e1268409b9 FIREFOX_AURORA_29_BASE
 cfde3603b0206e119abea76fdd6e134b634348f1 FIREFOX_AURORA_31_BASE
 16f3cac5e8fe471e12f76d6a94a477b14e78df7c FIREFOX_AURORA_32_BASE
 dc23164ba2a289a8b22902e30990c77d9677c214 FIREFOX_AURORA_33_BASE
+c360f3d1c00d73b0c1fb0a2c0da525cb55e58b83 FIREFOX_AURORA_34_BASE

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Skia update needs a CLOBBER on all platforms.
+Bug 1061489: Updated moz.build requires CLOBBER

Makefile.in

@@ -92,7 +92,10 @@ include backend.RecursiveMakeBackend.pp
 
 default:: backend.RecursiveMakeBackend
 
-install_manifests := bin idl include public private sdk
+install_manifests := \
+  $(addprefix dist/,bin idl include public private sdk) \
+  _tests \
+  $(NULL)
 install_manifest_depends = \
   CLOBBER \
   $(configure_dir)/configure \
@@ -110,7 +113,7 @@ endif
 endif
 
 .PHONY: install-manifests
-install-manifests: $(addprefix install-dist-,$(install_manifests))
+install-manifests: $(addprefix install-,$(install_manifests))
 
 # process_install_manifest needs to be invoked with --no-remove when building
 # js as standalone because automated builds are building nspr separately and
@@ -121,15 +124,17 @@ ifdef JS_STANDALONE
 NO_REMOVE=1
 endif
 
-.PHONY: $(addprefix install-dist-,$(install_manifests))
-$(addprefix install-dist-,$(install_manifests)): install-dist-%: $(install_manifest_depends)
+.PHONY: $(addprefix install-,$(install_manifests))
+$(addprefix install-,$(filter dist/%,$(install_manifests))): install-dist/%: $(install_manifest_depends)
 	$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$*)
 
-.PHONY: install-tests
-install-manifests: install-tests
-install-tests: $(install_manifest_depends)
+install-_tests: $(install_manifest_depends)
 	$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )_tests _build_manifests/install/tests)
 
+# For compatibility
+.PHONY: install-tests
+install-tests: install-_tests
+
 include $(topsrcdir)/build/moz-automation.mk
 
 # _tests should be purged during cleaning. However, we don't want it purged
@@ -141,23 +146,25 @@ endif
 # Windows PGO builds don't perform a clean before the 2nd pass. So, we want
 # to preserve content for the 2nd pass on Windows. Everywhere else, we always
 # process the install manifests as part of export.
+# For the binaries rule, not all the install manifests matter, so force only
+# the interesting ones to be done.
 ifdef MOZ_PROFILE_USE
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1
+	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
 endif
 endif
 else # !MOZ_PROFILE_USE (normal build)
 export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1
+	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
 endif
 
 # For historical reasons that are unknown, $(DIST)/sdk is always blown away
 # with no regard for PGO passes. This decision could probably be revisited.
-export:: install-dist-sdk
+export:: install-dist/sdk
 
 ifndef JS_STANDALONE
 ifdef ENABLE_TESTS
@@ -315,27 +322,4 @@ config/export:
 
 endif
 
-# Interdependencies for parallel export.
-js/xpconnect/src/export: dom/bindings/export xpcom/xpidl/export
-accessible/xpcom/export: xpcom/xpidl/export
-ifdef ENABLE_CLANG_PLUGIN
-js/src/export config/host: build/clang-plugin/export
-endif
-
-# Interdependencies that moz.build world don't know about yet for compilation.
-# Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
-toolkit/library/target: widget/gtk/mozgtk/gtk3/target
-endif
-ifdef MOZ_LDAP_XPCOM
-ldap/target: config/external/nss/target mozglue/build/target
-toolkit/library/target: ldap/target
-endif
-ifndef MOZ_FOLD_LIBS
-ifndef MOZ_NATIVE_SQLITE
-config/external/nss/target: db/sqlite3/src/target
-endif
-endif
-ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
-mozglue/build/target: memory/replace/dummy/target
-endif
+# There used to be build interdependencies here. They are now in config/recurse.mk

accessible/atk/RootAccessibleWrap.h

@@ -23,7 +23,7 @@ typedef RootAccessible RootAccessibleWrap;
 class GtkWindowAccessible MOZ_FINAL : public DummyAccessible
 {
 public:
-  GtkWindowAccessible(AtkObject* aAccessible);
+  explicit GtkWindowAccessible(AtkObject* aAccessible);
   virtual ~GtkWindowAccessible();
 };
 

accessible/atk/nsMaiHyperlink.h

@@ -23,7 +23,7 @@ namespace a11y {
 class MaiHyperlink
 {
 public:
-  MaiHyperlink(Accessible* aHyperLink);
+  explicit MaiHyperlink(Accessible* aHyperLink);
   ~MaiHyperlink();
 
 public:

accessible/base/ARIAMap.h

@@ -234,7 +234,7 @@ uint8_t AttrCharacteristicsFor(nsIAtom* aAtom);
 class AttrIterator
 {
 public:
-  AttrIterator(nsIContent* aContent) : 
+  explicit AttrIterator(nsIContent* aContent) : 
     mContent(aContent), mAttrIdx(0) 
   { 
     mAttrCount = mContent->GetAttrCount();

accessible/base/AccCollector.h

@@ -71,7 +71,7 @@ class AccCollector
  * Collect embedded objects. Provide quick access to accessible by index and
  * vice versa.
  */
-class EmbeddedObjCollector : public AccCollector
+class EmbeddedObjCollector MOZ_FINAL : public AccCollector
 {
 public:
   virtual ~EmbeddedObjCollector() { }
@@ -81,7 +81,7 @@ class EmbeddedObjCollector : public AccCollector
 
 protected:
   // Make sure it's used by Accessible class only.
-  EmbeddedObjCollector(Accessible* aRoot) :
+  explicit EmbeddedObjCollector(Accessible* aRoot) :
     AccCollector(aRoot, filters::GetEmbeddedObject) { }
 
   virtual void AppendObject(Accessible* aAccessible);

accessible/base/AccEvent.cpp

@@ -251,6 +251,14 @@ a11y::MakeXPCEvent(AccEvent* aEvent)
     return xpEvent.forget();
   }
 
+  if (eventGroup & (1 << AccEvent::eObjectAttrChangedEvent)) {
+    AccObjectAttrChangedEvent* oac = downcast_accEvent(aEvent);
+    xpEvent = new xpcAccObjectAttributeChangedEvent(type, acc, doc, domNode,
+                                                    fromUser,
+                                                    oac->GetAttribute());
+    return xpEvent.forget();
+  }
+
   xpEvent = new xpcAccEvent(type, acc, doc, domNode, fromUser);
   return xpEvent.forget();
   }

accessible/base/AccEvent.h

@@ -105,7 +105,8 @@ class AccEvent
     eTextSelChangeEvent,
     eSelectionChangeEvent,
     eTableChangeEvent,
-    eVirtualCursorChangeEvent
+    eVirtualCursorChangeEvent,
+    eObjectAttrChangedEvent
   };
 
   static const EventGroup kEventGroup = eGenericEvent;
@@ -494,6 +495,32 @@ class AccVCChangeEvent : public AccEvent
   int16_t mReason;
 };
 
+/**
+ * Accessible object attribute changed event.
+ */
+class AccObjectAttrChangedEvent: public AccEvent
+{
+public:
+  AccObjectAttrChangedEvent(Accessible* aAccessible, nsIAtom* aAttribute) :
+    AccEvent(::nsIAccessibleEvent::EVENT_OBJECT_ATTRIBUTE_CHANGED, aAccessible),
+    mAttribute(aAttribute) { }
+
+  // AccEvent
+  static const EventGroup kEventGroup = eObjectAttrChangedEvent;
+  virtual unsigned int GetEventGroups() const
+  {
+    return AccEvent::GetEventGroups() | (1U << eObjectAttrChangedEvent);
+  }
+
+  // AccObjectAttrChangedEvent
+  nsIAtom* GetAttribute() const { return mAttribute; }
+
+private:
+  nsCOMPtr<nsIAtom> mAttribute;
+
+  virtual ~AccObjectAttrChangedEvent() { }
+};
+
 /**
  * Downcast the generic accessible event object to derived type.
  */

accessible/base/AccIterator.h

@@ -52,7 +52,7 @@ class AccIterator : public AccIterable
 
   struct IteratorState
   {
-    IteratorState(Accessible* aParent, IteratorState* mParentState = nullptr);
+    explicit IteratorState(Accessible* aParent, IteratorState* mParentState = nullptr);
 
     Accessible* mParent;
     int32_t mIndex;
@@ -254,7 +254,7 @@ class IDRefsIterator : public AccIterable
 class SingleAccIterator : public AccIterable
 {
 public:
-  SingleAccIterator(Accessible* aTarget): mAcc(aTarget) { }
+  explicit SingleAccIterator(Accessible* aTarget): mAcc(aTarget) { }
   virtual ~SingleAccIterator() { }
 
   virtual Accessible* Next();
@@ -274,7 +274,7 @@ class SingleAccIterator : public AccIterable
 class ItemIterator : public AccIterable
 {
 public:
-  ItemIterator(Accessible* aItemContainer) :
+  explicit ItemIterator(Accessible* aItemContainer) :
     mContainer(aItemContainer), mAnchor(nullptr) { }
   virtual ~ItemIterator() { }
 

accessible/base/EventQueue.h

@@ -19,7 +19,7 @@ class DocAccessible;
 class EventQueue
 {
 protected:
-  EventQueue(DocAccessible* aDocument) : mDocument(aDocument) { }
+  explicit EventQueue(DocAccessible* aDocument) : mDocument(aDocument) { }
 
   /**
    * Put an accessible event into the queue to process it later.

accessible/base/NotificationController.h

@@ -26,7 +26,7 @@ class DocAccessible;
 class Notification
 {
 public:
-  NS_INLINE_DECL_REFCOUNTING(Notification)
+  NS_INLINE_DECL_REFCOUNTING(mozilla::a11y::Notification)
 
   /**
    * Process notification.
@@ -85,8 +85,8 @@ class TNotification : public Notification
 /**
  * Used to process notifications from core for the document accessible.
  */
-class NotificationController : public EventQueue,
-                               public nsARefreshObserver
+class NotificationController MOZ_FINAL : public EventQueue,
+                                         public nsARefreshObserver
 {
 public:
   NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
@@ -275,8 +275,8 @@ class NotificationController : public EventQueue,
     typedef T* KeyType;
     typedef const T* KeyTypePointer;
 
-    nsCOMPtrHashKey(const T* aKey) : mKey(const_cast<T*>(aKey)) {}
-    nsCOMPtrHashKey(const nsPtrHashKey<T> &aToCopy) : mKey(aToCopy.mKey) {}
+    explicit nsCOMPtrHashKey(const T* aKey) : mKey(const_cast<T*>(aKey)) {}
+    explicit nsCOMPtrHashKey(const nsPtrHashKey<T> &aToCopy) : mKey(aToCopy.mKey) {}
     ~nsCOMPtrHashKey() { }
 
     KeyType GetKey() const { return mKey; }

accessible/base/Relation.h

@@ -23,10 +23,10 @@ class Relation
 public:
   Relation() : mFirstIter(nullptr), mLastIter(nullptr) { }
 
-  Relation(AccIterable* aIter) :
+  explicit Relation(AccIterable* aIter) :
     mFirstIter(aIter), mLastIter(aIter) { }
 
-  Relation(Accessible* aAcc) :
+  explicit Relation(Accessible* aAcc) :
     mFirstIter(nullptr), mLastIter(nullptr)
     { AppendTarget(aAcc); }
 

accessible/base/SelectionManager.cpp

@@ -154,6 +154,12 @@ SelectionManager::ProcessTextSelChangeEvent(AccEvent* aEvent)
     return;
 
   Selection* selection = caretCntr->DOMSelection();
+
+  // XXX Sometimes we can't get a selection for caretCntr, in that case assume
+  // event->mSel is correct.
+  if (!selection)
+    selection = event->mSel;
+
   mCaretOffset = caretCntr->DOMPointToOffset(selection->GetFocusNode(),
                                              selection->FocusOffset());
   mAccWithCaret = caretCntr;
@@ -179,8 +185,7 @@ SelectionManager::NotifySelectionChanged(nsIDOMDocument* aDOMDocument,
     logging::SelChange(aSelection, document, aReason);
 #endif
 
-  // Don't fire events until document is loaded.
-  if (document && document->IsContentLoaded()) {
+  if (document) {
     // Selection manager has longer lifetime than any document accessible,
     // so that we are guaranteed that the notification is processed before
     // the selection manager is destroyed.

accessible/base/TextAttrs.h

@@ -34,7 +34,7 @@ class TextAttrsMgr
   /**
    * Constructor. Used to expose default text attributes.
    */
-  TextAttrsMgr(HyperTextAccessible* aHyperTextAcc) :
+  explicit TextAttrsMgr(HyperTextAccessible* aHyperTextAcc) :
     mOffsetAcc(nullptr),  mHyperTextAcc(aHyperTextAcc),
     mOffsetAccIdx(-1), mIncludeDefAttrs(true) { }
 
@@ -126,7 +126,7 @@ class TextAttrsMgr
   class TTextAttr : public TextAttr
   {
   public:
-    TTextAttr(bool aGetRootValue) : mGetRootValue(aGetRootValue) {}
+    explicit TTextAttr(bool aGetRootValue) : mGetRootValue(aGetRootValue) {}
 
     // TextAttr
     virtual void Expose(nsIPersistentProperties* aAttributes,
@@ -393,7 +393,7 @@ class TextAttrsMgr
   {
   public:
     TextDecorValue() { }
-    TextDecorValue(nsIFrame* aFrame);
+    explicit TextDecorValue(nsIFrame* aFrame);
 
     nscolor Color() const { return mColor; }
     uint8_t Style() const { return mStyle; }