Bug 741697 - dexpcomify CAccessibleComponent, r=tbsaunde, f=surkov

--HG--
rename : accessible/src/msaa/CAccessibleComponent.cpp => accessible/src/msaa/ia2AccessibleComponent.cpp
rename : accessible/src/msaa/CAccessibleComponent.h => accessible/src/msaa/ia2AccessibleComponent.h

accessible/src/msaa/Makefile.in

@@ -64,8 +64,8 @@ CPPSRCS = \
   nsApplicationAccessibleWrap.cpp \
   nsWinUtils.cpp \
   ia2AccessibleAction.cpp \
+  ia2AccessibleComponent.cpp \
   CAccessibleImage.cpp \
-  CAccessibleComponent.cpp \
   CAccessibleText.cpp \
   CAccessibleEditableText.cpp \
   CAccessibleHyperlink.cpp \
@@ -93,8 +93,8 @@ EXPORTS = \
   nsHTMLTableAccessibleWrap.h \
   nsApplicationAccessibleWrap.h \
   ia2AccessibleAction.h \
+  ia2AccessibleComponent.h \
   CAccessibleImage.h \
-  CAccessibleComponent.h \
   CAccessibleText.h \
   CAccessibleEditableText.h \
   CAccessibleHyperlink.h \

accessible/src/msaa/ia2AccessibleComponent.cpp

@@ -38,26 +38,21 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "CAccessibleComponent.h"
+#include "ia2AccessibleComponent.h"
 
 #include "AccessibleComponent_i.c"
 
-#include "nsAccessible.h"
-#include "nsCoreUtils.h"
-#include "nsWinUtils.h"
+#include "nsAccessibleWrap.h"
 #include "States.h"
 
-#include "nsString.h"
-
-#include "nsIDOMCSSPrimitiveValue.h"
-#include "nsIDOMNSRGBAColor.h"
+#include "nsIFrame.h"
 
 using namespace mozilla::a11y;
 
 // IUnknown
 
 STDMETHODIMP
-CAccessibleComponent::QueryInterface(REFIID iid, void** ppv)
+ia2AccessibleComponent::QueryInterface(REFIID iid, void** ppv)
 {
   *ppv = NULL;
 
@@ -73,13 +68,13 @@ CAccessibleComponent::QueryInterface(REFIID iid, void** ppv)
 // IAccessibleComponent
 
 STDMETHODIMP
-CAccessibleComponent::get_locationInParent(long *aX, long *aY)
+ia2AccessibleComponent::get_locationInParent(long* aX, long* aY)
 {
 __try {
   *aX = 0;
   *aY = 0;
 
-  nsRefPtr<nsAccessible> acc(do_QueryObject(this));
+  nsAccessibleWrap* acc = static_cast<nsAccessibleWrap*>(this);
   if (acc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -93,10 +88,7 @@ __try {
   if (NS_FAILED(rv))
     return GetHRESULT(rv);
 
-  nsCOMPtr<nsIAccessible> parentAcc;
-  rv = acc->GetParent(getter_AddRefs(parentAcc));
-  if (NS_FAILED(rv))
-    return GetHRESULT(rv);
+  nsAccessible* parentAcc = acc->Parent();
 
   // The coordinates of the returned position are relative to this object's
   // parent or relative to the screen on which this object is rendered if it
@@ -123,10 +115,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleComponent::get_foreground(IA2Color* aForeground)
+ia2AccessibleComponent::get_foreground(IA2Color* aForeground)
 {
 __try {
-  nsRefPtr<nsAccessible> acc(do_QueryObject(this));
+  nsAccessibleWrap* acc = static_cast<nsAccessibleWrap*>(this);
   if (acc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -142,10 +134,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleComponent::get_background(IA2Color* aBackground)
+ia2AccessibleComponent::get_background(IA2Color* aBackground)
 {
 __try {
-  nsRefPtr<nsAccessible> acc(do_QueryObject(this));
+  nsAccessibleWrap* acc = static_cast<nsAccessibleWrap*>(this);
   if (acc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 

accessible/src/msaa/ia2AccessibleComponent.h

@@ -38,14 +38,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _ACCESSIBLE_COMPONENt_H
-#define _ACCESSIBLE_COMPONENT_H
-
-#include "nsISupports.h"
+#ifndef IA2_ACCESSIBLE_COMPONENT_H_
+#define IA2_ACCESSIBLE_COMPONENT_H_
 
 #include "AccessibleComponent.h"
 
-class CAccessibleComponent: public IAccessibleComponent
+class ia2AccessibleComponent : public IAccessibleComponent
 {
 public:
 
@@ -62,9 +60,6 @@ public:
 
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_background(
       /* [retval][out] */ IA2Color *background);
-
-  // nsISupports
-  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
 };
 
 #endif

accessible/src/msaa/nsAccessibleWrap.cpp

@@ -133,7 +133,7 @@ __try {
     *ppv = static_cast<IAccessible2*>(this);
 
   if (NULL == *ppv) {
-    HRESULT hr = CAccessibleComponent::QueryInterface(iid, ppv);
+    HRESULT hr = ia2AccessibleComponent::QueryInterface(iid, ppv);
     if (SUCCEEDED(hr))
       return hr;
   }

accessible/src/msaa/nsAccessibleWrap.h

@@ -46,7 +46,7 @@
 #include "nsCOMPtr.h"
 #include "nsAccessible.h"
 #include "Accessible2.h"
-#include "CAccessibleComponent.h"
+#include "ia2AccessibleComponent.h"
 #include "CAccessibleHyperlink.h"
 #include "CAccessibleValue.h"
 
@@ -97,7 +97,7 @@ Class::QueryInterface(REFIID iid, void** ppv)                                 \
 
 
 class nsAccessibleWrap : public nsAccessible,
-                         public CAccessibleComponent,
+                         public ia2AccessibleComponent,
                          public CAccessibleHyperlink,
                          public CAccessibleValue,
                          public IAccessible2,