Bug 557768 - A11y should use nsImageMapUtils; r=surkov

This commit is contained in:
Boris Zbarsky 2011-03-29 22:24:54 -04:00
parent 4b1168a59f
commit de2c6069b3

View File

@ -101,6 +101,7 @@
#include "mozilla/FunctionTimer.h"
#include "mozilla/dom/Element.h"
#include "nsImageMapUtils.h"
////////////////////////////////////////////////////////////////////////////////
// nsAccessibilityService
@ -264,21 +265,12 @@ already_AddRefed<nsAccessible>
nsAccessibilityService::CreateHTMLImageAccessible(nsIContent* aContent,
nsIPresShell* aPresShell)
{
nsCOMPtr<nsIHTMLDocument> htmlDoc =
do_QueryInterface(aContent->GetCurrentDoc());
nsCOMPtr<nsIDOMHTMLMapElement> mapElm;
if (htmlDoc) {
nsAutoString mapElmName;
aContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::usemap,
mapElmName);
if (!mapElmName.IsEmpty()) {
if (mapElmName.CharAt(0) == '#')
mapElmName.Cut(0,1);
mapElm = do_QueryInterface(htmlDoc->GetImageMap(mapElmName));
}
}
nsAutoString mapElmName;
aContent->GetAttr(kNameSpaceID_None,
nsAccessibilityAtoms::usemap,
mapElmName);
nsCOMPtr<nsIDOMHTMLMapElement> mapElm =
nsImageMapUtils::FindImageMap(aContent->GetCurrentDoc(), mapElmName);
nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
nsAccessible* accessible = mapElm ?