Merge commit '7ebdc17896ccefcf36cfcde7f5c95aaae41cf110' into embedlit…

…e, dummy merge

Conflicts:
	dom/media/MediaDecoder.cpp
	gfx/layers/ipc/CompositorParent.cpp
	gfx/layers/ipc/CompositorParent.h
	gfx/thebes/gfxPlatform.cpp
	js/src/jit/arm/MacroAssembler-arm.cpp
	widget/VsyncDispatcher.cpp

.gitignore

@@ -67,3 +67,6 @@ GPATH
 
 # Git clone directory for updating web-platform-tests
 testing/web-platform/sync/
+
+# Android Gradle artifacts.
+mobile/android/gradle/.gradle

.hgignore

@@ -93,3 +93,6 @@ GPATH
 # including the following three lines
 ^browser/components/loop/standalone/content/legal/styles/.*\.css$
 ^browser/components/loop/standalone/content/legal/terms/en_US\.html$
+
+# Android Gradle artifacts.
+^mobile/android/gradle/.gradle

CLOBBER

@@ -22,9 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1105308 - Cleanup BluetoothUtils.{cpp,h}
-
-This patch set moves some files around and requires a rebuild
-of the build system's dependency information.
-
-Merge day clobber
+Bug 1066383 - Clobber needed due to build system not reliably picking up an IDL removal.

accessible/atk/moz.build

@@ -51,3 +51,9 @@ if CONFIG['MOZ_ENABLE_DBUS']:
     CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['CLANG_CXX']:
+    # Suppress clang warning about unused function from gobject's RTTI macros.
+    CXXFLAGS += ['-Wno-unused-function']
+
+FAIL_ON_WARNINGS = True

accessible/base/DocManager.cpp

@@ -9,7 +9,9 @@
 #include "ARIAMap.h"
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
+#include "DocAccessibleParent.h"
 #include "nsAccessibilityService.h"
+#include "Platform.h"
 #include "RootAccessibleWrap.h"
 #include "xpcAccessibleDocument.h"
 
@@ -36,6 +38,8 @@ using namespace mozilla;
 using namespace mozilla::a11y;
 using namespace mozilla::dom;
 
+StaticAutoPtr<nsTArray<DocAccessibleParent*>> DocManager::sRemoteDocuments;
+
 ////////////////////////////////////////////////////////////////////////////////
 // DocManager
 ////////////////////////////////////////////////////////////////////////////////
@@ -533,3 +537,17 @@ DocManager::SearchIfDocIsRefreshing(const nsIDocument* aKey,
   return PL_DHASH_NEXT;
 }
 #endif
+
+void
+DocManager::RemoteDocAdded(DocAccessibleParent* aDoc)
+{
+  if (!sRemoteDocuments) {
+    sRemoteDocuments = new nsTArray<DocAccessibleParent*>;
+    ClearOnShutdown(&sRemoteDocuments);
+  }
+
+  MOZ_ASSERT(!sRemoteDocuments->Contains(aDoc),
+      "How did we already have the doc!");
+  sRemoteDocuments->AppendElement(aDoc);
+  ProxyCreated(aDoc);
+}

accessible/base/DocManager.h

@@ -5,12 +5,14 @@
 #ifndef mozilla_a11_DocManager_h_
 #define mozilla_a11_DocManager_h_
 
+#include "mozilla/ClearOnShutdown.h"
 #include "nsIDocument.h"
 #include "nsIDOMEventListener.h"
 #include "nsRefPtrHashtable.h"
 #include "nsIWebProgressListener.h"
 #include "nsWeakReference.h"
 #include "nsIPresShell.h"
+#include "mozilla/StaticPtr.h"
 
 namespace mozilla {
 namespace a11y {
@@ -74,21 +76,16 @@ class DocManager : public nsIWebProgressListener,
   /*
    * Notification that a top level document in a content process has gone away.
    */
-  void RemoteDocShutdown(DocAccessibleParent* aDoc)
+  static void RemoteDocShutdown(DocAccessibleParent* aDoc)
   {
-    DebugOnly<bool> result = mRemoteDocuments.RemoveElement(aDoc);
+    DebugOnly<bool> result = sRemoteDocuments->RemoveElement(aDoc);
     MOZ_ASSERT(result, "Why didn't we find the document!");
   }
 
   /*
    * Notify of a new top level document in a content process.
    */
-  void RemoteDocAdded(DocAccessibleParent* aDoc)
-  {
-    MOZ_ASSERT(!mRemoteDocuments.Contains(aDoc),
-               "How did we already have the doc!");
-    mRemoteDocuments.AppendElement(aDoc);
-  }
+  static void RemoteDocAdded(DocAccessibleParent* aDoc);
 
 #ifdef DEBUG
   bool IsProcessingRefreshDriverNotification() const;
@@ -176,7 +173,7 @@ class DocManager : public nsIWebProgressListener,
   /*
    * The list of remote top level documents.
    */
-  nsTArray<DocAccessibleParent*> mRemoteDocuments;
+  static StaticAutoPtr<nsTArray<DocAccessibleParent*>> sRemoteDocuments;
 };
 
 /**

accessible/base/moz.build

@@ -97,3 +97,5 @@ if CONFIG['MOZ_ENABLE_GTK']:
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FAIL_ON_WARNINGS = True

accessible/base/nsAccessibilityService.cpp

@@ -1480,7 +1480,8 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
       tag == nsGkAtoms::h6 ||
       tag == nsGkAtoms::nav ||
       tag == nsGkAtoms::q ||
-      tag == nsGkAtoms::section) {
+      tag == nsGkAtoms::section ||
+      tag == nsGkAtoms::time) {
     nsRefPtr<Accessible> accessible =
       new HyperTextAccessibleWrap(aContent, document);
     return accessible.forget();

accessible/generic/HyperTextAccessible.cpp

@@ -982,6 +982,15 @@ HyperTextAccessible::NativeAttributes()
   } else if (tag == nsGkAtoms::main) {
     nsAccUtils::SetAccAttr(attributes, nsGkAtoms::xmlroles,
                            NS_LITERAL_STRING("main"));
+  } else if (tag == nsGkAtoms::time) {
+    nsAccUtils::SetAccAttr(attributes, nsGkAtoms::xmlroles,
+                           NS_LITERAL_STRING("time"));
+
+    if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::datetime)) {
+      nsAutoString datetime;
+      mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::datetime, datetime);
+      nsAccUtils::SetAccAttr(attributes, nsGkAtoms::datetime, datetime);
+    }
   }
 
   return attributes.forget();

accessible/generic/moz.build

@@ -57,3 +57,5 @@ else:
 FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FAIL_ON_WARNINGS = True

accessible/html/moz.build

@@ -43,3 +43,5 @@ else:
     ]
 
 FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True

accessible/ipc/DocAccessibleParent.cpp

@@ -130,5 +130,30 @@ DocAccessibleParent::RecvEvent(const uint64_t& aID, const uint32_t& aEventType)
   ProxyEvent(e->mProxy, aEventType);
   return true;
 }
+bool
+DocAccessibleParent::AddChildDoc(DocAccessibleParent* aChildDoc,
+                                 uint64_t aParentID)
+{
+  ProxyAccessible* outerDoc = mAccessibles.GetEntry(aParentID)->mProxy;
+  if (!outerDoc)
+    return false;
+
+  aChildDoc->mParent = outerDoc;
+  outerDoc->SetChildDoc(aChildDoc);
+  mChildDocs.AppendElement(aChildDoc);
+  aChildDoc->mParentDoc = this;
+  ProxyCreated(aChildDoc);
+  return true;
+}
+
+void
+DocAccessibleParent::ActorDestroy(ActorDestroyReason aWhy)
+{
+  ProxyDestroyed(this);
+  MOZ_ASSERT(mChildDocs.IsEmpty(),
+      "why wheren't the child docs destroyed already?");
+  mParentDoc ? mParentDoc->RemoveChildDoc(this)
+    : GetAccService()->RemoteDocShutdown(this);
+}
 }
 }

accessible/ipc/DocAccessibleParent.h

@@ -26,7 +26,7 @@ class DocAccessibleParent : public ProxyAccessible,
 {
 public:
   DocAccessibleParent() :
-    mParentDoc(nullptr)
+    ProxyAccessible(this), mParentDoc(nullptr)
   { MOZ_COUNT_CTOR_INHERITED(DocAccessibleParent, ProxyAccessible); }
   ~DocAccessibleParent()
   {
@@ -45,13 +45,7 @@ class DocAccessibleParent : public ProxyAccessible,
   virtual bool RecvShowEvent(const ShowEventData& aData) MOZ_OVERRIDE;
   virtual bool RecvHideEvent(const uint64_t& aRootID) MOZ_OVERRIDE;
 
-  virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE
-  {
-    MOZ_ASSERT(mChildDocs.IsEmpty(),
-               "why wheren't the child docs destroyed already?");
-    mParentDoc ? mParentDoc->RemoveChildDoc(this)
-      : GetAccService()->RemoteDocShutdown(this);
-  }
+  virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
   /*
    * Return the main processes representation of the parent document (if any)
@@ -63,18 +57,7 @@ class DocAccessibleParent : public ProxyAccessible,
    * Called when a document in a content process notifies the main process of a
    * new child document.
    */
-  bool AddChildDoc(DocAccessibleParent* aChildDoc, uint64_t aParentID)
-  {
-    ProxyAccessible* outerDoc = mAccessibles.GetEntry(aParentID)->mProxy;
-    if (!outerDoc)
-      return false;
-
-    aChildDoc->mParent = outerDoc;
-    outerDoc->SetChildDoc(aChildDoc);
-    mChildDocs.AppendElement(aChildDoc);
-    aChildDoc->mParentDoc = this;
-    return true;
-  }
+  bool AddChildDoc(DocAccessibleParent* aChildDoc, uint64_t aParentID);
 
   /*
    * Called when the document in the content process this object represents

accessible/ipc/ProxyAccessible.h

@@ -86,8 +86,9 @@ class ProxyAccessible
   uint64_t ID() const { return mID; }
 
 protected:
-  ProxyAccessible() :
-    mParent(nullptr), mDoc(nullptr), mWrapper(0), mID(0)
+  explicit ProxyAccessible(DocAccessibleParent* aThisAsDoc) :
+    mParent(nullptr), mDoc(aThisAsDoc), mWrapper(0), mID(0),
+    mRole(roles::DOCUMENT)
   { MOZ_COUNT_CTOR(ProxyAccessible); }
 
 protected:

accessible/ipc/moz.build

@@ -29,3 +29,5 @@ if CONFIG['ACCESSIBILITY']:
     FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FAIL_ON_WARNINGS = True

accessible/mac/moz.build

@@ -38,3 +38,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True

accessible/other/moz.build

@@ -22,3 +22,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True

accessible/tests/mochitest/actions/test_link.html

@@ -22,8 +22,17 @@
       var thisTabDocAcc = getTabDocAccessible();
       var thisDocTabPanelAcc = thisTabDocAcc.parent.parent;
       var tabPanelsAcc = thisDocTabPanelAcc.parent;
-      var newDocTabPanelAcc = tabPanelsAcc.lastChild.firstChild;
-      return newDocTabPanelAcc.firstChild;
+      var newDocTabPanelAcc = tabPanelsAcc.firstChild;
+      var nextAcc = newDocTabPanelAcc;
+
+      while (nextAcc = nextAcc.nextSibling) {
+        // Find the last accessible for a browser with about:mozilla loaded.
+        if (nextAcc.firstChild.DOMNode.currentURI.spec == "about:mozilla") {
+          newDocTabPanelAcc = nextAcc;
+        }
+      }
+
+      return newDocTabPanelAcc.firstChild.firstChild;
     }
 
     function linkChecker(aID)

accessible/tests/mochitest/elm/test_HTMLSpec.html

@@ -1232,7 +1232,12 @@
       //////////////////////////////////////////////////////////////////////////
       // HTML:time
 
-      ok(!isAccessible("time"), "time element is not accessible");
+      obj = {
+        role: ROLE_TEXT_CONTAINER,
+        attributes: { "xml-roles": "time", "datetime": "2001-05-15 19:00" },
+        interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ]
+      };
+      testElm("time", obj);
 
       //////////////////////////////////////////////////////////////////////////
       // HTML:u contained by paragraph

accessible/tests/mochitest/events/test_docload.html

@@ -15,25 +15,6 @@
           src="../role.js"></script>
   <script type="application/javascript"
           src="../states.js"></script>
-
-  <script type="application/javascript">
-    // Front end stuff sometimes likes to stuff things in the hidden window(s)
-    // in which case there's accessibles for that content.
-    Components.utils.import("resource://gre/modules/Services.jsm");
-
-    // Force the creation of an accessible for the hidden window's document.
-    var doc = Services.appShell.hiddenDOMWindow.document;
-    gAccRetrieval.getAccessibleFor(doc);
-
-    // The private hidden window will be lazily created that's why we need to do
-    // it here *before* loading '../events.js' or else we'll have a duplicate
-    // reorder event.
-    var privateDoc = Services.appShell.hiddenPrivateDOMWindow.document;
-
-    // Force the creation of an accessible for the private hidden window's doc.
-    gAccRetrieval.getAccessibleFor(privateDoc);
-  </script>
-
   <script type="application/javascript"
           src="../events.js"></script>
 
@@ -193,12 +174,6 @@
         var accTree = {
           role: ROLE_APP_ROOT,
           children: [
-            {
-              role: ROLE_CHROME_WINDOW
-            },
-            {
-              role: ROLE_CHROME_WINDOW
-            },
             {
               role: ROLE_CHROME_WINDOW
             },

accessible/tests/mochitest/tree/test_dochierarchy.html

@@ -31,10 +31,15 @@
 
     is(root.parentDocument, null,
        "Wrong parent document of root accessible");
-    is(root.childDocumentCount, 1,
+    ok(root.childDocumentCount >= 1,
        "Wrong child document count of root accessible");
-    is(root.getChildDocumentAt(0), tabDoc,
-       "Wrong child document at index 0 of root accessible");
+
+    var tabDocumentFound = false;
+    for (var i = 0; i < root.childDocumentCount && !tabDocumentFound; i++) {
+      tabDocumentFound = root.getChildDocumentAt(i) == tabDoc;
+    }
+    ok(tabDocumentFound,
+       "Tab document not found in children of the root accessible");
 
     is(tabDoc.parentDocument, root,
        "Wrong parent document of tab document");

accessible/tests/mochitest/tree/test_tabbrowser.xul

@@ -169,6 +169,23 @@
                   ]
                 }
               ]
+            },
+            {
+              // notificationbox
+              role: ROLE_PROPERTYPAGE,
+              children: [
+                {
+                  // browser
+                  role: ROLE_INTERNAL_FRAME,
+                  children: [
+                    {
+                      // #document ("about:newtab" preloaded)
+                      role: ROLE_APPLICATION
+                      // children: [ ... ] // Ignore document content.
+                    }
+                  ]
+                }
+              ]
             }
           ]
         };

accessible/windows/ia2/moz.build

@@ -50,3 +50,5 @@ FINAL_LIBRARY = 'xul'
 # macros which conflicts with std::min/max.  Suppress the macros:
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['NOMINMAX'] = True
+
+FAIL_ON_WARNINGS = True

accessible/windows/msaa/moz.build

@@ -59,3 +59,5 @@ LOCAL_INCLUDES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True