From b65c6ec082c5bc066d82a5352bb711722e465f32 Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net"
 <aaronleventhal%moonset.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Feb 2006 18:53:54 +0000
Subject: [PATCH] Bug 324846. XUL links still being exposed as buttons.
 r=parente, sr=neil

git-svn-id: svn://10.0.0.236/trunk@188681 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp | 7 ++++++-
 mozilla/accessible/src/base/nsBaseWidgetAccessible.h   | 1 +
 mozilla/accessible/src/xul/nsXULTextAccessible.cpp     | 2 +-
 mozilla/accessible/src/xul/nsXULTextAccessible.h       | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp b/mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp
index eeaeefc1d43..ce3453f4ebf 100644
--- a/mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp
+++ b/mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp
@@ -164,7 +164,6 @@ nsLinkableAccessible::nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference*
   mIsLink(PR_FALSE),
   mIsOnclick(PR_FALSE)
 {
-  CacheActionContent();
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsLinkableAccessible, nsAccessible)
@@ -315,6 +314,12 @@ void nsLinkableAccessible::CacheActionContent()
   }
 }
 
+NS_IMETHODIMP nsLinkableAccessible::Init()
+{
+  CacheActionContent();
+  return nsAccessibleWrap::Init();
+}
+
 NS_IMETHODIMP nsLinkableAccessible::Shutdown()
 {
   mActionContent = nsnull;
diff --git a/mozilla/accessible/src/base/nsBaseWidgetAccessible.h b/mozilla/accessible/src/base/nsBaseWidgetAccessible.h
index 26459b8b2db..b792ab8d6d8 100644
--- a/mozilla/accessible/src/base/nsBaseWidgetAccessible.h
+++ b/mozilla/accessible/src/base/nsBaseWidgetAccessible.h
@@ -91,6 +91,7 @@ public:
   NS_IMETHOD GetValue(nsAString& _retval);
   NS_IMETHOD TakeFocus();
   NS_IMETHOD GetKeyboardShortcut(nsAString& _retval);
+  NS_IMETHOD Init();
   NS_IMETHOD Shutdown();
 
 protected:
diff --git a/mozilla/accessible/src/xul/nsXULTextAccessible.cpp b/mozilla/accessible/src/xul/nsXULTextAccessible.cpp
index 528e886cbf2..b33926a19c6 100644
--- a/mozilla/accessible/src/xul/nsXULTextAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULTextAccessible.cpp
@@ -110,7 +110,7 @@ NS_IMETHODIMP nsXULTooltipAccessible::GetRole(PRUint32 *_retval)
  * For XUL text links
  */
 nsXULLinkAccessible::nsXULLinkAccessible(nsIDOMNode *aDomNode, nsIWeakReference *aShell):
-nsXULTextAccessible(aDomNode, aShell)
+nsLinkableAccessible(aDomNode, aShell)
 {
 }
 
diff --git a/mozilla/accessible/src/xul/nsXULTextAccessible.h b/mozilla/accessible/src/xul/nsXULTextAccessible.h
index e7b043270e5..82b43ab17c2 100644
--- a/mozilla/accessible/src/xul/nsXULTextAccessible.h
+++ b/mozilla/accessible/src/xul/nsXULTextAccessible.h
@@ -40,6 +40,7 @@
 #ifndef _nsXULTextAccessible_H_
 #define _nsXULTextAccessible_H_
 
+#include "nsBaseWidgetAccessible.h"
 #include "nsTextAccessibleWrap.h"
 
 class nsIWeakReference;
@@ -64,7 +65,7 @@ public:
   NS_IMETHOD GetRole(PRUint32 *_retval); 
 };
 
-class nsXULLinkAccessible : public nsXULTextAccessible
+class nsXULLinkAccessible : public nsLinkableAccessible
 {
 
 public: