Merge mozilla-central to autoland. a=merge CLOSED TREE

--HG-- rename : devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js => devtools/client/debugger/test/mochitest/browser_dbg_target-scoped-actor-01.js rename : devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js => devtools/client/debugger/test/mochitest/browser_dbg_target-scoped-actor-02.js
dothq · Jun 26, 2018 · 03ab627 · 03ab627
2 parents 16173fb + 14cb8f1
commit 03ab627
Show file tree

Hide file tree

Showing 713 changed files with 12,129 additions and 26,837 deletions.
diff --git a/accessible/base/AccGroupInfo.cpp b/accessible/base/AccGroupInfo.cpp
@@ -207,7 +207,7 @@ AccGroupInfo::NextItemTo(Accessible* aItem)
     }
   }
 
-  NS_NOTREACHED("Item in the middle of the group but there's no next item!");
+  MOZ_ASSERT_UNREACHABLE("Item in the middle of the group but there's no next item!");
   return nullptr;
 }
 

diff --git a/accessible/base/DocManager.cpp b/accessible/base/DocManager.cpp
@@ -319,7 +319,7 @@ DocManager::OnProgressChange(nsIWebProgress* aWebProgress,
                              int32_t aCurTotalProgress,
                              int32_t aMaxTotalProgress)
 {
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
@@ -328,7 +328,7 @@ DocManager::OnLocationChange(nsIWebProgress* aWebProgress,
                              nsIRequest* aRequest, nsIURI* aLocation,
                              uint32_t aFlags)
 {
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
@@ -337,7 +337,7 @@ DocManager::OnStatusChange(nsIWebProgress* aWebProgress,
                            nsIRequest* aRequest, nsresult aStatus,
                            const char16_t* aMessage)
 {
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
@@ -346,7 +346,7 @@ DocManager::OnSecurityChange(nsIWebProgress* aWebProgress,
                              nsIRequest* aRequest,
                              uint32_t aState)
 {
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 

diff --git a/accessible/base/TextUpdater.cpp b/accessible/base/TextUpdater.cpp
@@ -191,7 +191,7 @@ TextUpdater::ComputeTextChangeEvents(const nsAString& aStr1,
       --colIdx;
       continue;
     }
-    NS_NOTREACHED("huh?");
+    MOZ_ASSERT_UNREACHABLE("huh?");
     return;
   }
 

diff --git a/accessible/base/nsAccUtils.cpp b/accessible/base/nsAccUtils.cpp
@@ -320,7 +320,7 @@ nsAccUtils::ConvertToScreenCoords(int32_t aX, int32_t aY,
     }
 
     default:
-      NS_NOTREACHED("invalid coord type!");
+      MOZ_ASSERT_UNREACHABLE("invalid coord type!");
   }
 
   return coords;
@@ -352,7 +352,7 @@ nsAccUtils::ConvertScreenCoordsTo(int32_t *aX, int32_t *aY,
     }
 
     default:
-    NS_NOTREACHED("invalid coord type!");
+      MOZ_ASSERT_UNREACHABLE("invalid coord type!");
   }
 }
 

diff --git a/accessible/generic/BaseAccessibles.cpp b/accessible/generic/BaseAccessibles.cpp
@@ -41,14 +41,14 @@ LeafAccessible::ChildAtPoint(int32_t aX, int32_t aY,
 bool
 LeafAccessible::InsertChildAt(uint32_t aIndex, Accessible* aChild)
 {
-  NS_NOTREACHED("InsertChildAt called on leaf accessible!");
+  MOZ_ASSERT_UNREACHABLE("InsertChildAt called on leaf accessible!");
   return false;
 }
 
 bool
 LeafAccessible::RemoveChild(Accessible* aChild)
 {
-  NS_NOTREACHED("RemoveChild called on leaf accessible!");
+  MOZ_ASSERT_UNREACHABLE("RemoveChild called on leaf accessible!");
   return false;
 }
 

diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp
@@ -1259,7 +1259,7 @@ HyperTextAccessible::TextBounds(int32_t aStartOffset, int32_t aEndOffset,
   while (childIdx < static_cast<int32_t>(ChildCount())) {
     nsIFrame* frame = GetChildAt(childIdx++)->GetFrame();
     if (!frame) {
-      NS_NOTREACHED("No frame for a child!");
+      MOZ_ASSERT_UNREACHABLE("No frame for a child!");
       continue;
     }
 
@@ -1505,7 +1505,7 @@ HyperTextAccessible::CaretLineNumber()
     caretFrame = parentFrame;
   }
 
-  NS_NOTREACHED("DOM ancestry had this hypertext but frame ancestry didn't");
+  MOZ_ASSERT_UNREACHABLE("DOM ancestry had this hypertext but frame ancestry didn't");
   return lineNumber;
 }
 

diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp
@@ -106,7 +106,7 @@ void
 HTMLLIAccessible::UpdateBullet(bool aHasBullet)
 {
   if (aHasBullet == !!mBullet) {
-    NS_NOTREACHED("Bullet and accessible are in sync already!");
+    MOZ_ASSERT_UNREACHABLE("Bullet and accessible are in sync already!");
     return;
   }
 

diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm
@@ -720,7 +720,7 @@ - (NSString*)role
   switch (mRole) {
 #include "RoleMap.h"
     default:
-      NS_NOTREACHED("Unknown role.");
+      MOZ_ASSERT_UNREACHABLE("Unknown role.");
       return NSAccessibilityUnknownRole;
   }
 

diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp
@@ -1338,8 +1338,13 @@ AccessibleWrap::GetHWNDFor(Accessible* aAccessible)
     // their tab is within.  Popups are always in the parent process, and so
     // never proxied, which means this is basically correct.
     Accessible* outerDoc = proxy->OuterDocOfRemoteBrowser();
-    NS_ASSERTION(outerDoc, "no outer doc for accessible remote tab!");
     if (!outerDoc) {
+      // In some cases, the outer document accessible may be unattached from its
+      // document at this point, if it is scheduled for removal. Do not assert
+      // in such case. An example: putting aria-hidden="true" on HTML:iframe
+      // element will destroy iframe's document asynchroniously, but
+      // the document may be a target of selection events until then, and thus
+      // it may attempt to deliever these events to MSAA clients.
       return nullptr;
     }
 

diff --git a/accessible/xul/XULMenuAccessible.cpp b/accessible/xul/XULMenuAccessible.cpp
@@ -529,7 +529,7 @@ XULMenupopupAccessible::ContainerWidget() const
     menuPopupFrame = static_cast<nsMenuPopupFrame*>(menuParent);
   }
 
-  NS_NOTREACHED("Shouldn't be a real case.");
+  MOZ_ASSERT_UNREACHABLE("Shouldn't be a real case.");
   return nullptr;
 }
 

diff --git a/browser/components/preferences/blocklists.xul b/browser/components/preferences/blocklists.xul
@@ -21,7 +21,6 @@
   <link rel="localization" href="browser/preferences/blocklists.ftl"/>
   <script type="application/javascript" src="chrome://global/content/l10n.js"></script>
 
-  <script src="chrome://global/content/treeUtils.js"/>
   <script src="chrome://browser/content/preferences/blocklists.js"/>
 
   <keyset>

diff --git a/browser/components/preferences/containers.xul b/browser/components/preferences/containers.xul
@@ -19,7 +19,6 @@
   <link rel="localization" href="browser/preferences/containers.ftl"/>
   <script type="application/javascript" src="chrome://global/content/l10n.js"></script>
 
-  <script src="chrome://global/content/treeUtils.js"/>
   <script src="chrome://browser/content/preferences/containers.js"/>
 
   <keyset>
-Original file line number
+Diff line change
@@ Expand Up / @@ -207,7 +207,7 @@ AccGroupInfo::NextItemTo(Accessible* aItem) @@
         }
       }
-      NS_NOTREACHED("Item in the middle of the group but there's no next item!");
+      MOZ_ASSERT_UNREACHABLE("Item in the middle of the group but there's no next item!");
       return nullptr;
     }
@@ Expand Down @@