Bug 149856 [XBLFC] Active Accessibility: support XBL-based HTML button

r=aaronl, sr=jst


git-svn-id: svn://10.0.0.236/trunk@124064 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -44,6 +44,7 @@ interface nsIAccessibilityService : nsISupports
   nsIAccessible createHTMLAreaAccessible(in nsIWeakReference aPresShell, in nsIDOMNode aDOMNode, in nsIAccessible aAccParent);
   nsIAccessible createHTMLBlockAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
   nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLButtonAccessibleXBL(in nsIDOMNode aNode);
   nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLCheckboxAccessibleXBL(in nsIDOMNode aNode);
   nsIAccessible createHTMLComboboxAccessible(in nsIDOMNode aNode, in nsISupports aPresShell);

mozilla/accessible/src/base/nsAccessibilityService.cpp

@@ -463,6 +463,25 @@ nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAcces
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsAccessibilityService::CreateHTMLButtonAccessibleXBL(nsIDOMNode *aNode, nsIAccessible **_retval)
+{
+#ifdef MOZ_XUL
+  nsCOMPtr<nsIWeakReference> weakShell;
+  GetShellFromNode(aNode, getter_AddRefs(weakShell));
+
+  // reusing the HTML accessible widget and enhancing for XUL
+  *_retval = new nsHTML4ButtonAccessible(aNode, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+#else
+  *_retval = nsnull;
+#endif // MOZ_XUL
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
 {

mozilla/layout/forms/nsHTMLButtonControlFrame.cpp

@@ -69,6 +69,8 @@
 #include "nsINameSpaceManager.h"
 #include "nsReflowPath.h"
 #include "nsIServiceManager.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsIDOMHTMLInputElement.h"
 #ifdef ACCESSIBILITY
 #include "nsIAccessibilityService.h"
 #endif
@@ -188,7 +190,14 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    nsCOMPtr<nsIContent> content;
+    GetContent(getter_AddRefs(content));
+    nsCOMPtr<nsIDOMHTMLButtonElement> buttonElement(do_QueryInterface(content));
+    if (buttonElement) //If turned XBL-base form control off, the frame contains HTML 4 button
+      return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(content));
+    if (inputElement) //If turned XBL-base form control on, the frame contains normal HTML button
+      return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;

mozilla/layout/forms/resources/content/button.xml

@@ -55,6 +55,18 @@
         </xul:description>
       </xul:hbox>
     </content>
+    <implementation implements="nsIAccessibleProvider">
+      <property name="accessible">
+        <getter>
+          <![CDATA[
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");  // Temporary, until bug 104907 is fixed
+            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
+            return accService.createHTMLButtonAccessibleXBL(this);
+          ]]>
+        </getter>
+      </property>
+
+    </implementation>
   </binding>
 
   <binding id="inputButton" extends="chrome://global/content/bindings/general.xml#basetext"

mozilla/layout/html/forms/resources/content/button.xml

@@ -55,6 +55,18 @@
         </xul:description>
       </xul:hbox>
     </content>
+    <implementation implements="nsIAccessibleProvider">
+      <property name="accessible">
+        <getter>
+          <![CDATA[
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");  // Temporary, until bug 104907 is fixed
+            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
+            return accService.createHTMLButtonAccessibleXBL(this);
+          ]]>
+        </getter>
+      </property>
+
+    </implementation>
   </binding>
 
   <binding id="inputButton" extends="chrome://global/content/bindings/general.xml#basetext"

mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp

@@ -69,6 +69,8 @@
 #include "nsINameSpaceManager.h"
 #include "nsReflowPath.h"
 #include "nsIServiceManager.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsIDOMHTMLInputElement.h"
 #ifdef ACCESSIBILITY
 #include "nsIAccessibilityService.h"
 #endif
@@ -188,7 +190,14 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    nsCOMPtr<nsIContent> content;
+    GetContent(getter_AddRefs(content));
+    nsCOMPtr<nsIDOMHTMLButtonElement> buttonElement(do_QueryInterface(content));
+    if (buttonElement) //If turned XBL-base form control off, the frame contains HTML 4 button
+      return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(content));
+    if (inputElement) //If turned XBL-base form control on, the frame contains normal HTML button
+      return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;