798205 - move ia2 files under ia2 directory

Status: RESOLVED FIXED

(Core :: Disability Access APIs, defect)

Description

[alexander :surkov (:asurkov)]

Attachment: patch

Comment 1

[Trevor Saunders (:tbsaunde)]

Comment on attachment 668314 [details] [diff] [review]
patch

>+SHARED_LIBRARY_LIBS += ../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX)
> SHARED_LIBRARY_LIBS += ../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX)

I thought you needed to end the first line with a \ ?

>+MODULE = accessibility
>+LIBRARY_NAME = accessibility_toolkit_ia2_s
>+EXPORT_LIBRARY = ..
>+LIBXUL_LIBRARY = 1

nit, =1

>+ia2AccessibleValue::QueryInterface(REFIID iid, void** ppv)
> {
>   *ppv = NULL;
> 
>   if (IID_IAccessibleValue == iid) {
>-    nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
>-    if (!valueAcc)
>-      return E_NOINTERFACE;
>+    AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
>+    if (valueAcc->HasNumericValue()) {
>+      *ppv = static_cast<IAccessibleValue*>(this);
>+      (reinterpret_cast<IUnknown*>(*ppv))->AddRef();

why not just AddRef() ?

>rename from accessible/src/msaa/CAccessibleValue.h
>rename to accessible/src/windows/ia2/ia2AccessibleValue.h
>--- a/accessible/src/msaa/CAccessibleValue.h
>+++ b/accessible/src/windows/ia2/ia2AccessibleValue.h
>@@ -7,17 +7,17 @@
> 
> #ifndef _ACCESSIBLE_VALUE_H
> #define _ACCESSIBLE_VALUE_H
> 
> #include "nsISupports.h"

why?

if you like you could convert some of the --try goo to the A11Y_ macros or you could file a gfb to do it

Comment 2

[alexander :surkov (:asurkov)]

(In reply to Trevor Saunders (:tbsaunde) from comment #1)
> Comment on attachment 668314 [details] [diff] [review]
> patch
> 
> >+SHARED_LIBRARY_LIBS += ../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX)
> > SHARED_LIBRARY_LIBS += ../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX)
> 
> I thought you needed to end the first line with a \ ?

ok

> >+MODULE = accessibility
> >+LIBRARY_NAME = accessibility_toolkit_ia2_s
> >+EXPORT_LIBRARY = ..
> >+LIBXUL_LIBRARY = 1
> 
> nit, =1

no spaces? why? it was copy/paste I think.

> 
> >+ia2AccessibleValue::QueryInterface(REFIID iid, void** ppv)
> > {
> >   *ppv = NULL;
> > 
> >   if (IID_IAccessibleValue == iid) {
> >-    nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
> >-    if (!valueAcc)
> >-      return E_NOINTERFACE;
> >+    AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
> >+    if (valueAcc->HasNumericValue()) {
> >+      *ppv = static_cast<IAccessibleValue*>(this);
> >+      (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
> 
> why not just AddRef() ?

ok

> 
> >rename from accessible/src/msaa/CAccessibleValue.h
> >rename to accessible/src/windows/ia2/ia2AccessibleValue.h
> >--- a/accessible/src/msaa/CAccessibleValue.h
> >+++ b/accessible/src/windows/ia2/ia2AccessibleValue.h
> >@@ -7,17 +7,17 @@
> > 
> > #ifndef _ACCESSIBLE_VALUE_H
> > #define _ACCESSIBLE_VALUE_H
> > 
> > #include "nsISupports.h"
> 
> why?

artifact

> if you like you could convert some of the --try goo to the A11Y_ macros or
> you could file a gfb to do it

gfb should be good

Comment 3

[Trevor Saunders (:tbsaunde)]

> > >+LIBRARY_NAME = accessibility_toolkit_ia2_s
> > >+EXPORT_LIBRARY = ..
> > >+LIBXUL_LIBRARY = 1
> > 
> > nit, =1
> 
> no spaces? why? it was copy/paste I think.

I just meant 1 instead of ..

Comment 4

[alexander :surkov (:asurkov)]

ok, I thought it's a path

Comment 5

[alexander :surkov (:asurkov)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/e8f535c751d1

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/e8f535c751d1