backout e88d2327e25d, bug 557768

accessible/src/base/nsAccessibilityService.cpp

@@ -87,8 +87,6 @@
 #include "nsNetError.h"
 #include "nsDocShellLoadTypes.h"
 
-#include "nsImageMapUtils.h"
-
 #ifdef MOZ_XUL
 #include "nsXULAlertAccessible.h"
 #include "nsXULColorPickerAccessible.h"
@@ -655,12 +653,21 @@ nsAccessibilityService::CreateHTMLImageAccessible(nsIFrame *aFrame,
   nsCOMPtr<nsIContent> content = do_QueryInterface(node);
   NS_ENSURE_STATE(content);
 
+  nsCOMPtr<nsIHTMLDocument> htmlDoc =
+    do_QueryInterface(content->GetCurrentDoc());
+
+  nsCOMPtr<nsIDOMHTMLMapElement> mapElm;
+  if (htmlDoc) {
     nsAutoString mapElmName;
-  content->GetAttr(kNameSpaceID_None,
-                   nsAccessibilityAtoms::usemap,
+    content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::usemap,
                      mapElmName);
-  nsCOMPtr<nsIDOMHTMLMapElement> mapElm =
-    nsImageMapUtils::FindImageMap(content->GetCurrentDoc(), mapElmName);
+
+    if (!mapElmName.IsEmpty()) {
+      if (mapElmName.CharAt(0) == '#')
+        mapElmName.Cut(0,1);
+      mapElm = htmlDoc->GetImageMap(mapElmName);
+    }
+  }
 
   if (mapElm)
     *aAccessible = new nsHTMLImageMapAccessible(node, weakShell, mapElm);