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/atk/nsHTMLLinkAccessibleWrap.cpp

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Gilbert Fang (gilbert.fang@sun.com)
- *   Kyle Yuan (kyle.yuan@sun.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsHTMLLinkAccessibleWrap.h"
-#include "nsIDOMHTMLCollection.h"
-#include "nsIDocument.h"
-#include "nsILink.h"
-#include "nsIDOMText.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsArrayUtils.h"
-
-
-// --------------------------------------------------------
-// nsHTMLImageMapAccessible Accessible
-// --------------------------------------------------------
-NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLImageMapAccessible, nsHTMLImageAccessible)
-
-nsHTMLImageMapAccessible::nsHTMLImageMapAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsHTMLImageAccessible(aDomNode, aShell)
-{
-}
-

accessible/src/atk/nsHTMLLinkAccessibleWrap.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Gilbert Fang (gilbert.fang@sun.com)
- *   Kyle Yuan (kyle.yuan@sun.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _nsHTMLLinkAccessibleWrap_H_
-#define _nsHTMLLinkAccessibleWrap_H_
-
-#include "nsHTMLImageAccessible.h"
-#include "nsHTMLLinkAccessible.h"
-#include "nsIAccessibleHyperLink.h"
-#include "nsIMutableArray.h"
-
-// XXX Remove this and make image maps work similar to how they are done in MSAA
-class nsHTMLImageMapAccessible : public nsHTMLImageAccessible
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsHTMLImageMapAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-};
-
-#endif

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;