Merge mozilla-central to autoland. a=merge on a CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Thu, 01 Mar 2018 20:50:13 +0200
changeset 461126 ff7744c7b95cdd99f12062a7b7354d0916af5b1d
parent 461124 3343d7e36d4ccfd8a49656310f30caa3800b2eb3 (current diff)
parent 461125 fb9c7930fe77e2074e02a3cde903c4deccf31a3d (diff)
child 461127 e9b33e8d7623a8db4d07ac75f696c20ed4fc75b3
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. a=merge on a CLOSED TREE
--- a/accessible/base/nsAccessibilityService.cpp
+++ b/accessible/base/nsAccessibilityService.cpp
@@ -1467,17 +1467,17 @@ nsAccessibilityService::Shutdown()
 }
 
 already_AddRefed<Accessible>
 nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
                                                DocAccessible* aDoc)
 {
   nsAutoString role;
   nsCoreUtils::XBLBindingRole(aContent, role);
-  if (role.IsEmpty())
+  if (role.IsEmpty() || role.EqualsLiteral("none"))
     return nullptr;
 
   RefPtr<Accessible> accessible;
 #ifdef MOZ_XUL
   // XUL controls
   if (role.EqualsLiteral("xul:colorpicker")) {
     accessible = new XULColorPickerAccessible(aContent, aDoc);