Bug 340661. Remove unneeded nsHTMLImageMapAccessible. r=pilgrim

accessible/src/atk/Makefile.in

@@ -68,7 +68,6 @@ CPPSRCS = \
   nsDocAccessibleWrap.cpp \
   nsRootAccessibleWrap.cpp \
   nsAppRootAccessible.cpp \
-  nsHTMLLinkAccessibleWrap.cpp \
   nsHTMLTableAccessibleWrap.cpp \
   nsMaiInterfaceComponent.cpp \
   nsMaiInterfaceAction.cpp \

accessible/src/base/nsAccessibilityService.cpp

@@ -99,7 +99,6 @@
 #endif
 
 #ifdef MOZ_ACCESSIBILITY_ATK
-#include "nsHTMLLinkAccessibleWrap.h"
 #include "nsHTMLTableAccessibleWrap.h"
 #endif
 
@@ -615,15 +614,6 @@ nsAccessibilityService::CreateHTMLImageAccessible(nsISupports *aFrame, nsIAccess
   *_retval = nsnull;
   nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(node));
   if (domElement) {
-#ifdef MOZ_ACCESSIBILITY_ATK
-    PRBool hasAttribute;
-    rv = domElement->HasAttribute(NS_LITERAL_STRING("usemap"), &hasAttribute);
-    if (NS_SUCCEEDED(rv) && hasAttribute) {
-      //There is a "use map"
-      *_retval = new nsHTMLImageMapAccessible(node, weakShell);
-    }
-    else
-#endif //MOZ_ACCESSIBILITY_ATK
       *_retval = new nsHTMLImageAccessible(node, weakShell);
   }
 

accessible/src/base/nsAccessible.h

@@ -149,7 +149,7 @@ public:
 
   static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
   static PRUint32 State(nsIAccessible *aAcc) { PRUint32 state; aAcc->GetFinalState(&state); return state; }
-  static PRUint32 Role(nsIAccessible *aAcc) { PRUint32 role; aAcc->GetRole(&role); return role; }
+  static PRUint32 Role(nsIAccessible *aAcc) { PRUint32 role; aAcc->GetFinalRole(&role); return role; }
 
 protected:
   PRBool MappedAttrState(nsIContent *aContent, PRUint32 *aStateInOut, nsStateMapEntry *aStateMapEntry);

accessible/src/html/nsHyperTextAccessible.cpp

@@ -149,7 +149,8 @@ NS_IMETHODIMP nsHyperTextAccessible::GetRole(PRUint32 *aRole)
   else if (tag == nsAccessibilityAtoms::form) {
     *aRole = ROLE_FORM;
   }
-  else if (tag == nsAccessibilityAtoms::div) {
+  else if (tag == nsAccessibilityAtoms::div ||
+           tag == nsAccessibilityAtoms::blockquote) {
     *aRole = ROLE_SECTION;
   }
   else if (tag == nsAccessibilityAtoms::h1 ||

accessible/src/mac/nsAccessibleWrap.h

@@ -54,7 +54,6 @@ class nsAccessibleWrap : public nsAccessible
 };
 
 // Define unsupported wrap classes here
-typedef class nsHTMLLinkAccessible         nsHTMLLinkAccessibleWrap;
 typedef class nsHTMLTableCellAccessible    nsHTMLTableCellAccessibleWrap;
 typedef class nsHTMLTableAccessible        nsHTMLTableAccessibleWrap;
 

accessible/src/msaa/nsAccessibleWrap.h

@@ -197,7 +197,6 @@ protected:
 
 // Define unsupported wrap classes here
 typedef class nsHTMLTextFieldAccessible    nsHTMLTextFieldAccessibleWrap;
-typedef class nsHTMLLinkAccessible         nsHTMLLinkAccessibleWrap;
 typedef class nsHTMLTableCellAccessible    nsHTMLTableCellAccessibleWrap;
 typedef class nsHTMLTableAccessible        nsHTMLTableAccessibleWrap;
 typedef class nsXULTextFieldAccessible     nsXULTextFieldAccessibleWrap;

accessible/src/other/nsAccessibleWrap.h

@@ -54,7 +54,6 @@ class nsAccessibleWrap : public nsAccessible
 };
 
 // Define unsupported wrap classes here
-typedef class nsHTMLLinkAccessible         nsHTMLLinkAccessibleWrap;
 typedef class nsHTMLTableCellAccessible    nsHTMLTableCellAccessibleWrap;
 typedef class nsHTMLTableAccessible        nsHTMLTableAccessibleWrap;