diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp --- a/accessible/src/atk/nsAccessibleWrap.cpp +++ b/accessible/src/atk/nsAccessibleWrap.cpp @@ -428,74 +428,74 @@ nsAccessibleWrap::CreateMaiInterfaces(vo } //nsIAccessibleText - nsCOMPtr accessInterfaceText; + nsIAccessibleText* accessInterfaceText; QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accessInterfaceText)); + (void**)&accessInterfaceText); if (accessInterfaceText) { interfacesBits |= 1 << MAI_INTERFACE_TEXT; } //nsIAccessibleEditableText - nsCOMPtr accessInterfaceEditableText; + nsIAccessibleEditableText* accessInterfaceEditableText; QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accessInterfaceEditableText)); + (void**)&accessInterfaceEditableText); if (accessInterfaceEditableText) { interfacesBits |= 1 << MAI_INTERFACE_EDITABLE_TEXT; } //nsIAccessibleValue - nsCOMPtr accessInterfaceValue; + nsIAccessibleValue* accessInterfaceValue; QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accessInterfaceValue)); + (void**)&accessInterfaceValue); if (accessInterfaceValue) { interfacesBits |= 1 << MAI_INTERFACE_VALUE; } //nsIAccessibleDocument - nsCOMPtr accessInterfaceDocument; + nsIAccessibleDocument* accessInterfaceDocument; QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(accessInterfaceDocument)); + (void**)&accessInterfaceDocument); if (accessInterfaceDocument) { interfacesBits |= 1 << MAI_INTERFACE_DOCUMENT; } //nsIAccessibleImage - nsCOMPtr accessInterfaceImage; + nsIAccessibleImage* accessInterfaceImage; QueryInterface(NS_GET_IID(nsIAccessibleImage), - getter_AddRefs(accessInterfaceImage)); + (void**)&accessInterfaceImage); if (accessInterfaceImage) { interfacesBits |= 1 << MAI_INTERFACE_IMAGE; } //nsIAccessibleHyperLink - nsCOMPtr accessInterfaceHyperlink; + nsIAccessibleHyperLink* accessInterfaceHyperlink; QueryInterface(NS_GET_IID(nsIAccessibleHyperLink), - getter_AddRefs(accessInterfaceHyperlink)); + (void**)&accessInterfaceHyperlink); if (accessInterfaceHyperlink) { interfacesBits |= 1 << MAI_INTERFACE_HYPERLINK_IMPL; } if (!MustPrune(this)) { // These interfaces require children //nsIAccessibleHypertext - nsCOMPtr accessInterfaceHypertext; + nsIAccessibleHyperText* accessInterfaceHypertext; QueryInterface(NS_GET_IID(nsIAccessibleHyperText), - getter_AddRefs(accessInterfaceHypertext)); + (void**)&accessInterfaceHypertext); if (accessInterfaceHypertext) { interfacesBits |= 1 << MAI_INTERFACE_HYPERTEXT; } //nsIAccessibleTable - nsCOMPtr accessInterfaceTable; + nsIAccessibleTable* accessInterfaceTable; QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accessInterfaceTable)); + (void**)&accessInterfaceTable); if (accessInterfaceTable) { interfacesBits |= 1 << MAI_INTERFACE_TABLE; } //nsIAccessibleSelection - nsCOMPtr accessInterfaceSelection; + nsIAccessibleSelectable* accessInterfaceSelection; QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accessInterfaceSelection)); + (void**)&accessInterfaceSelection); if (accessInterfaceSelection) { interfacesBits |= 1 << MAI_INTERFACE_SELECTION; } @@ -788,8 +788,8 @@ GetAttributeSet(nsIAccessible* aAccessib GetAttributeSet(nsIAccessible* aAccessible) { AtkAttributeSet *objAttributeSet = nsnull; - nsCOMPtr attributes; - aAccessible->GetAttributes(getter_AddRefs(attributes)); + nsIPersistentProperties* attributes; + aAccessible->GetAttributes(&attributes); if (attributes) { // Deal with attributes that we only need to expose in ATK @@ -808,15 +808,15 @@ GetAttributeSet(nsIAccessible* aAccessib oldValueUnused); } - nsCOMPtr propEnum; - nsresult rv = attributes->Enumerate(getter_AddRefs(propEnum)); + nsISimpleEnumerator* propEnum; + nsresult rv = attributes->Enumerate(&propEnum); NS_ENSURE_SUCCESS(rv, nsnull); PRBool hasMore; while (NS_SUCCEEDED(propEnum->HasMoreElements(&hasMore)) && hasMore) { - nsCOMPtr sup; - rv = propEnum->GetNext(getter_AddRefs(sup)); - nsCOMPtr propElem(do_QueryInterface(sup)); + nsISupports* sup; + rv = propEnum->GetNext(&sup); + nsIPropertyElement* propElem(do_QueryInterface(sup)); NS_ENSURE_TRUE(propElem, nsnull); nsCAutoString name; @@ -854,8 +854,8 @@ getParentCB(AtkObject *aAtkObj) return nsnull; } - nsCOMPtr accParent; - nsresult rv = accWrap->GetParent(getter_AddRefs(accParent)); + nsIAccessible* accParent; + nsresult rv = accWrap->GetParent(&accParent); if (NS_FAILED(rv) || !accParent) return nsnull; @@ -874,15 +874,15 @@ getChildCountCB(AtkObject *aAtkObj) } PRInt32 count = 0; - nsCOMPtr hyperText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), getter_AddRefs(hyperText)); + nsIAccessibleHyperText* hyperText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), (void**)&hyperText); if (hyperText) { // If HyperText, then number of links matches number of children hyperText->GetLinks(&count); } else { - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), (void**)&accText); if (!accText) { // Accessible text that is not a HyperText has no children accWrap->GetChildCount(&count); } @@ -907,20 +907,20 @@ refChildCB(AtkObject *aAtkObj, gint aChi return nsnull; } - nsCOMPtr accChild; - nsCOMPtr hyperText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), getter_AddRefs(hyperText)); + nsIAccessible* accChild; + nsIAccessibleHyperText* hyperText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), (void**)&hyperText); if (hyperText) { // If HyperText, then number of links matches number of children - nsCOMPtr hyperLink; - hyperText->GetLink(aChildIndex, getter_AddRefs(hyperLink)); + nsIAccessibleHyperLink* hyperLink; + hyperText->GetLink(aChildIndex, &hyperLink); accChild = do_QueryInterface(hyperLink); } else { - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), (void**)&accText); if (!accText) { // Accessible Text that is not HyperText has no children - accWrap->GetChildAt(aChildIndex, getter_AddRefs(accChild)); + accWrap->GetChildAt(aChildIndex, &accChild); } } @@ -949,14 +949,14 @@ getIndexInParentCB(AtkObject *aAtkObj) return -1; } - nsCOMPtr parent; - accWrap->GetParent(getter_AddRefs(parent)); + nsIAccessible* parent; + accWrap->GetParent(&parent); if (!parent) { return -1; // No parent } - nsCOMPtr sibling; - parent->GetFirstChild(getter_AddRefs(sibling)); + nsIAccessible* sibling; + parent->GetFirstChild(&sibling); if (!sibling) { return -1; // Error, parent has no children } @@ -973,9 +973,9 @@ getIndexInParentCB(AtkObject *aAtkObj) ++ currentIndex; } - nsCOMPtr tempAccessible; - sibling->GetNextSibling(getter_AddRefs(tempAccessible)); - sibling.swap(tempAccessible); + nsIAccessible* tempAccessible; + sibling->GetNextSibling(&tempAccessible); + swap(sibling, tempAccessible); } return currentIndex; @@ -1089,10 +1089,10 @@ nsAccessibleWrap *GetAccessibleWrap(AtkO NS_ENSURE_TRUE(tmpAccWrap->GetAtkObject() == aAtkObj, nsnull); - nsRefPtr appAccWrap = + nsApplicationAccessibleWrap* appAccWrap = nsAccessNode::GetApplicationAccessible(); nsAccessibleWrap* tmpAppAccWrap = - static_cast(appAccWrap.get()); + static_cast(appAccWrap); if (tmpAppAccWrap != tmpAccWrap && !tmpAccWrap->IsValidObject()) return nsnull; @@ -1106,8 +1106,8 @@ nsAccessibleWrap::FireAccessibleEvent(ns nsresult rv = nsAccessible::FireAccessibleEvent(aEvent); NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr accessible; - aEvent->GetAccessible(getter_AddRefs(accessible)); + nsIAccessible* accessible; + aEvent->GetAccessible(&accessible); NS_ENSURE_TRUE(accessible, NS_ERROR_FAILURE); PRUint32 type = 0; @@ -1151,11 +1151,11 @@ nsAccessibleWrap::FireAccessibleEvent(ns case nsIAccessibleEvent::EVENT_FOCUS: { MAI_LOG_DEBUG(("\n\nReceived: EVENT_FOCUS\n")); - nsRefPtr rootAccWrap = accWrap->GetRootAccessible(); + nsRootAccessible* rootAccWrap = accWrap->GetRootAccessible(); if (rootAccWrap && rootAccWrap->mActivated) { atk_focus_tracker_notify(atkObj); // Fire state change event for focus - nsCOMPtr stateChangeEvent = + nsIAccessibleStateChangeEvent* stateChangeEvent = new nsAccStateChangeEvent(accessible, nsIAccessibleStates::STATE_FOCUSED, PR_FALSE, PR_TRUE); @@ -1166,7 +1166,7 @@ nsAccessibleWrap::FireAccessibleEvent(ns case nsIAccessibleEvent::EVENT_VALUE_CHANGE: { MAI_LOG_DEBUG(("\n\nReceived: EVENT_VALUE_CHANGE\n")); - nsCOMPtr value(do_QueryInterface(accessible)); + nsIAccessibleValue* value(do_QueryInterface(accessible)); if (value) { // Make sure this is a numeric value // Don't fire for MSAA string value changes (e.g. text editing) // ATK values are always numeric @@ -1188,7 +1188,7 @@ nsAccessibleWrap::FireAccessibleEvent(ns { MAI_LOG_DEBUG(("\n\nReceived: EVENT_TEXT_CARET_MOVED\n")); - nsCOMPtr caretMoveEvent(do_QueryInterface(aEvent)); + nsIAccessibleCaretMoveEvent* caretMoveEvent(do_QueryInterface(aEvent)); NS_ASSERTION(caretMoveEvent, "Event needs event data"); if (!caretMoveEvent) break; @@ -1313,7 +1313,7 @@ nsAccessibleWrap::FireAccessibleEvent(ns { MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_ACTIVATED\n")); nsDocAccessibleWrap *accDocWrap = - static_cast(accessible.get()); + static_cast(accessible); accDocWrap->mActivated = PR_TRUE; guint id = g_signal_lookup ("activate", MAI_TYPE_ATK_OBJECT); g_signal_emit(atkObj, id, 0); @@ -1323,7 +1323,7 @@ nsAccessibleWrap::FireAccessibleEvent(ns { MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_DEACTIVATED\n")); nsDocAccessibleWrap *accDocWrap = - static_cast(accessible.get()); + static_cast(accessible); accDocWrap->mActivated = PR_FALSE; guint id = g_signal_lookup ("deactivate", MAI_TYPE_ATK_OBJECT); g_signal_emit(atkObj, id, 0); @@ -1370,7 +1370,7 @@ nsAccessibleWrap::FireAtkStateChangeEven { MAI_LOG_DEBUG(("\n\nReceived: EVENT_STATE_CHANGE\n")); - nsCOMPtr event = + nsIAccessibleStateChangeEvent* event = do_QueryInterface(aEvent); NS_ENSURE_TRUE(event, NS_ERROR_FAILURE); @@ -1412,7 +1412,7 @@ nsAccessibleWrap::FireAtkTextChangedEven { MAI_LOG_DEBUG(("\n\nReceived: EVENT_TEXT_REMOVED/INSERTED\n")); - nsCOMPtr event = + nsIAccessibleTextChangeEvent* event = do_QueryInterface(aEvent); NS_ENSURE_TRUE(event, NS_ERROR_FAILURE); @@ -1515,12 +1515,12 @@ nsAccessibleWrap::FireAtkShowHideEvent(n else MAI_LOG_DEBUG(("\n\nReceived: Hide event\n")); - nsCOMPtr accessible; - aEvent->GetAccessible(getter_AddRefs(accessible)); + nsIAccessible* accessible; + aEvent->GetAccessible(&accessible); NS_ENSURE_STATE(accessible); - nsCOMPtr parentAccessible; - accessible->GetParent(getter_AddRefs(parentAccessible)); + nsIAccessible* parentAccessible; + accessible->GetParent(&parentAccessible); NS_ENSURE_STATE(parentAccessible); PRInt32 indexInParent = -1; diff --git a/accessible/src/atk/nsAppRootAccessible.cpp b/accessible/src/atk/nsAppRootAccessible.cpp --- a/accessible/src/atk/nsAppRootAccessible.cpp +++ b/accessible/src/atk/nsAppRootAccessible.cpp @@ -435,7 +435,7 @@ AtkObject * AtkObject * mai_util_get_root(void) { - nsRefPtr root = + nsApplicationAccessibleWrap* root = nsAccessNode::GetApplicationAccessible(); if (root) @@ -541,7 +541,7 @@ nsApplicationAccessibleWrap::Init() } else { //check gconf-2 setting nsresult rv; - nsCOMPtr sysPrefService = + nsIPrefBranch* sysPrefService = do_GetService(sSysPrefService, &rv); if (NS_SUCCEEDED(rv) && sysPrefService) { sysPrefService->GetBoolPref(sAccessibilityKey, &isGnomeATEnabled); @@ -665,7 +665,7 @@ nsApplicationAccessibleWrap::RemoveRootA nsresult rv = NS_ERROR_FAILURE; // we must use weak ref to get the index - nsCOMPtr weakPtr = do_GetWeakReference(aRootAccWrap); + nsIWeakReference* weakPtr = do_GetWeakReference(aRootAccWrap); rv = mChildren->IndexOf(0, weakPtr, &index); AtkObject *atkAccessible = nsAccessibleWrap::GetAtkObject(aRootAccWrap); diff --git a/accessible/src/atk/nsMaiHyperlink.cpp b/accessible/src/atk/nsMaiHyperlink.cpp --- a/accessible/src/atk/nsMaiHyperlink.cpp +++ b/accessible/src/atk/nsMaiHyperlink.cpp @@ -145,7 +145,7 @@ MaiHyperlink::GetAtkHyperlink(void) if (mMaiAtkHyperlink) return mMaiAtkHyperlink; - nsCOMPtr accessIf(do_QueryInterface(mHyperlink)); + nsIAccessibleHyperLink* accessIf(do_QueryInterface(mHyperlink)); if (!accessIf) return nsnull; @@ -225,8 +225,8 @@ getUriCB(AtkHyperlink *aLink, gint aLink if (maiAtkHyperlink->uri) return g_strdup(maiAtkHyperlink->uri); - nsCOMPtr uri; - nsresult rv = accHyperlink->GetURI(aLinkIndex,getter_AddRefs(uri)); + nsIURI* uri; + nsresult rv = accHyperlink->GetURI(aLinkIndex,&uri); if (NS_FAILED(rv) || !uri) return nsnull; nsCAutoString cautoStr; @@ -242,8 +242,8 @@ getObjectCB(AtkHyperlink *aLink, gint aL nsIAccessibleHyperLink *accHyperlink = get_accessible_hyperlink(aLink); NS_ENSURE_TRUE(accHyperlink, nsnull); - nsCOMPtr accObj; - accHyperlink->GetObject(aLinkIndex, getter_AddRefs(accObj)); + nsIAccessible* accObj; + accHyperlink->GetObject(aLinkIndex, &accObj); NS_ENSURE_TRUE(accObj, nsnull); AtkObject *atkObj = nsAccessibleWrap::GetAtkObject(accObj); diff --git a/accessible/src/atk/nsMaiInterfaceAction.cpp b/accessible/src/atk/nsMaiInterfaceAction.cpp --- a/accessible/src/atk/nsMaiInterfaceAction.cpp +++ b/accessible/src/atk/nsMaiInterfaceAction.cpp @@ -119,8 +119,8 @@ getKeyBindingCB(AtkAction *aAction, gint nsresult rv = accWrap->GetKeyboardShortcut(accessKey); if (NS_SUCCEEDED(rv) && !accessKey.IsEmpty()) { - nsCOMPtr parentAccessible; - accWrap->GetParent(getter_AddRefs(parentAccessible)); + nsIAccessible* parentAccessible; + accWrap->GetParent(&parentAccessible); if (parentAccessible) { PRUint32 role; parentAccessible->GetRole(&role); @@ -135,7 +135,7 @@ getKeyBindingCB(AtkAction *aAction, gint else if ((role == ATK_ROLE_MENU) || (role == ATK_ROLE_MENU_ITEM)) { //it is submenu, change from "s" to "s;f:s" nsAutoString allKey = accessKey; - nsCOMPtr grandParentAcc = parentAccessible; + nsIAccessible* grandParentAcc = parentAccessible; while ((grandParentAcc) && (role != ATK_ROLE_MENU_BAR)) { nsAutoString grandParentKey; @@ -147,8 +147,8 @@ getKeyBindingCB(AtkAction *aAction, gint allKey = rightChar + NS_LITERAL_STRING(":") + allKey; } - nsCOMPtr tempAcc = grandParentAcc; - tempAcc->GetParent(getter_AddRefs(grandParentAcc)); + nsIAccessible* tempAcc = grandParentAcc; + tempAcc->GetParent(&grandParentAcc); if (grandParentAcc) grandParentAcc->GetRole(&role); } @@ -168,8 +168,8 @@ getKeyBindingCB(AtkAction *aAction, gint //get shortcut nsAutoString subShortcut; - nsCOMPtr keyBindings; - rv = accWrap->GetKeyBindings(aActionIndex, getter_AddRefs(keyBindings)); + nsIDOMDOMStringList* keyBindings; + rv = accWrap->GetKeyBindings(aActionIndex, &keyBindings); if (NS_SUCCEEDED(rv) && keyBindings) { PRUint32 length = 0; diff --git a/accessible/src/atk/nsMaiInterfaceComponent.cpp b/accessible/src/atk/nsMaiInterfaceComponent.cpp --- a/accessible/src/atk/nsMaiInterfaceComponent.cpp +++ b/accessible/src/atk/nsMaiInterfaceComponent.cpp @@ -74,15 +74,15 @@ refAccessibleAtPointCB(AtkComponent *aCo // nsIAccessible getChildAtPoint (x,y) is in screen pixels. if (aCoordType == ATK_XY_WINDOW) { - nsCOMPtr domNode; - accWrap->GetDOMNode(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + accWrap->GetDOMNode(&domNode); nsIntPoint winCoords = nsAccUtils::GetScreenCoordsForWindow(domNode); aAccX += winCoords.x; aAccY += winCoords.y; } - nsCOMPtr pointAcc; - accWrap->GetChildAtPoint(aAccX, aAccY, getter_AddRefs(pointAcc)); + nsIAccessible* pointAcc; + accWrap->GetChildAtPoint(aAccX, aAccY, &pointAcc); if (!pointAcc) { return nsnull; } @@ -115,8 +115,8 @@ getExtentsCB(AtkComponent *aComponent, if (NS_FAILED(rv)) return; if (aCoordType == ATK_XY_WINDOW) { - nsCOMPtr domNode; - accWrap->GetDOMNode(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + accWrap->GetDOMNode(&domNode); nsIntPoint winCoords = nsAccUtils::GetScreenCoordsForWindow(domNode); nsAccX -= winCoords.x; nsAccY -= winCoords.y; diff --git a/accessible/src/atk/nsMaiInterfaceDocument.cpp b/accessible/src/atk/nsMaiInterfaceDocument.cpp --- a/accessible/src/atk/nsMaiInterfaceDocument.cpp +++ b/accessible/src/atk/nsMaiInterfaceDocument.cpp @@ -70,9 +70,9 @@ getDocumentLocaleCB(AtkDocument *aDocume if (!accWrap) return nsnull; - nsCOMPtr docAccessNode; + nsIAccessNode* docAccessNode; accWrap->QueryInterface(NS_GET_IID(nsIAccessNode), - getter_AddRefs(docAccessNode)); + (void**)&docAccessNode); NS_ENSURE_TRUE(docAccessNode, nsnull); nsAutoString locale; @@ -90,9 +90,9 @@ getDocumentTypeCB(AtkDocument *aDocument if (!accWrap) return nsnull; - nsCOMPtr accDocument; + nsIAccessibleDocument* accDocument; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(accDocument)); + (void**)&accDocument); NS_ENSURE_TRUE(accDocument, nsnull); nsAutoString mimeType; @@ -118,9 +118,9 @@ getDocumentAttributesCB(AtkDocument *aDo if (!accWrap) return nsnull; - nsCOMPtr accDocument; + nsIAccessibleDocument* accDocument; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(accDocument)); + (void**)&accDocument); NS_ENSURE_TRUE(accDocument, nsnull); // according to atkobject.h, AtkAttributeSet is a GSList @@ -153,9 +153,9 @@ getDocumentAttributeValueCB(AtkDocument if (!accWrap) return nsnull; - nsCOMPtr accDocument; + nsIAccessibleDocument* accDocument; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(accDocument)); + (void**)&accDocument); NS_ENSURE_TRUE(accDocument, nsnull); nsresult rv; diff --git a/accessible/src/atk/nsMaiInterfaceEditableText.cpp b/accessible/src/atk/nsMaiInterfaceEditableText.cpp --- a/accessible/src/atk/nsMaiInterfaceEditableText.cpp +++ b/accessible/src/atk/nsMaiInterfaceEditableText.cpp @@ -68,12 +68,12 @@ setRunAttributesCB(AtkEditableText *aTex if (!accWrap) return FALSE; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); NS_ENSURE_TRUE(accText, FALSE); - nsCOMPtr attrSet; + nsISupports* attrSet; /* how to insert attributes into nsISupports ??? */ nsresult rv = accText->SetAttributes(aStartOffset, aEndOffset, @@ -88,9 +88,9 @@ setTextContentsCB(AtkEditableText *aText if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; @@ -108,9 +108,9 @@ insertTextCB(AtkEditableText *aText, if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; @@ -135,9 +135,9 @@ copyTextCB(AtkEditableText *aText, gint if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; @@ -153,9 +153,9 @@ cutTextCB(AtkEditableText *aText, gint a if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; MAI_LOG_DEBUG(("EditableText: cutTextCB, aStartPos=%d, aEndPos=%d", @@ -170,9 +170,9 @@ deleteTextCB(AtkEditableText *aText, gin if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; @@ -188,9 +188,9 @@ pasteTextCB(AtkEditableText *aText, gint if (!accWrap) return; - nsCOMPtr accText; + nsIAccessibleEditableText* accText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleEditableText), - getter_AddRefs(accText)); + (void**)&accText); if (!accText) return; diff --git a/accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp b/accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp --- a/accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp +++ b/accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp @@ -56,9 +56,9 @@ getHyperlinkCB(AtkHyperlinkImpl *aImpl) if (!accWrap) return nsnull; - nsCOMPtr accHyperlink; + nsIAccessibleHyperLink* accHyperlink; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperLink), - getter_AddRefs(accHyperlink)); + (void**)&accHyperlink); NS_ENSURE_TRUE(accHyperlink, nsnull); MaiHyperlink *maiHyperlink = accWrap->GetMaiHyperlink(); diff --git a/accessible/src/atk/nsMaiInterfaceHypertext.cpp b/accessible/src/atk/nsMaiInterfaceHypertext.cpp --- a/accessible/src/atk/nsMaiInterfaceHypertext.cpp +++ b/accessible/src/atk/nsMaiInterfaceHypertext.cpp @@ -59,17 +59,17 @@ getLinkCB(AtkHypertext *aText, gint aLin if (!accWrap) return nsnull; - nsCOMPtr hyperText; + nsIAccessibleHyperText* hyperText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), - getter_AddRefs(hyperText)); + (void**)&hyperText); NS_ENSURE_TRUE(hyperText, nsnull); - nsCOMPtr hyperLink; - nsresult rv = hyperText->GetLink(aLinkIndex, getter_AddRefs(hyperLink)); + nsIAccessibleHyperLink* hyperLink; + nsresult rv = hyperText->GetLink(aLinkIndex, &hyperLink); if (NS_FAILED(rv) || !hyperLink) return nsnull; - nsCOMPtr hyperLinkAcc(do_QueryInterface(hyperLink)); + nsIAccessible* hyperLinkAcc(do_QueryInterface(hyperLink)); AtkObject *hyperLinkAtkObj = nsAccessibleWrap::GetAtkObject(hyperLinkAcc); nsAccessibleWrap *accChild = GetAccessibleWrap(hyperLinkAtkObj); NS_ENSURE_TRUE(accChild, nsnull); @@ -86,9 +86,9 @@ getLinkCountCB(AtkHypertext *aText) if (!accWrap) return -1; - nsCOMPtr hyperText; + nsIAccessibleHyperText* hyperText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), - getter_AddRefs(hyperText)); + (void**)&hyperText); NS_ENSURE_TRUE(hyperText, -1); PRInt32 count = -1; @@ -105,9 +105,9 @@ getLinkIndexCB(AtkHypertext *aText, gint if (!accWrap) return -1; - nsCOMPtr hyperText; + nsIAccessibleHyperText* hyperText; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), - getter_AddRefs(hyperText)); + (void**)&hyperText); NS_ENSURE_TRUE(hyperText, -1); PRInt32 index = -1; diff --git a/accessible/src/atk/nsMaiInterfaceImage.cpp b/accessible/src/atk/nsMaiInterfaceImage.cpp --- a/accessible/src/atk/nsMaiInterfaceImage.cpp +++ b/accessible/src/atk/nsMaiInterfaceImage.cpp @@ -62,9 +62,9 @@ getImagePositionCB(AtkImage *aImage, gin if (!accWrap) return; - nsCOMPtr image; + nsIAccessibleImage* image; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleImage), - getter_AddRefs(image)); + (void**)&image); if (!image) return; @@ -75,8 +75,8 @@ getImagePositionCB(AtkImage *aImage, gin return; if (aCoordType == ATK_XY_WINDOW) { - nsCOMPtr domNode; - accWrap->GetDOMNode(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + accWrap->GetDOMNode(&domNode); nsIntPoint winCoords = nsAccUtils::GetScreenCoordsForWindow(domNode); *aAccX -= winCoords.x; *aAccY -= winCoords.y; @@ -96,9 +96,9 @@ getImageSizeCB(AtkImage *aImage, gint *a if (!accWrap) return; - nsCOMPtr image; + nsIAccessibleImage* image; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleImage), - getter_AddRefs(image)); + (void**)&image); if (!image) return; diff --git a/accessible/src/atk/nsMaiInterfaceSelection.cpp b/accessible/src/atk/nsMaiInterfaceSelection.cpp --- a/accessible/src/atk/nsMaiInterfaceSelection.cpp +++ b/accessible/src/atk/nsMaiInterfaceSelection.cpp @@ -63,9 +63,9 @@ addSelectionCB(AtkSelection *aSelection, if (!accWrap) return FALSE; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, FALSE); return NS_SUCCEEDED(accSelection->AddChildToSelection(i)); @@ -78,9 +78,9 @@ clearSelectionCB(AtkSelection *aSelectio if (!accWrap) return FALSE; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, FALSE); return NS_SUCCEEDED(accSelection->ClearSelection()); @@ -93,13 +93,13 @@ refSelectionCB(AtkSelection *aSelection, if (!accWrap) return nsnull; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, nsnull); - nsCOMPtr accSelect; - accSelection->RefSelection(i, getter_AddRefs(accSelect)); + nsIAccessible* accSelect; + accSelection->RefSelection(i, &accSelect); if (!accSelect) { return nsnull; } @@ -118,9 +118,9 @@ getSelectionCountCB(AtkSelection *aSelec if (!accWrap) return -1; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, -1); PRInt32 num = 0; @@ -135,9 +135,9 @@ isChildSelectedCB(AtkSelection *aSelecti if (!accWrap) return FALSE; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, FALSE); PRBool result = FALSE; @@ -152,9 +152,9 @@ removeSelectionCB(AtkSelection *aSelecti if (!accWrap) return FALSE; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, FALSE); nsresult rv = accSelection->RemoveChildFromSelection(i); @@ -168,9 +168,9 @@ selectAllSelectionCB(AtkSelection *aSele if (!accWrap) return FALSE; - nsCOMPtr accSelection; + nsIAccessibleSelectable* accSelection; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleSelectable), - getter_AddRefs(accSelection)); + (void**)&accSelection); NS_ENSURE_TRUE(accSelection, FALSE); PRBool result = FALSE; diff --git a/accessible/src/atk/nsMaiInterfaceTable.cpp b/accessible/src/atk/nsMaiInterfaceTable.cpp --- a/accessible/src/atk/nsMaiInterfaceTable.cpp +++ b/accessible/src/atk/nsMaiInterfaceTable.cpp @@ -75,13 +75,13 @@ refAtCB(AtkTable *aTable, gint aRow, gin if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); - NS_ENSURE_TRUE(accTable, nsnull); - - nsCOMPtr cell; - nsresult rv = accTable->CellRefAt(aRow, aColumn,getter_AddRefs(cell)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); + NS_ENSURE_TRUE(accTable, nsnull); + + nsIAccessible* cell; + nsresult rv = accTable->CellRefAt(aRow, aColumn,&cell); if (NS_FAILED(rv) || !cell) return nsnull; @@ -99,9 +99,9 @@ getIndexAtCB(AtkTable *aTable, gint aRow if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 index; @@ -118,9 +118,9 @@ getColumnAtIndexCB(AtkTable *aTable, gin if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 col; @@ -137,9 +137,9 @@ getRowAtIndexCB(AtkTable *aTable, gint a if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 row; @@ -156,9 +156,9 @@ getColumnCountCB(AtkTable *aTable) if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 count; @@ -175,9 +175,9 @@ getRowCountCB(AtkTable *aTable) if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 count; @@ -195,9 +195,9 @@ getColumnExtentAtCB(AtkTable *aTable, if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 extent; @@ -215,9 +215,9 @@ getRowExtentAtCB(AtkTable *aTable, if (!accWrap) return -1; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, -1); PRInt32 extent; @@ -234,13 +234,13 @@ getCaptionCB(AtkTable *aTable) if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); - NS_ENSURE_TRUE(accTable, nsnull); - - nsCOMPtr caption; - nsresult rv = accTable->GetCaption(getter_AddRefs(caption)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); + NS_ENSURE_TRUE(accTable, nsnull); + + nsIAccessible* caption; + nsresult rv = accTable->GetCaption(&caption); if (NS_FAILED(rv) || !caption) return nsnull; @@ -254,9 +254,9 @@ getColumnDescriptionCB(AtkTable *aTable, if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, nsnull); nsAutoString autoStr; @@ -273,13 +273,13 @@ getColumnHeaderCB(AtkTable *aTable, gint if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); - NS_ENSURE_TRUE(accTable, nsnull); - - nsCOMPtr header; - nsresult rv = accTable->GetColumnHeader(getter_AddRefs(header)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); + NS_ENSURE_TRUE(accTable, nsnull); + + nsIAccessibleTable* header; + nsresult rv = accTable->GetColumnHeader(&header); NS_ENSURE_SUCCESS(rv, nsnull); NS_ENSURE_TRUE(header, nsnull); @@ -292,8 +292,8 @@ getColumnHeaderCB(AtkTable *aTable, gint // 2. "GetColumnHeader" defined in nsIAccessibleTable returns // nsXULTreeColumnsAccessibleWrap, which exports nsIAccessibleTable and is // "ROLE_LIST". - nsCOMPtr accHeader; - header->CellRefAt(0, aColumn, getter_AddRefs(accHeader)); + nsIAccessible* accHeader; + header->CellRefAt(0, aColumn, &accHeader); NS_ENSURE_TRUE(accHeader, nsnull); return nsAccessibleWrap::GetAtkObject(accHeader); @@ -306,9 +306,9 @@ getRowDescriptionCB(AtkTable *aTable, gi if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, nsnull); nsAutoString autoStr; @@ -325,16 +325,16 @@ getRowHeaderCB(AtkTable *aTable, gint aR if (!accWrap) return nsnull; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); - NS_ENSURE_TRUE(accTable, nsnull); - - nsCOMPtr header; - nsresult rv = accTable->GetRowHeader(getter_AddRefs(header)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); + NS_ENSURE_TRUE(accTable, nsnull); + + nsIAccessibleTable* header; + nsresult rv = accTable->GetRowHeader(&header); NS_ENSURE_SUCCESS(rv, nsnull); - nsCOMPtr accHeader(do_QueryInterface(header)); + nsIAccessible* accHeader(do_QueryInterface(header)); NS_ENSURE_TRUE(accHeader, nsnull); return nsAccessibleWrap::GetAtkObject(accHeader); @@ -354,9 +354,9 @@ getSelectedColumnsCB(AtkTable *aTable, g if (!accWrap) return 0; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, 0); PRUint32 size = 0; @@ -389,9 +389,9 @@ getSelectedRowsCB(AtkTable *aTable, gint if (!accWrap) return 0; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, 0); PRUint32 size = 0; @@ -424,9 +424,9 @@ isColumnSelectedCB(AtkTable *aTable, gin if (!accWrap) return FALSE; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, FALSE); PRBool outValue; @@ -441,9 +441,9 @@ isRowSelectedCB(AtkTable *aTable, gint a if (!accWrap) return FALSE; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, FALSE); PRBool outValue; @@ -458,9 +458,9 @@ isCellSelectedCB(AtkTable *aTable, gint if (!accWrap) return FALSE; - nsCOMPtr accTable; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), - getter_AddRefs(accTable)); + nsIAccessibleTable* accTable; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleTable), + (void**)&accTable); NS_ENSURE_TRUE(accTable, FALSE); PRBool outValue; diff --git a/accessible/src/atk/nsMaiInterfaceText.cpp b/accessible/src/atk/nsMaiInterfaceText.cpp --- a/accessible/src/atk/nsMaiInterfaceText.cpp +++ b/accessible/src/atk/nsMaiInterfaceText.cpp @@ -92,9 +92,9 @@ getTextCB(AtkText *aText, gint aStartOff if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); nsAutoString autoStr; @@ -117,9 +117,9 @@ getTextAfterOffsetCB(AtkText *aText, gin if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); nsAutoString autoStr; @@ -146,9 +146,9 @@ getTextAtOffsetCB(AtkText *aText, gint a if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); nsAutoString autoStr; @@ -173,9 +173,9 @@ getCharacterAtOffsetCB(AtkText *aText, g if (!accWrap) return 0; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, 0); /* PRUnichar is unsigned short in Mozilla */ @@ -203,9 +203,9 @@ getTextBeforeOffsetCB(AtkText *aText, gi if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); nsAutoString autoStr; @@ -230,9 +230,9 @@ getCaretOffsetCB(AtkText *aText) if (!accWrap) return 0; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, 0); PRInt32 offset; @@ -249,16 +249,16 @@ getRunAttributesCB(AtkText *aText, gint if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); - NS_ENSURE_TRUE(accText, nsnull); - - nsCOMPtr accessibleWithAttrs; + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); + NS_ENSURE_TRUE(accText, nsnull); + + nsIAccessible* accessibleWithAttrs; PRInt32 startOffset = 0, endOffset = 0; nsresult rv = accText->GetAttributeRange(aOffset, &startOffset, &endOffset, - getter_AddRefs(accessibleWithAttrs)); + &accessibleWithAttrs); *aStartOffset = startOffset; *aEndOffset = endOffset; if (NS_FAILED(rv)) @@ -284,9 +284,9 @@ getCharacterExtentsCB(AtkText *aText, gi if(!accWrap || !aX || !aY || !aWidth || !aHeight) return; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); if (!accText) return; @@ -318,9 +318,9 @@ getRangeExtentsCB(AtkText *aText, gint a if(!accWrap || !aRect) return; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); if (!accText) return; @@ -352,9 +352,9 @@ getCharacterCountCB(AtkText *aText) if (!accWrap) return 0; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, 0); PRInt32 count = 0; @@ -371,9 +371,9 @@ getOffsetAtPointCB(AtkText *aText, if (!accWrap) return -1; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, -1); PRInt32 offset = 0; @@ -394,9 +394,9 @@ getTextSelectionCountCB(AtkText *aText) if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); PRInt32 selectionCount; @@ -413,9 +413,9 @@ getTextSelectionCB(AtkText *aText, gint if (!accWrap) return nsnull; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, nsnull); PRInt32 startOffset = 0, endOffset = 0; @@ -440,9 +440,9 @@ addTextSelectionCB(AtkText *aText, if (!accWrap) return FALSE; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, FALSE); nsresult rv = accText->AddSelection(aStartOffset, aEndOffset); @@ -458,9 +458,9 @@ removeTextSelectionCB(AtkText *aText, if (!accWrap) return FALSE; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, FALSE); nsresult rv = accText->RemoveSelection(aSelectionNum); @@ -476,9 +476,9 @@ setTextSelectionCB(AtkText *aText, gint if (!accWrap) return FALSE; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, FALSE); nsresult rv = accText->SetSelectionBounds(aSelectionNum, @@ -493,9 +493,9 @@ setCaretOffsetCB(AtkText *aText, gint aO if (!accWrap) return FALSE; - nsCOMPtr accText; - accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), - getter_AddRefs(accText)); + nsIAccessibleText* accText; + accWrap->QueryInterface(NS_GET_IID(nsIAccessibleText), + (void**)&accText); NS_ENSURE_TRUE(accText, FALSE); nsresult rv = accText->SetCaretOffset(aOffset); diff --git a/accessible/src/atk/nsMaiInterfaceValue.cpp b/accessible/src/atk/nsMaiInterfaceValue.cpp --- a/accessible/src/atk/nsMaiInterfaceValue.cpp +++ b/accessible/src/atk/nsMaiInterfaceValue.cpp @@ -61,9 +61,9 @@ getCurrentValueCB(AtkValue *obj, GValue if (!accWrap) return; - nsCOMPtr accValue; + nsIAccessibleValue* accValue; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accValue)); + (void**)&accValue); if (!accValue) return; @@ -82,9 +82,9 @@ getMaximumValueCB(AtkValue *obj, GValue if (!accWrap) return; - nsCOMPtr accValue; + nsIAccessibleValue* accValue; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accValue)); + (void**)&accValue); if (!accValue) return; @@ -103,9 +103,9 @@ getMinimumValueCB(AtkValue *obj, GValue if (!accWrap) return; - nsCOMPtr accValue; + nsIAccessibleValue* accValue; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accValue)); + (void**)&accValue); if (!accValue) return; @@ -124,9 +124,9 @@ getMinimumIncrementCB(AtkValue *obj, GVa if (!accWrap) return; - nsCOMPtr accValue; + nsIAccessibleValue* accValue; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accValue)); + (void**)&accValue); if (!accValue) return; @@ -145,9 +145,9 @@ setCurrentValueCB(AtkValue *obj, const G if (!accWrap) return FALSE; - nsCOMPtr accValue; + nsIAccessibleValue* accValue; accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue), - getter_AddRefs(accValue)); + (void**)&accValue); NS_ENSURE_TRUE(accValue, FALSE); double accDouble =g_value_get_double (value); diff --git a/accessible/src/atk/nsXULTreeAccessibleWrap.cpp b/accessible/src/atk/nsXULTreeAccessibleWrap.cpp --- a/accessible/src/atk/nsXULTreeAccessibleWrap.cpp +++ b/accessible/src/atk/nsXULTreeAccessibleWrap.cpp @@ -91,21 +91,21 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::G { nsresult rv = NS_OK; - nsCOMPtr acc; - rv = nsAccessible::GetFirstChild(getter_AddRefs(acc)); + nsIAccessible* acc; + rv = nsAccessible::GetFirstChild(&acc); NS_ENSURE_TRUE(acc, NS_ERROR_FAILURE); rv = acc->GetChildCount(aColumns); // The last child could be column picker. In that case, we need to minus the // number of columns by 1 - nsCOMPtr lastChildAccessible; - acc->GetLastChild(getter_AddRefs(lastChildAccessible)); - nsCOMPtr accessNode = do_QueryInterface(lastChildAccessible); + nsIAccessible* lastChildAccessible; + acc->GetLastChild(&lastChildAccessible); + nsIAccessNode* accessNode = do_QueryInterface(lastChildAccessible); NS_ENSURE_TRUE(accessNode, NS_ERROR_FAILURE); - nsCOMPtr domNode; - accessNode->GetDOMNode(getter_AddRefs(domNode)); - nsCOMPtr content = do_QueryInterface(domNode); + nsIDOMNode* domNode; + accessNode->GetDOMNode(&domNode); + nsIContent* content = do_QueryInterface(domNode); NS_ENSURE_TRUE(content, NS_ERROR_FAILURE); // it's menupopup inside column picker if (content->NodeInfo()->Equals(nsAccessibilityAtoms::menupopup, @@ -120,11 +120,11 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::G { nsresult rv = NS_OK; - nsCOMPtr acc; - nsAccessible::GetFirstChild(getter_AddRefs(acc)); + nsIAccessible* acc; + nsAccessible::GetFirstChild(&acc); NS_ENSURE_TRUE(acc, NS_ERROR_FAILURE); - nsCOMPtr accTable(do_QueryInterface(acc, &rv)); + nsIAccessibleTable* accTable(do_QueryInterface(acc, &rv)); NS_ENSURE_SUCCESS(rv, rv); *aColumnHeader = accTable; @@ -223,12 +223,12 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::G PRInt32 *outArray = (PRInt32 *)nsMemory::Alloc((*aNumRows) * sizeof(PRInt32)); NS_ENSURE_TRUE(outArray, NS_ERROR_OUT_OF_MEMORY); - nsCOMPtr view; - rv = mTree->GetView(getter_AddRefs(view)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr selection; - rv = view->GetSelection(getter_AddRefs(selection)); + nsITreeView* view; + rv = mTree->GetView(&view); + NS_ENSURE_SUCCESS(rv, rv); + + nsITreeSelection* selection; + rv = view->GetSelection(&selection); NS_ENSURE_SUCCESS(rv, rv); PRInt32 rowCount; @@ -332,8 +332,8 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::G NS_IMETHODIMP nsXULTreeAccessibleWrap::GetColumnDescription(PRInt32 aColumn, nsAString & _retval) { - nsCOMPtr columnHeader; - nsresult rv = GetColumnHeader(getter_AddRefs(columnHeader)); + nsIAccessibleTable* columnHeader; + nsresult rv = GetColumnHeader(&columnHeader); if (NS_SUCCEEDED(rv) && columnHeader) { return columnHeader->GetColumnDescription(aColumn, _retval); } @@ -372,12 +372,12 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::I nsresult rv = NS_OK; - nsCOMPtr view; - rv = mTree->GetView(getter_AddRefs(view)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr selection; - rv = view->GetSelection(getter_AddRefs(selection)); + nsITreeView* view; + rv = mTree->GetView(&view); + NS_ENSURE_SUCCESS(rv, rv); + + nsITreeSelection* selection; + rv = view->GetSelection(&selection); NS_ENSURE_SUCCESS(rv, rv); return selection->IsSelected(aRow, _retval); @@ -419,8 +419,8 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::C PRInt32 rowIndex; nsresult rv = GetRowAtIndex(aIndex, &rowIndex); - nsCOMPtr selection; - rv = mTreeView->GetSelection(getter_AddRefs(selection)); + nsITreeSelection* selection; + rv = mTreeView->GetSelection(&selection); NS_ASSERTION(selection, "Can't get selection from mTreeView"); if (selection) { @@ -533,12 +533,12 @@ NS_IMETHODIMP nsXULTreeColumnsAccessible NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::CellRefAt(PRInt32 aRow, PRInt32 aColumn, nsIAccessible **_retval) { - nsCOMPtr next, temp; - GetFirstChild(getter_AddRefs(next)); + nsIAccessible* next, *temp; + GetFirstChild(&next); NS_ENSURE_TRUE(next, NS_ERROR_FAILURE); for (PRInt32 col = 0; col < aColumn; col++) { - next->GetNextSibling(getter_AddRefs(temp)); + next->GetNextSibling(&temp); NS_ENSURE_TRUE(temp, NS_ERROR_FAILURE); next = temp; @@ -592,8 +592,8 @@ NS_IMETHODIMP nsXULTreeColumnsAccessible NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetColumnDescription(PRInt32 aColumn, nsAString & _retval) { - nsCOMPtr column; - nsresult rv = CellRefAt(0, aColumn, getter_AddRefs(column)); + nsIAccessible* column; + nsresult rv = CellRefAt(0, aColumn, &column); if (NS_SUCCEEDED(rv) && column) { return column->GetName(_retval); } diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp --- a/accessible/src/base/nsAccessNode.cpp +++ b/accessible/src/base/nsAccessNode.cpp @@ -152,21 +152,21 @@ NS_IMETHODIMP nsAccessNode::Init() #ifdef DEBUG_A11Y NS_ASSERTION(!mIsInitialized, "Initialized twice!"); #endif - nsCOMPtr docAccessible(GetDocAccessible()); + nsIAccessibleDocument* docAccessible(GetDocAccessible()); if (!docAccessible) { // No doc accessible yet for this node's document. // There was probably an accessible event fired before the // current document was ever asked for by the assistive technology. // Create a doc accessible so we can cache this node - nsCOMPtr presShell(do_QueryReferent(mWeakShell)); + nsIPresShell* presShell(do_QueryReferent(mWeakShell)); if (presShell) { - nsCOMPtr docNode(do_QueryInterface(presShell->GetDocument())); + nsIDOMNode* docNode(do_QueryInterface(presShell->GetDocument())); if (docNode) { nsIAccessibilityService *accService = GetAccService(); if (accService) { - nsCOMPtr accessible; + nsIAccessible* accessible; accService->GetAccessibleInShell(docNode, presShell, - getter_AddRefs(accessible)); + &accessible); docAccessible = do_QueryInterface(accessible); } } @@ -178,7 +178,7 @@ NS_IMETHODIMP nsAccessNode::Init() } void* uniqueID; GetUniqueID(&uniqueID); - nsCOMPtr privateDocAccessible = + nsPIAccessibleDocument* privateDocAccessible = do_QueryInterface(docAccessible); NS_ASSERTION(privateDocAccessible, "No private docaccessible for docaccessible"); privateDocAccessible->CacheAccessNode(uniqueID, this); @@ -206,12 +206,12 @@ NS_IMETHODIMP nsAccessNode::GetUniqueID( NS_IMETHODIMP nsAccessNode::GetOwnerWindow(void **aWindow) { - nsCOMPtr docAccessible(GetDocAccessible()); + nsIAccessibleDocument* docAccessible(GetDocAccessible()); NS_ASSERTION(docAccessible, "No root accessible pointer back, Init() not called."); return docAccessible->GetWindowHandle(aWindow); } -already_AddRefed +nsApplicationAccessibleWrap* nsAccessNode::GetApplicationAccessible() { if (!gIsAccessibilityActive) { @@ -246,7 +246,7 @@ void nsAccessNode::InitXPAccessibility() return; } - nsCOMPtr stringBundleService = + nsIStringBundleService* stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); if (stringBundleService) { // Static variables are released in ShutdownAllXPAccessibility(); @@ -260,7 +260,7 @@ void nsAccessNode::InitXPAccessibility() gGlobalDocAccessibleCache.Init(4); - nsCOMPtr prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID)); + nsIPrefBranch* prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID)); if (prefBranch) { prefBranch->GetBoolPref("accessibility.disablecache", &gIsCacheDisabled); prefBranch->GetBoolPref("browser.formfill.enable", &gIsFormFillEnabled); @@ -272,7 +272,7 @@ void nsAccessNode::InitXPAccessibility() void nsAccessNode::NotifyA11yInitOrShutdown() { - nsCOMPtr obsService = + nsIObserverService* obsService = do_GetService("@mozilla.org/observer-service;1"); NS_ASSERTION(obsService, "No observer service to notify of a11y init/shutdown"); if (obsService) { @@ -310,7 +310,7 @@ void nsAccessNode::ShutdownXPAccessibili NotifyA11yInitOrShutdown(); } -already_AddRefed nsAccessNode::GetPresShell() +nsIPresShell* nsAccessNode::GetPresShell() { nsIPresShell *presShell = nsnull; if (mWeakShell) @@ -329,34 +329,34 @@ already_AddRefed nsAccessN nsPresContext* nsAccessNode::GetPresContext() { - nsCOMPtr presShell(GetPresShell()); + nsIPresShell* presShell(GetPresShell()); if (!presShell) { return nsnull; } return presShell->GetPresContext(); } -already_AddRefed nsAccessNode::GetDocAccessible() +nsIAccessibleDocument* nsAccessNode::GetDocAccessible() { return GetDocAccessibleFor(mWeakShell); // Addref'd } -already_AddRefed nsAccessNode::GetRootAccessible() -{ - nsCOMPtr docShellTreeItem = +nsRootAccessible* nsAccessNode::GetRootAccessible() +{ + nsIDocShellTreeItem* docShellTreeItem = nsAccUtils::GetDocShellTreeItemFor(mDOMNode); NS_ASSERTION(docShellTreeItem, "No docshell tree item for mDOMNode"); if (!docShellTreeItem) { return nsnull; } - nsCOMPtr root; - docShellTreeItem->GetRootTreeItem(getter_AddRefs(root)); + nsIDocShellTreeItem* root; + docShellTreeItem->GetRootTreeItem(&root); NS_ASSERTION(root, "No root content tree item"); if (!root) { return nsnull; } - nsCOMPtr accDoc = GetDocAccessibleFor(root); + nsIAccessibleDocument* accDoc = GetDocAccessibleFor(root); if (!accDoc) { return nsnull; } @@ -370,11 +370,11 @@ already_AddRefed nsAcc nsIFrame* nsAccessNode::GetFrame() { - nsCOMPtr shell(do_QueryReferent(mWeakShell)); + nsIPresShell* shell(do_QueryReferent(mWeakShell)); if (!shell) return nsnull; - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); return content ? shell->GetPrimaryFrameFor(content) : nsnull; } @@ -388,7 +388,7 @@ NS_IMETHODIMP NS_IMETHODIMP nsAccessNode::GetNumChildren(PRInt32 *aNumChildren) { - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) { *aNumChildren = 0; @@ -404,7 +404,7 @@ NS_IMETHODIMP NS_IMETHODIMP nsAccessNode::GetAccessibleDocument(nsIAccessibleDocument **aDocAccessible) { - *aDocAccessible = GetDocAccessibleFor(mWeakShell).get(); + *aDocAccessible = GetDocAccessibleFor(mWeakShell); return NS_OK; } @@ -413,7 +413,7 @@ nsAccessNode::GetInnerHTML(nsAString& aI { aInnerHTML.Truncate(); - nsCOMPtr domNSElement(do_QueryInterface(mDOMNode)); + nsIDOMNSHTMLElement* domNSElement(do_QueryInterface(mDOMNode)); NS_ENSURE_TRUE(domNSElement, NS_ERROR_NULL_POINTER); return domNSElement->GetInnerHTML(aInnerHTML); @@ -424,13 +424,13 @@ nsAccessNode::ScrollTo(PRUint32 aScrollT { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_FAILURE); - nsCOMPtr shell(GetPresShell()); + nsIPresShell* shell(GetPresShell()); NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE); nsIFrame *frame = GetFrame(); NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE); - nsCOMPtr content = frame->GetContent(); + nsIContent* content = frame->GetContent(); NS_ENSURE_TRUE(content, NS_ERROR_FAILURE); PRInt16 vPercent, hPercent; @@ -465,13 +465,13 @@ nsAccessNode::MakeAccessNode(nsIDOMNode nsIAccessibilityService *accService = GetAccService(); NS_ENSURE_TRUE(accService, NS_ERROR_FAILURE); - nsCOMPtr accessNode; - accService->GetCachedAccessNode(aNode, mWeakShell, getter_AddRefs(accessNode)); + nsIAccessNode* accessNode; + accService->GetCachedAccessNode(aNode, mWeakShell, &accessNode); if (!accessNode) { - nsCOMPtr accessible; + nsIAccessible* accessible; accService->GetAccessibleInWeakShell(aNode, mWeakShell, - getter_AddRefs(accessible)); + &accessible); accessNode = do_QueryInterface(accessible); } @@ -499,8 +499,8 @@ nsAccessNode::GetFirstChildNode(nsIAcces *aAccessNode = nsnull; NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode; - mDOMNode->GetFirstChild(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + mDOMNode->GetFirstChild(&domNode); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; } @@ -512,8 +512,8 @@ nsAccessNode::GetLastChildNode(nsIAccess *aAccessNode = nsnull; NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode; - mDOMNode->GetLastChild(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + mDOMNode->GetLastChild(&domNode); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; } @@ -525,8 +525,8 @@ nsAccessNode::GetParentNode(nsIAccessNod *aAccessNode = nsnull; NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode; - mDOMNode->GetParentNode(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + mDOMNode->GetParentNode(&domNode); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; } @@ -538,8 +538,8 @@ nsAccessNode::GetPreviousSiblingNode(nsI *aAccessNode = nsnull; NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode; - mDOMNode->GetPreviousSibling(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + mDOMNode->GetPreviousSibling(&domNode); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; } @@ -551,8 +551,8 @@ nsAccessNode::GetNextSiblingNode(nsIAcce *aAccessNode = nsnull; NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode; - mDOMNode->GetNextSibling(getter_AddRefs(domNode)); + nsIDOMNode* domNode; + mDOMNode->GetNextSibling(&domNode); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; } @@ -563,10 +563,10 @@ nsAccessNode::GetChildNodeAt(PRInt32 aCh NS_ENSURE_ARG_POINTER(aAccessNode); *aAccessNode = nsnull; - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); NS_ENSURE_TRUE(content, NS_ERROR_NULL_POINTER); - nsCOMPtr domNode = + nsIDOMNode* domNode = do_QueryInterface(content->GetChildAt(aChildNum)); return domNode ? MakeAccessNode(domNode, aAccessNode) : NS_OK; @@ -575,12 +575,12 @@ NS_IMETHODIMP NS_IMETHODIMP nsAccessNode::GetComputedStyleValue(const nsAString& aPseudoElt, const nsAString& aPropertyName, nsAString& aValue) { - nsCOMPtr domElement(do_QueryInterface(mDOMNode)); + nsIDOMElement* domElement(do_QueryInterface(mDOMNode)); if (!domElement) { return NS_ERROR_FAILURE; } - nsCOMPtr styleDecl; - GetComputedStyleDeclaration(aPseudoElt, domElement, getter_AddRefs(styleDecl)); + nsIDOMCSSStyleDeclaration* styleDecl; + GetComputedStyleDeclaration(aPseudoElt, domElement, &styleDecl); NS_ENSURE_TRUE(styleDecl, NS_ERROR_FAILURE); return styleDecl->GetPropertyValue(aPropertyName, aValue); @@ -595,13 +595,13 @@ nsAccessNode::GetComputedStyleCSSValue(c *aCSSValue = nsnull; - nsCOMPtr domElement(do_QueryInterface(mDOMNode)); + nsIDOMElement* domElement(do_QueryInterface(mDOMNode)); if (!domElement) return NS_ERROR_FAILURE; - nsCOMPtr styleDecl; + nsIDOMCSSStyleDeclaration* styleDecl; GetComputedStyleDeclaration(aPseudoElt, domElement, - getter_AddRefs(styleDecl)); + &styleDecl); NS_ENSURE_STATE(styleDecl); nsCOMPtr cssValue; @@ -617,28 +617,28 @@ void nsAccessNode::GetComputedStyleDecla { *aCssDecl = nsnull; // Returns number of items in style declaration - nsCOMPtr content = do_QueryInterface(aElement); + nsIContent* content = do_QueryInterface(aElement); if (!content) { return; } - nsCOMPtr doc = content->GetDocument(); + nsIDocument* doc = content->GetDocument(); if (!doc) { return; } - nsCOMPtr viewCSS(do_QueryInterface(doc->GetWindow())); + nsIDOMViewCSS* viewCSS(do_QueryInterface(doc->GetWindow())); if (!viewCSS) { return; } - nsCOMPtr cssDecl; - viewCSS->GetComputedStyle(aElement, aPseudoElt, getter_AddRefs(cssDecl)); + nsIDOMCSSStyleDeclaration* cssDecl; + viewCSS->GetComputedStyle(aElement, aPseudoElt, &cssDecl); NS_IF_ADDREF(*aCssDecl = cssDecl); } /***************** Hashtable of nsIAccessNode's *****************/ -already_AddRefed +nsIAccessibleDocument* nsAccessNode::GetDocAccessibleFor(nsIWeakReference *aPresShell) { nsIAccessibleDocument *docAccessible = nsnull; @@ -650,19 +650,19 @@ nsAccessNode::GetDocAccessibleFor(nsIWea return docAccessible; } -already_AddRefed +nsIAccessibleDocument* nsAccessNode::GetDocAccessibleFor(nsISupports *aContainer, PRBool aCanCreate) { if (!aCanCreate) { - nsCOMPtr docShell(do_QueryInterface(aContainer)); + nsIDocShell* docShell(do_QueryInterface(aContainer)); NS_ASSERTION(docShell, "This method currently only supports docshells"); - nsCOMPtr presShell; - docShell->GetPresShell(getter_AddRefs(presShell)); - nsCOMPtr weakShell(do_GetWeakReference(presShell)); + nsIPresShell* presShell; + docShell->GetPresShell(&presShell); + nsIWeakReference* weakShell(do_GetWeakReference(presShell)); return weakShell ? GetDocAccessibleFor(weakShell) : nsnull; } - nsCOMPtr node = GetDOMNodeForContainer(aContainer); + nsIDOMNode* node = GetDOMNodeForContainer(aContainer); if (!node) { return nsnull; } @@ -676,20 +676,20 @@ nsAccessNode::GetDocAccessibleFor(nsISup return docAccessible; } -already_AddRefed +nsIAccessibleDocument* nsAccessNode::GetDocAccessibleFor(nsIDOMNode *aNode) { - nsCOMPtr eventShell = GetPresShellFor(aNode); - nsCOMPtr weakEventShell(do_GetWeakReference(eventShell)); + nsIPresShell* eventShell = GetPresShellFor(aNode); + nsIWeakReference* weakEventShell(do_GetWeakReference(eventShell)); return weakEventShell? GetDocAccessibleFor(weakEventShell) : nsnull; } -already_AddRefed +nsIPresShell* nsAccessNode::GetPresShellFor(nsIDOMNode *aNode) { - nsCOMPtr domDocument; - aNode->GetOwnerDocument(getter_AddRefs(domDocument)); - nsCOMPtr doc(do_QueryInterface(domDocument)); + nsIDOMDocument* domDocument; + aNode->GetOwnerDocument(&domDocument); + nsIDocument* doc(do_QueryInterface(domDocument)); if (!doc) { // This is necessary when the node is the document node doc = do_QueryInterface(aNode); } @@ -701,20 +701,20 @@ nsAccessNode::GetPresShellFor(nsIDOMNode return presShell; } -already_AddRefed +nsIDOMNode* nsAccessNode::GetDOMNodeForContainer(nsISupports *aContainer) { nsIDOMNode* node = nsnull; - nsCOMPtr shell = do_QueryInterface(aContainer); - nsCOMPtr cv; - shell->GetContentViewer(getter_AddRefs(cv)); + nsIDocShell* shell = do_QueryInterface(aContainer); + nsIContentViewer* cv; + shell->GetContentViewer(&cv); if (cv) { - nsCOMPtr docv(do_QueryInterface(cv)); + nsIDocumentViewer* docv(do_QueryInterface(cv)); if (docv) { - nsCOMPtr doc; - docv->GetDocument(getter_AddRefs(doc)); + nsIDocument* doc; + docv->GetDocument(&doc); if (doc) { - CallQueryInterface(doc.get(), &node); + CallQueryInterface(doc, &node); } } } @@ -745,7 +745,7 @@ nsAccessNode::GetCacheEntry(nsAccessNode PLDHashOperator nsAccessNode::ClearCacheEntry(const void* aKey, nsCOMPtr& aAccessNode, void* aUserArg) { - nsCOMPtr privateAccessNode(do_QueryInterface(aAccessNode)); + nsPIAccessNode* privateAccessNode(do_QueryInterface(aAccessNode)); privateAccessNode->Shutdown(); return PL_DHASH_REMOVE; @@ -757,14 +757,14 @@ nsAccessNode::ClearCache(nsAccessNodeHas aCache.Enumerate(ClearCacheEntry, nsnull); } -already_AddRefed nsAccessNode::GetCurrentFocus() -{ - nsCOMPtr shell = GetPresShellFor(mDOMNode); +nsIDOMNode* nsAccessNode::GetCurrentFocus() +{ + nsIPresShell* shell = GetPresShellFor(mDOMNode); NS_ENSURE_TRUE(shell, nsnull); - nsCOMPtr doc = shell->GetDocument(); + nsIDocument* doc = shell->GetDocument(); NS_ENSURE_TRUE(doc, nsnull); - nsCOMPtr privateDOMWindow(do_QueryInterface(doc->GetWindow())); + nsPIDOMWindow* privateDOMWindow(do_QueryInterface(doc->GetWindow())); if (!privateDOMWindow) { return nsnull; } @@ -772,18 +772,18 @@ already_AddRefed nsAccessNod if (!focusController) { return nsnull; } - nsCOMPtr focusedElement; - focusController->GetFocusedElement(getter_AddRefs(focusedElement)); + nsIDOMElement* focusedElement; + focusController->GetFocusedElement(&focusedElement); nsIDOMNode *focusedNode = nsnull; if (!focusedElement) { // Document itself has focus - nsCOMPtr focusedWinInternal; - focusController->GetFocusedWindow(getter_AddRefs(focusedWinInternal)); + nsIDOMWindowInternal* focusedWinInternal; + focusController->GetFocusedWindow(&focusedWinInternal); if (!focusedWinInternal) { return nsnull; } - nsCOMPtr focusedDOMDocument; - focusedWinInternal->GetDocument(getter_AddRefs(focusedDOMDocument)); + nsIDOMDocument* focusedDOMDocument; + focusedWinInternal->GetDocument(&focusedDOMDocument); if (!focusedDOMDocument) { return nsnull; } @@ -800,22 +800,22 @@ nsAccessNode::GetLanguage(nsAString& aLa nsAccessNode::GetLanguage(nsAString& aLanguage) { aLanguage.Truncate(); - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) { // For documents make sure we look for lang attribute on // document element - nsCOMPtr domDoc(do_QueryInterface(mDOMNode)); + nsIDOMDocument* domDoc(do_QueryInterface(mDOMNode)); if (domDoc) { - nsCOMPtr htmlDoc(do_QueryInterface(mDOMNode)); + nsIDOMHTMLDocument* htmlDoc(do_QueryInterface(mDOMNode)); if (htmlDoc) { // Make sure we look for lang attribute on HTML - nsCOMPtr bodyElement; - htmlDoc->GetBody(getter_AddRefs(bodyElement)); + nsIDOMHTMLElement* bodyElement; + htmlDoc->GetBody(&bodyElement); content = do_QueryInterface(bodyElement); } if (!content) { - nsCOMPtr docElement; - domDoc->GetDocumentElement(getter_AddRefs(docElement)); + nsIDOMElement* docElement; + domDoc->GetDocumentElement(&docElement); content = do_QueryInterface(docElement); } } @@ -851,7 +851,7 @@ nsAccessNode::GetARIARole(nsIContent *aC if (!aContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::role, aRole)) { return PR_FALSE; } - nsCOMPtr doc(do_QueryInterface(aContent->GetDocument())); + nsIDOMNSDocument* doc(do_QueryInterface(aContent->GetDocument())); if (doc) { nsAutoString mimeType; doc->GetContentType(mimeType); @@ -890,7 +890,7 @@ nsAccessNode::GetARIARole(nsIContent *aC // QI to nsIDOM3Node causes some overhead. Unfortunately we need to do this each // time there is a prefixed role attribute, because the prefix to namespace mappings // can change within any subtree via the xmlns attribute - nsCOMPtr dom3Node(do_QueryInterface(aContent)); + nsIDOM3Node* dom3Node(do_QueryInterface(aContent)); if (dom3Node) { // Look up exact prefix name for WAI Roles NS_NAMED_LITERAL_STRING(kWAIRoles_Namespace, "http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"); diff --git a/accessible/src/base/nsAccessNode.h b/accessible/src/base/nsAccessNode.h --- a/accessible/src/base/nsAccessNode.h +++ b/accessible/src/base/nsAccessNode.h @@ -97,7 +97,7 @@ class nsAccessNode: public nsIAccessNode /** * Return an application accessible. */ - static already_AddRefed GetApplicationAccessible(); + static nsApplicationAccessibleWrap* GetApplicationAccessible(); // Static methods for handling per-document cache static void PutCacheEntry(nsAccessNodeHashtable& aCache, @@ -110,12 +110,12 @@ class nsAccessNode: public nsIAccessNode HIDE_FROM_GARBURATOR(static PLDHashOperator PR_CALLBACK ClearCacheEntry(const void* aKey, nsCOMPtr& aAccessNode, void* aUserArg)) // Static cache methods for global document cache - static already_AddRefed GetDocAccessibleFor(nsIWeakReference *aPresShell); - static already_AddRefed GetDocAccessibleFor(nsISupports *aContainer, PRBool aCanCreate = PR_FALSE); - static already_AddRefed GetDocAccessibleFor(nsIDOMNode *aNode); + static nsIAccessibleDocument* GetDocAccessibleFor(nsIWeakReference *aPresShell); + static nsIAccessibleDocument* GetDocAccessibleFor(nsISupports *aContainer, PRBool aCanCreate = PR_FALSE); + static nsIAccessibleDocument* GetDocAccessibleFor(nsIDOMNode *aNode); - static already_AddRefed GetDOMNodeForContainer(nsISupports *aContainer); - static already_AddRefed GetPresShellFor(nsIDOMNode *aStartNode); + static nsIDOMNode* GetDOMNodeForContainer(nsISupports *aContainer); + static nsIPresShell* GetPresShellFor(nsIDOMNode *aStartNode); // Return PR_TRUE if there is a role attribute static PRBool HasRoleAttribute(nsIContent *aContent) @@ -140,17 +140,17 @@ class nsAccessNode: public nsIAccessNode nsIDOMElement *aElement, nsIDOMCSSStyleDeclaration **aCssDecl); - already_AddRefed GetRootAccessible(); + nsRootAccessible* GetRootAccessible(); static nsIDOMNode *gLastFocusedNode; static nsIAccessibilityService* GetAccService(); - already_AddRefed GetCurrentFocus(); + nsIDOMNode* GetCurrentFocus(); protected: nsresult MakeAccessNode(nsIDOMNode *aNode, nsIAccessNode **aAccessNode); - already_AddRefed GetPresShell(); + nsIPresShell* GetPresShell(); nsPresContext* GetPresContext(); - already_AddRefed GetDocAccessible(); + nsIAccessibleDocument* GetDocAccessible(); void LastRelease(); nsCOMPtr mDOMNode; diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -117,13 +117,13 @@ nsAccessibilityService *nsAccessibilityS nsAccessibilityService::nsAccessibilityService() { - nsCOMPtr observerService = + nsIObserverService* observerService = do_GetService("@mozilla.org/observer-service;1"); if (!observerService) return; observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); - nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); + nsIWebProgress* progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); if (progress) { progress->AddProgressListener(static_cast(this), nsIWebProgress::NOTIFY_STATE_DOCUMENT | @@ -148,12 +148,12 @@ nsAccessibilityService::Observe(nsISuppo const PRUnichar *aData) { if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) { - nsCOMPtr observerService = + nsIObserverService* observerService = do_GetService("@mozilla.org/observer-service;1"); if (observerService) { observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID); } - nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); + nsIWebProgress* progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); if (progress) { progress->RemoveProgressListener(static_cast(this)); } @@ -172,23 +172,23 @@ NS_IMETHODIMP nsAccessibilityService::On return NS_OK; } - nsCOMPtr domWindow; - aWebProgress->GetDOMWindow(getter_AddRefs(domWindow)); + nsIDOMWindow* domWindow; + aWebProgress->GetDOMWindow(&domWindow); NS_ASSERTION(domWindow, "DOM Window for state change is null"); NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE); - nsCOMPtr domDoc; - domWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr domDocRootNode(do_QueryInterface(domDoc)); + nsIDOMDocument* domDoc; + domWindow->GetDocument(&domDoc); + nsIDOMNode* domDocRootNode(do_QueryInterface(domDoc)); NS_ENSURE_TRUE(domDocRootNode, NS_ERROR_FAILURE); // Get the accessible for the new document. // If it not created yet this will create it & cache it, as well as // set up event listeners so that MSAA/ATK toolkit and internal // accessibility events will get fired. - nsCOMPtr accessible; - GetAccessibleFor(domDocRootNode, getter_AddRefs(accessible)); - nsCOMPtr docAccessible = + nsIAccessible* accessible; + GetAccessibleFor(domDocRootNode, &accessible); + nsPIAccessibleDocument* docAccessible = do_QueryInterface(accessible); NS_ENSURE_TRUE(docAccessible, NS_ERROR_FAILURE); @@ -199,8 +199,8 @@ NS_IMETHODIMP nsAccessibilityService::On eventType = nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_STOPPED; } else if (aStateFlags & STATE_START) { eventType = nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_START; - nsCOMPtr webNav(do_GetInterface(domWindow)); - nsCOMPtr docShell(do_QueryInterface(webNav)); + nsIWebNavigation* webNav(do_GetInterface(domWindow)); + nsIDocShell* docShell(do_QueryInterface(webNav)); NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE); PRUint32 loadType; docShell->GetLoadType(&loadType); @@ -238,19 +238,19 @@ NS_IMETHODIMP nsAccessibilityService::On // If there is no accessible for the document, we will ignore // this and the anchor jump event will be fired via OnStateChange // and nsIAccessibleStates::STATE_STOP - nsCOMPtr domWindow; - aWebProgress->GetDOMWindow(getter_AddRefs(domWindow)); + nsIDOMWindow* domWindow; + aWebProgress->GetDOMWindow(&domWindow); NS_ASSERTION(domWindow, "DOM Window for state change is null"); NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE); - nsCOMPtr domDoc; - domWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr domDocRootNode(do_QueryInterface(domDoc)); + nsIDOMDocument* domDoc; + domWindow->GetDocument(&domDoc); + nsIDOMNode* domDocRootNode(do_QueryInterface(domDoc)); NS_ENSURE_TRUE(domDocRootNode, NS_ERROR_FAILURE); - nsCOMPtr accessibleDoc = + nsIAccessibleDocument* accessibleDoc = nsAccessNode::GetDocAccessibleFor(domDocRootNode); - nsCOMPtr privateAccessibleDoc = + nsPIAccessibleDocument* privateAccessibleDoc = do_QueryInterface(accessibleDoc); if (!privateAccessibleDoc) { return NS_OK; @@ -280,21 +280,21 @@ nsAccessibilityService::GetInfo(nsISuppo { NS_ASSERTION(aFrame,"Error -- 1st argument (aFrame) is null!!"); *aRealFrame = static_cast(aFrame); - nsCOMPtr content = (*aRealFrame)->GetContent(); - nsCOMPtr node(do_QueryInterface(content)); + nsIContent* content = (*aRealFrame)->GetContent(); + nsIDOMNode* node(do_QueryInterface(content)); if (!content || !node) return NS_ERROR_FAILURE; *aNode = node; NS_IF_ADDREF(*aNode); - nsCOMPtr document = content->GetDocument(); + nsIDocument* document = content->GetDocument(); if (!document) return NS_ERROR_FAILURE; NS_ASSERTION(document->GetPrimaryShell(),"Error no shells!"); // do_GetWR only works into a |nsCOMPtr| :-( - nsCOMPtr weakShell = + nsIWeakReference* weakShell = do_GetWeakReference(document->GetPrimaryShell()); NS_IF_ADDREF(*aShell = weakShell); @@ -304,9 +304,9 @@ nsresult nsresult nsAccessibilityService::GetShellFromNode(nsIDOMNode *aNode, nsIWeakReference **aWeakShell) { - nsCOMPtr domDoc; - aNode->GetOwnerDocument(getter_AddRefs(domDoc)); - nsCOMPtr doc(do_QueryInterface(domDoc)); + nsIDOMDocument* domDoc; + aNode->GetOwnerDocument(&domDoc); + nsIDocument* doc(do_QueryInterface(domDoc)); if (!doc) return NS_ERROR_INVALID_ARG; @@ -315,7 +315,7 @@ nsAccessibilityService::GetShellFromNode if (!shell) return NS_ERROR_FAILURE; - nsCOMPtr weakRef(do_GetWeakReference(shell)); + nsIWeakReference* weakRef(do_GetWeakReference(shell)); *aWeakShell = weakRef; NS_IF_ADDREF(*aWeakShell); @@ -335,8 +335,8 @@ nsAccessibilityService::CreateOuterDocAc *aOuterDocAccessible = nsnull; - nsCOMPtr outerWeakShell; - GetShellFromNode(aDOMNode, getter_AddRefs(outerWeakShell)); + nsIWeakReference* outerWeakShell; + GetShellFromNode(aDOMNode, &outerWeakShell); NS_ENSURE_TRUE(outerWeakShell, NS_ERROR_FAILURE); nsOuterDocAccessible *outerDocAccessible = @@ -355,22 +355,22 @@ nsAccessibilityService::CreateRootAccess { *aRootAcc = nsnull; - nsCOMPtr rootNode(do_QueryInterface(aDocument)); + nsIDOMNode* rootNode(do_QueryInterface(aDocument)); NS_ENSURE_TRUE(rootNode, NS_ERROR_FAILURE); nsIPresShell *presShell = aShell; if (!presShell) { presShell = aDocument->GetPrimaryShell(); } - nsCOMPtr weakShell(do_GetWeakReference(presShell)); - - nsCOMPtr container = aDocument->GetContainer(); - nsCOMPtr docShellTreeItem = + nsIWeakReference* weakShell(do_GetWeakReference(presShell)); + + nsISupports* container = aDocument->GetContainer(); + nsIDocShellTreeItem* docShellTreeItem = do_QueryInterface(container); NS_ENSURE_TRUE(docShellTreeItem, NS_ERROR_FAILURE); - nsCOMPtr parentTreeItem; - docShellTreeItem->GetParent(getter_AddRefs(parentTreeItem)); + nsIDocShellTreeItem* parentTreeItem; + docShellTreeItem->GetParent(&parentTreeItem); if (parentTreeItem) { // We only create root accessibles for the true root, othewise create a @@ -383,7 +383,7 @@ nsAccessibilityService::CreateRootAccess if (!*aRootAcc) return NS_ERROR_OUT_OF_MEMORY; - nsCOMPtr privateAccessNode(do_QueryInterface(*aRootAcc)); + nsPIAccessNode* privateAccessNode(do_QueryInterface(*aRootAcc)); privateAccessNode->Init(); NS_ADDREF(*aRootAcc); @@ -398,9 +398,9 @@ nsAccessibilityService::CreateHTML4Butto nsAccessibilityService::CreateHTML4ButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -416,9 +416,9 @@ nsAccessibilityService::CreateHTMLButton nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -438,7 +438,7 @@ nsAccessibilityService::CreateHTMLAccess { // This method assumes we're in an HTML namespace. *aAccessible = nsnull; - nsCOMPtr content(do_QueryInterface(aNode)); + nsIContent* content(do_QueryInterface(aNode)); nsIAtom *tag = content->Tag(); if (tag == nsAccessibilityAtoms::legend) { *aAccessible = new nsHTMLLegendAccessible(aNode, aWeakShell); @@ -492,9 +492,9 @@ nsAccessibilityService::CreateHTMLLIAcce nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -510,13 +510,13 @@ nsAccessibilityService::CreateHyperTextA nsAccessibilityService::CreateHyperTextAccessible(nsISupports *aFrame, nsIAccessible **aAccessible) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; - nsCOMPtr content(do_QueryInterface(node)); + nsIContent* content(do_QueryInterface(node)); NS_ENSURE_TRUE(content, NS_ERROR_FAILURE); if (nsAccUtils::HasListener(content, NS_LITERAL_STRING("click"))) { @@ -538,9 +538,9 @@ nsAccessibilityService::CreateHTMLCheckb nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -567,14 +567,14 @@ nsAccessibilityService::CreateHTMLImageA nsAccessibilityService::CreateHTMLImageAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; *_retval = nsnull; - nsCOMPtr domElement(do_QueryInterface(node)); + nsIDOMElement* domElement(do_QueryInterface(node)); if (domElement) { *_retval = new nsHTMLImageAccessibleWrap(node, weakShell); } @@ -596,9 +596,9 @@ nsAccessibilityService::CreateHTMLGroupb nsAccessibilityService::CreateHTMLGroupboxAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -634,20 +634,20 @@ nsAccessibilityService::CreateHTMLObject nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame, nsIAccessible **aAccessible) { - nsCOMPtr node; - nsCOMPtr weakShell; + nsIDOMNode* node; + nsIWeakReference* weakShell; nsIFrame *frame; - GetInfo(static_cast(aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + GetInfo(static_cast(aFrame), &frame, &weakShell, &node); *aAccessible = nsnull; if (!frame || frame->GetRect().IsEmpty()) { return NS_ERROR_FAILURE; } // 1) for object elements containing either HTML or TXT documents - nsCOMPtr domDoc; - nsCOMPtr obj(do_QueryInterface(node)); + nsIDOMDocument* domDoc; + nsIDOMHTMLObjectElement* obj(do_QueryInterface(node)); if (obj) - obj->GetContentDocument(getter_AddRefs(domDoc)); + obj->GetContentDocument(&domDoc); else domDoc = do_QueryInterface(node); if (domDoc) @@ -683,9 +683,9 @@ nsAccessibilityService::CreateHTMLRadioB nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -715,9 +715,9 @@ nsAccessibilityService::CreateHTMLTableA nsAccessibilityService::CreateHTMLTableAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -740,8 +740,8 @@ nsAccessibilityService::CreateHTMLTableH nsresult rv = NS_OK; - nsCOMPtr weakShell; - rv = GetShellFromNode(aDOMNode, getter_AddRefs(weakShell)); + nsIWeakReference* weakShell; + rv = GetShellFromNode(aDOMNode, &weakShell); NS_ENSURE_SUCCESS(rv, rv); nsHTMLTableHeadAccessibleWrap* accTableHead = @@ -760,9 +760,9 @@ nsAccessibilityService::CreateHTMLTableC nsAccessibilityService::CreateHTMLTableCellAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -780,9 +780,9 @@ nsAccessibilityService::CreateHTMLTextAc *_retval = nsnull; nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -799,9 +799,9 @@ nsAccessibilityService::CreateHTMLTextFi nsAccessibilityService::CreateHTMLTextFieldAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -817,9 +817,9 @@ nsAccessibilityService::CreateHTMLLabelA nsAccessibilityService::CreateHTMLLabelAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -835,9 +835,9 @@ nsAccessibilityService::CreateHTMLHRAcce nsAccessibilityService::CreateHTMLHRAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -853,9 +853,9 @@ nsAccessibilityService::CreateHTMLBRAcce nsAccessibilityService::CreateHTMLBRAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -871,9 +871,9 @@ nsAccessibilityService::CreateHTMLCaptio nsAccessibilityService::CreateHTMLCaptionAccessible(nsISupports *aFrame, nsIAccessible **_retval) { nsIFrame* frame; - nsCOMPtr node; - nsCOMPtr weakShell; - nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + nsIDOMNode* node; + nsIWeakReference* weakShell; + nsresult rv = GetInfo(aFrame, &frame, &weakShell, &node); if (NS_FAILED(rv)) return rv; @@ -889,9 +889,9 @@ NS_IMETHODIMP nsAccessibilityService::Ge nsIWeakReference *aWeakShell, nsIAccessible **aAccessible) { - nsCOMPtr accessNode; - nsresult rv = GetCachedAccessNode(aNode, aWeakShell, getter_AddRefs(accessNode)); - nsCOMPtr accessible(do_QueryInterface(accessNode)); + nsIAccessNode* accessNode; + nsresult rv = GetCachedAccessNode(aNode, aWeakShell, &accessNode); + nsIAccessible* accessible(do_QueryInterface(accessNode)); NS_IF_ADDREF(*aAccessible = accessible); return rv; } @@ -900,7 +900,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge nsIWeakReference *aWeakShell, nsIAccessNode **aAccessNode) { - nsCOMPtr accessibleDoc = + nsIAccessibleDocument* accessibleDoc = nsAccessNode::GetDocAccessibleFor(aWeakShell); if (!accessibleDoc) { @@ -1086,8 +1086,8 @@ nsAccessibilityService::GetAccessibleFor // We use presentation shell #0 because we assume that is presentation of // given node window. - nsCOMPtr content(do_QueryInterface(aNode)); - nsCOMPtr doc; + nsIContent* content(do_QueryInterface(aNode)); + nsIDocument* doc; if (content) { doc = content->GetDocument(); } @@ -1110,8 +1110,8 @@ nsAccessibilityService::GetAttachedAcces *aAccessible = nsnull; - nsCOMPtr relevantNode; - nsresult rv = GetRelevantContentNodeFor(aNode, getter_AddRefs(relevantNode)); + nsIDOMNode* relevantNode; + nsresult rv = GetRelevantContentNodeFor(aNode, &relevantNode); NS_ENSURE_SUCCESS(rv, rv); if (relevantNode != aNode) @@ -1130,13 +1130,13 @@ NS_IMETHODIMP nsAccessibilityService::Ge NS_ENSURE_ARG(aNode); NS_ENSURE_ARG(aWin); - nsCOMPtr webNav(do_GetInterface(aWin)); - nsCOMPtr docShell(do_QueryInterface(webNav)); + nsIWebNavigation* webNav(do_GetInterface(aWin)); + nsIDocShell* docShell(do_QueryInterface(webNav)); if (!docShell) return NS_ERROR_FAILURE; - nsCOMPtr presShell; - docShell->GetPresShell(getter_AddRefs(presShell)); + nsIPresShell* presShell; + docShell->GetPresShell(&presShell); return GetAccessibleInShell(aNode, presShell, aAccessible); } @@ -1150,7 +1150,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge NS_ENSURE_ARG(aNode); NS_ENSURE_ARG(aPresShell); - nsCOMPtr weakShell(do_GetWeakReference(aPresShell)); + nsIWeakReference* weakShell(do_GetWeakReference(aPresShell)); nsIFrame *outFrameUnused = NULL; PRBool isHiddenUnused = false; return GetAccessible(aNode, aPresShell, weakShell, @@ -1167,7 +1167,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge NS_ENSURE_ARG(aNode); NS_ENSURE_ARG(aWeakShell); - nsCOMPtr presShell(do_QueryReferent(aWeakShell)); + nsIPresShell* presShell(do_QueryReferent(aWeakShell)); nsIFrame *outFrameUnused = NULL; PRBool isHiddenUnused = false; return GetAccessible(aNode, presShell, aWeakShell, @@ -1182,7 +1182,7 @@ nsresult nsAccessibilityService::InitAcc } NS_ASSERTION(aAccessibleOut && !*aAccessibleOut, "Out param should already be cleared out"); - nsCOMPtr privateAccessNode = do_QueryInterface(aAccessibleIn); + nsPIAccessNode* privateAccessNode = do_QueryInterface(aAccessibleIn); NS_ASSERTION(privateAccessNode, "All accessibles must support nsPIAccessNode"); nsresult rv = privateAccessNode->Init(); // Add to cache, etc. if (NS_SUCCEEDED(rv)) { @@ -1225,7 +1225,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge } #endif - nsCOMPtr content(do_QueryInterface(aNode)); + nsIContent* content(do_QueryInterface(aNode)); if (content && content->Tag() == nsAccessibilityAtoms::map) { // Don't walk into maps, they take up no space. // The nsHTMLAreaAccessible's they contain are attached as @@ -1236,10 +1236,10 @@ NS_IMETHODIMP nsAccessibilityService::Ge // Check to see if we already have an accessible for this // node in the cache - nsCOMPtr accessNode; - GetCachedAccessNode(aNode, aWeakShell, getter_AddRefs(accessNode)); - - nsCOMPtr newAcc; + nsIAccessNode* accessNode; + GetCachedAccessNode(aNode, aWeakShell, &accessNode); + + nsIAccessible* newAcc; if (accessNode) { // Retrieved from cache // QI might not succeed if it's a node that's not accessible @@ -1250,21 +1250,21 @@ NS_IMETHODIMP nsAccessibilityService::Ge // No cache entry, so we must create the accessible // Check to see if hidden first - nsCOMPtr nodeIsDoc; + nsIDocument* nodeIsDoc; if (!content) { // This happens when we're on the document node, which will not QI to an // nsIContent. nodeIsDoc = do_QueryInterface(aNode); NS_ENSURE_TRUE(nodeIsDoc, NS_ERROR_FAILURE); // No content, and not doc node - nsCOMPtr accessibleDoc = + nsIAccessibleDocument* accessibleDoc = nsAccessNode::GetDocAccessibleFor(aWeakShell); if (accessibleDoc) { newAcc = do_QueryInterface(accessibleDoc); NS_ASSERTION(newAcc, "nsIAccessibleDocument is not an nsIAccessible"); } else { - CreateRootAccessible(aPresShell, nodeIsDoc, getter_AddRefs(newAcc)); // Does Init() for us + CreateRootAccessible(aPresShell, nodeIsDoc, &newAcc); // Does Init() for us NS_WARN_IF_FALSE(newAcc, "No root/doc accessible created"); } @@ -1313,10 +1313,10 @@ NS_IMETHODIMP nsAccessibilityService::Ge // Check if frame is an image frame, and content is nsIImageFrame *imageFrame; CallQueryInterface(frame, &imageFrame); - nsCOMPtr areaElmt = do_QueryInterface(content); + nsIDOMHTMLAreaElement* areaElmt = do_QueryInterface(content); if (imageFrame && areaElmt) { - nsCOMPtr imageAcc; - CreateHTMLImageAccessible(frame, getter_AddRefs(imageAcc)); + nsIAccessible* imageAcc; + CreateHTMLImageAccessible(frame, &imageAcc); if (imageAcc) { // cache children PRInt32 childCount; @@ -1349,7 +1349,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge *aIsHidden = PR_TRUE; return NS_OK; } - frame->GetAccessible(getter_AddRefs(newAcc)); + frame->GetAccessible(&newAcc); return InitAccessible(newAcc, aAccessible); } @@ -1363,7 +1363,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge // Elements may implement nsIAccessibleProvider via XBL. This allows them to // say what kind of accessible to create. - nsresult rv = GetAccessibleByType(aNode, getter_AddRefs(newAcc)); + nsresult rv = GetAccessibleByType(aNode, &newAcc); NS_ENSURE_SUCCESS(rv, rv); PRBool isHTML = content->IsNodeOfType(nsINode::eHTML); @@ -1416,7 +1416,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge // we do not call it if accessibles for table related content are // prevented above. rv = CreateHTMLAccessibleByMarkup(frame, aWeakShell, aNode, - getter_AddRefs(newAcc)); + &newAcc); NS_ENSURE_SUCCESS(rv, rv); if (!newAcc) { @@ -1433,13 +1433,13 @@ NS_IMETHODIMP nsAccessibilityService::Ge *aIsHidden = PR_TRUE; return NS_OK; } - frame->GetAccessible(getter_AddRefs(newAcc)); // Try using frame to do it + frame->GetAccessible(&newAcc); // Try using frame to do it } } } if (!newAcc) { - GetAccessibleForDeckChildren(aNode, getter_AddRefs(newAcc)); + GetAccessibleForDeckChildren(aNode, &newAcc); } // If no accessible, see if we need to create a generic accessible because @@ -1455,7 +1455,7 @@ NS_IMETHODIMP nsAccessibilityService::Ge // other accessibles can point to it, or so that it can hold a state, etc. if (isHTML) { // Interesting HTML container which may have selectable text and/or embedded objects - CreateHyperTextAccessible(frame, getter_AddRefs(newAcc)); + CreateHyperTextAccessible(frame, &newAcc); } else { // XUL, SVG, MathML etc. // Interesting generic non-HTML container @@ -1470,7 +1470,7 @@ nsAccessibilityService::HasUniversalAria nsAccessibilityService::HasUniversalAriaProperty(nsIContent *aContent, nsIWeakReference *aWeakShell) { - nsCOMPtr docAccessible = + nsIAccessibleDocument* docAccessible = nsAccessNode::GetDocAccessibleFor(aWeakShell); if (!docAccessible) { return PR_FALSE; @@ -1526,7 +1526,7 @@ nsAccessibilityService::GetRelevantConte NS_ENSURE_ARG_POINTER(aRelevantNode); nsresult rv; - nsCOMPtr content(do_QueryInterface(aNode)); + nsIContent* content(do_QueryInterface(aNode)); if (content) { // Build stack of binding parents so we can walk it in reverse. nsIContent *bindingParent; @@ -1541,15 +1541,15 @@ nsAccessibilityService::GetRelevantConte PRInt32 bindingsCount = bindingsStack.Count(); for (PRInt32 index = bindingsCount - 1; index >= 0 ; index--) { bindingParent = bindingsStack[index]; - nsCOMPtr bindingNode(do_QueryInterface(bindingParent)); + nsIDOMNode* bindingNode(do_QueryInterface(bindingParent)); if (bindingNode) { // Try to get an accessible by type since XBL widget can be accessible // only if it implements nsIAccessibleProvider interface. - nsCOMPtr accessible; - rv = GetAccessibleByType(bindingNode, getter_AddRefs(accessible)); + nsIAccessible* accessible; + rv = GetAccessibleByType(bindingNode, &accessible); if (NS_SUCCEEDED(rv)) { - nsCOMPtr paccessible(do_QueryInterface(accessible)); + nsPIAccessible* paccessible(do_QueryInterface(accessible)); if (paccessible) { PRBool allowsAnonChildren = PR_FALSE; paccessible->GetAllowsAnonChildAccessibles(&allowsAnonChildren); @@ -1575,7 +1575,7 @@ nsresult nsAccessibilityService::GetAcce *aAccessible = nsnull; - nsCOMPtr accessibleProvider(do_QueryInterface(aNode)); + nsIAccessibleProvider* accessibleProvider(do_QueryInterface(aNode)); if (!accessibleProvider) return NS_OK; @@ -1586,8 +1586,8 @@ nsresult nsAccessibilityService::GetAcce if (type == nsIAccessibleProvider::OuterDoc) return CreateOuterDocAccessible(aNode, aAccessible); - nsCOMPtr weakShell; - GetShellFromNode(aNode, getter_AddRefs(weakShell)); + nsIWeakReference* weakShell; + GetShellFromNode(aNode, &weakShell); switch (type) { @@ -1620,7 +1620,7 @@ nsresult nsAccessibilityService::GetAcce case nsIAccessibleProvider::XULImage: { // Don't include nameless images in accessible tree - nsCOMPtr elt(do_QueryInterface(aNode)); + nsIDOMElement* elt(do_QueryInterface(aNode)); if (!elt) return NS_ERROR_FAILURE; @@ -1662,7 +1662,7 @@ nsresult nsAccessibilityService::GetAcce // XXX In the future we will should this for consistency across the nsIAccessible // implementations on each platform for a consistent scripting environment, but // then strip out redundant accessibles in the nsAccessibleWrap class for each platform. - nsCOMPtr content = do_QueryInterface(aNode); + nsIContent* content = do_QueryInterface(aNode); if (content) { nsIContent *parent = content->GetParent(); if (parent && parent->NodeInfo()->Equals(nsAccessibilityAtoms::menu, kNameSpaceID_XUL)) { @@ -1815,7 +1815,7 @@ NS_IMETHODIMP nsAccessibilityService::Ad *aRootAccessible = static_cast(rootAccWrap); NS_ADDREF(*aRootAccessible); - nsRefPtr appRoot = + nsApplicationAccessibleWrap* appRoot = nsAccessNode::GetApplicationAccessible(); NS_ENSURE_STATE(appRoot); @@ -1833,7 +1833,7 @@ NS_IMETHODIMP nsAccessibilityService::Re void* atkAccessible; aRootAccessible->GetNativeInterface(&atkAccessible); - nsRefPtr appRoot = + nsApplicationAccessibleWrap* appRoot = nsAccessNode::GetApplicationAccessible(); NS_ENSURE_STATE(appRoot); @@ -1859,10 +1859,10 @@ NS_IMETHODIMP nsAccessibilityService::In "Incorrect aEvent passed in"); NS_ENSURE_ARG_POINTER(aShell); - nsCOMPtr weakShell(do_GetWeakReference(aShell)); - nsCOMPtr accessibleDoc = + nsIWeakReference* weakShell(do_GetWeakReference(aShell)); + nsIAccessibleDocument* accessibleDoc = nsAccessNode::GetDocAccessibleFor(weakShell); - nsCOMPtr privateAccessibleDoc = + nsPIAccessibleDocument* privateAccessibleDoc = do_QueryInterface(accessibleDoc); if (!privateAccessibleDoc) { return NS_OK; @@ -1901,15 +1901,15 @@ nsresult nsresult nsAccessibilityService::GetAccessibleForDeckChildren(nsIDOMNode *aNode, nsIAccessible** aAccessible) { - nsCOMPtr weakShell; - GetShellFromNode(aNode, getter_AddRefs(weakShell)); + nsIWeakReference* weakShell; + GetShellFromNode(aNode, &weakShell); NS_ENSURE_TRUE(weakShell, NS_ERROR_FAILURE); - nsCOMPtr shell(do_QueryReferent(weakShell)); + nsIPresShell* shell(do_QueryReferent(weakShell)); NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE); nsIFrame* frame = nsnull; nsIFrame* parentFrame = nsnull; - nsCOMPtr content(do_QueryInterface(aNode)); + nsIContent* content(do_QueryInterface(aNode)); if (content) { frame = shell->GetPrimaryFrameFor(content); diff --git a/accessible/src/base/nsAccessibilityUtils.cpp b/accessible/src/base/nsAccessibilityUtils.cpp --- a/accessible/src/base/nsAccessibilityUtils.cpp +++ b/accessible/src/base/nsAccessibilityUtils.cpp @@ -167,12 +167,12 @@ nsAccUtils::SetAccAttrsForXULSelectContr nsAccUtils::SetAccAttrsForXULSelectControlItem(nsIDOMNode *aNode, nsIPersistentProperties *aAttributes) { - nsCOMPtr item(do_QueryInterface(aNode)); + nsIDOMXULSelectControlItemElement* item(do_QueryInterface(aNode)); if (!item) return; - nsCOMPtr control; - item->GetControl(getter_AddRefs(control)); + nsIDOMXULSelectControlElement* control; + item->GetControl(&control); if (!control) return; @@ -184,13 +184,13 @@ nsAccUtils::SetAccAttrsForXULSelectContr PRUint32 setSize = itemsCount, posInSet = indexOf; for (PRUint32 index = 0; index < itemsCount; index++) { - nsCOMPtr currItem; - control->GetItemAtIndex(index, getter_AddRefs(currItem)); - nsCOMPtr currNode(do_QueryInterface(currItem)); - - nsCOMPtr itemAcc; + nsIDOMXULSelectControlItemElement* currItem; + control->GetItemAtIndex(index, &currItem); + nsIDOMNode* currNode(do_QueryInterface(currItem)); + + nsIAccessible* itemAcc; nsAccessNode::GetAccService()->GetAccessibleFor(currNode, - getter_AddRefs(itemAcc)); + &itemAcc); if (!itemAcc || nsAccessible::State(itemAcc) & nsIAccessibleStates::STATE_INVISIBLE) { setSize--; @@ -206,8 +206,8 @@ nsAccUtils::HasListener(nsIContent *aCon nsAccUtils::HasListener(nsIContent *aContent, const nsAString& aEventType) { NS_ENSURE_ARG_POINTER(aContent); - nsCOMPtr listenerManager; - aContent->GetListenerManager(PR_FALSE, getter_AddRefs(listenerManager)); + nsIEventListenerManager* listenerManager; + aContent->GetListenerManager(PR_FALSE, &listenerManager); return listenerManager && listenerManager->HasListenersFor(aEventType); } @@ -224,11 +224,11 @@ nsAccUtils::GetAccessKeyFor(nsIContent * if (!aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey)) return 0; - nsCOMPtr doc = aContent->GetOwnerDoc(); + nsIDocument* doc = aContent->GetOwnerDoc(); if (!doc) return 0; - nsCOMPtr presShell = doc->GetPrimaryShell(); + nsIPresShell* presShell = doc->GetPrimaryShell(); if (!presShell) return 0; @@ -251,10 +251,10 @@ nsAccUtils::FireAccEvent(PRUint32 aEvent { NS_ENSURE_ARG(aAccessible); - nsCOMPtr pAccessible(do_QueryInterface(aAccessible)); + nsPIAccessible* pAccessible(do_QueryInterface(aAccessible)); NS_ASSERTION(pAccessible, "Accessible doesn't implement nsPIAccessible"); - nsCOMPtr event = + nsIAccessibleEvent* event = new nsAccEvent(aEventType, aAccessible, nsnull, aIsAsynch); NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY); @@ -268,23 +268,23 @@ nsAccUtils::IsAncestorOf(nsIDOMNode *aPo NS_ENSURE_ARG_POINTER(aPossibleAncestorNode); NS_ENSURE_ARG_POINTER(aPossibleDescendantNode); - nsCOMPtr loopNode = aPossibleDescendantNode; - nsCOMPtr parentNode; - while (NS_SUCCEEDED(loopNode->GetParentNode(getter_AddRefs(parentNode))) && + nsIDOMNode* loopNode = aPossibleDescendantNode; + nsIDOMNode* parentNode; + while (NS_SUCCEEDED(loopNode->GetParentNode(&parentNode)) && parentNode) { if (parentNode == aPossibleAncestorNode) { return PR_TRUE; } - loopNode.swap(parentNode); + swap(loopNode, parentNode); } return PR_FALSE; } -already_AddRefed +nsIAccessible* nsAccUtils::GetAncestorWithRole(nsIAccessible *aDescendant, PRUint32 aRole) { - nsCOMPtr parentAccessible = aDescendant, testRoleAccessible; - while (NS_SUCCEEDED(parentAccessible->GetParent(getter_AddRefs(testRoleAccessible))) && + nsIAccessible* parentAccessible = aDescendant, *testRoleAccessible; + while (NS_SUCCEEDED(parentAccessible->GetParent(&testRoleAccessible)) && testRoleAccessible) { PRUint32 testRole; testRoleAccessible->GetFinalRole(&testRole); @@ -293,11 +293,11 @@ nsAccUtils::GetAncestorWithRole(nsIAcces NS_ADDREF(returnAccessible); return returnAccessible; } - nsCOMPtr docAccessible = do_QueryInterface(testRoleAccessible); + nsIAccessibleDocument* docAccessible = do_QueryInterface(testRoleAccessible); if (docAccessible) { break; } - parentAccessible.swap(testRoleAccessible); + swap(parentAccessible, testRoleAccessible); } return nsnull; } @@ -326,21 +326,21 @@ nsAccUtils::ScrollSubstringTo(nsIFrame * nsPresContext *presContext = aFrame->PresContext(); - nsCOMPtr scrollToRange = do_CreateInstance(kRangeCID); + nsIDOMRange* scrollToRange = do_CreateInstance(kRangeCID); NS_ENSURE_TRUE(scrollToRange, NS_ERROR_FAILURE); - nsCOMPtr selCon; - aFrame->GetSelectionController(presContext, getter_AddRefs(selCon)); + nsISelectionController* selCon; + aFrame->GetSelectionController(presContext, &selCon); NS_ENSURE_TRUE(selCon, NS_ERROR_FAILURE); scrollToRange->SetStart(aStartNode, aStartIndex); scrollToRange->SetEnd(aEndNode, aEndIndex); - nsCOMPtr selection1; + nsISelection* selection1; selCon->GetSelection(nsISelectionController::SELECTION_ACCESSIBILITY, - getter_AddRefs(selection1)); - - nsCOMPtr selection(do_QueryInterface(selection1)); + &selection1); + + nsISelection2* selection(do_QueryInterface(selection1)); if (selection) { selection->RemoveAllRanges(); selection->AddRange(scrollToRange); @@ -435,8 +435,8 @@ nsAccUtils::ConvertToScreenCoords(PRInt3 { NS_ENSURE_ARG(aAccessNode); - nsCOMPtr DOMNode; - aAccessNode->GetDOMNode(getter_AddRefs(DOMNode)); + nsIDOMNode* DOMNode; + aAccessNode->GetDOMNode(&DOMNode); NS_ENSURE_STATE(DOMNode); nsIntPoint wndCoords = nsAccUtils::GetScreenCoordsForWindow(DOMNode); @@ -448,15 +448,15 @@ nsAccUtils::ConvertToScreenCoords(PRInt3 { NS_ENSURE_ARG(aAccessNode); - nsCOMPtr parent; - nsCOMPtr accessible(do_QueryInterface(aAccessNode)); + nsPIAccessNode* parent; + nsIAccessible* accessible(do_QueryInterface(aAccessNode)); if (accessible) { - nsCOMPtr parentAccessible; - accessible->GetParent(getter_AddRefs(parentAccessible)); + nsIAccessible* parentAccessible; + accessible->GetParent(&parentAccessible); parent = do_QueryInterface(parentAccessible); } else { - nsCOMPtr parentAccessNode; - aAccessNode->GetParentNode(getter_AddRefs(parentAccessNode)); + nsIAccessNode* parentAccessNode; + aAccessNode->GetParentNode(&parentAccessNode); parent = do_QueryInterface(parentAccessNode); } @@ -482,20 +482,20 @@ nsAccUtils::GetScreenCoordsForWindow(nsI nsAccUtils::GetScreenCoordsForWindow(nsIDOMNode *aNode) { nsIntPoint coords(0, 0); - nsCOMPtr treeItem(GetDocShellTreeItemFor(aNode)); + nsIDocShellTreeItem* treeItem(GetDocShellTreeItemFor(aNode)); if (!treeItem) return coords; - nsCOMPtr rootTreeItem; - treeItem->GetRootTreeItem(getter_AddRefs(rootTreeItem)); - nsCOMPtr domDoc = do_GetInterface(rootTreeItem); - nsCOMPtr docView(do_QueryInterface(domDoc)); + nsIDocShellTreeItem* rootTreeItem; + treeItem->GetRootTreeItem(&rootTreeItem); + nsIDOMDocument* domDoc = do_GetInterface(rootTreeItem); + nsIDOMDocumentView* docView(do_QueryInterface(domDoc)); if (!docView) return coords; - nsCOMPtr abstractView; - docView->GetDefaultView(getter_AddRefs(abstractView)); - nsCOMPtr windowInter(do_QueryInterface(abstractView)); + nsIDOMAbstractView* abstractView; + docView->GetDefaultView(&abstractView); + nsIDOMWindowInternal* windowInter(do_QueryInterface(abstractView)); if (!windowInter) return coords; @@ -504,15 +504,15 @@ nsAccUtils::GetScreenCoordsForWindow(nsI return coords; } -already_AddRefed +nsIDocShellTreeItem* nsAccUtils::GetDocShellTreeItemFor(nsIDOMNode *aNode) { if (!aNode) return nsnull; - nsCOMPtr domDoc; - aNode->GetOwnerDocument(getter_AddRefs(domDoc)); - nsCOMPtr doc(do_QueryInterface(domDoc)); + nsIDOMDocument* domDoc; + aNode->GetOwnerDocument(&domDoc); + nsIDocument* doc(do_QueryInterface(domDoc)); if (!doc) doc = do_QueryInterface(aNode); @@ -542,12 +542,12 @@ nsAccUtils::GetAriaPropTypes(nsIContent PRUint32 ariaPropTypes = 0; // Get the doc accessible using the optimsal methodology - nsCOMPtr docAccessible; + nsIAccessibleDocument* docAccessible; if (aWeakShell) { docAccessible = nsAccessNode::GetDocAccessibleFor(aWeakShell); } else { - nsCOMPtr node = do_QueryInterface(aContent); + nsIDOMNode* node = do_QueryInterface(aContent); if (node) { docAccessible = nsAccessNode::GetDocAccessibleFor(node); } @@ -606,7 +606,7 @@ nsAccUtils::FindNeighbourPointingToNode( "Cannot pass in both an ARIA relation property and an atom relation. Choose one"); NS_ASSERTION(aAriaProperty == eAria_none || !aTagName, "Cannot use aTagName with ARIA relation property, because ARIA relations apply to any tag"); - nsCOMPtr binding; + nsIContent* binding; nsAutoString controlID; if (!nsAccUtils::GetID(aForNode, controlID)) { binding = aForNode->GetBindingParent(); @@ -629,14 +629,14 @@ nsAccUtils::FindNeighbourPointingToNode( if (aForNode == binding) { // When we reach the binding parent, make sure to check // all of its anonymous child subtrees - nsCOMPtr doc = aForNode->GetCurrentDoc(); - nsCOMPtr xblDoc(do_QueryInterface(doc)); + nsIDocument* doc = aForNode->GetCurrentDoc(); + nsIDOMDocumentXBL* xblDoc(do_QueryInterface(doc)); if (!xblDoc) return nsnull; - nsCOMPtr nodes; - nsCOMPtr forElm(do_QueryInterface(aForNode)); - xblDoc->GetAnonymousNodes(forElm, getter_AddRefs(nodes)); + nsIDOMNodeList* nodes; + nsIDOMElement* forElm(do_QueryInterface(aForNode)); + xblDoc->GetAnonymousNodes(forElm, &nodes); if (!nodes) return nsnull; @@ -646,12 +646,12 @@ nsAccUtils::FindNeighbourPointingToNode( return nsnull; for (PRUint32 index = 0; index < length && !labelContent; index++) { - nsCOMPtr node; - rv = nodes->Item(index, getter_AddRefs(node)); + nsIDOMNode* node; + rv = nodes->Item(index, &node); if (NS_FAILED(rv)) return nsnull; - nsCOMPtr content = do_QueryInterface(node); + nsIContent* content = do_QueryInterface(node); if (!content) return nsnull; diff --git a/accessible/src/base/nsAccessibilityUtils.h b/accessible/src/base/nsAccessibilityUtils.h --- a/accessible/src/base/nsAccessibilityUtils.h +++ b/accessible/src/base/nsAccessibilityUtils.h @@ -144,7 +144,7 @@ public: * @param aRole Role to find matching ancestor for * @return The ancestor accessible with the given role, or nsnull if no match is found */ - static already_AddRefed + static nsIAccessible* GetAncestorWithRole(nsIAccessible *aDescendant, PRUint32 aRole); /** @@ -224,7 +224,7 @@ public: /** * Return document shell tree item for the given DOM node. */ - static already_AddRefed + static nsIDocShellTreeItem* GetDocShellTreeItemFor(nsIDOMNode *aNode); /** diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -198,7 +198,7 @@ nsresult nsAccessible::QueryInterface(RE } if (aIID.Equals(NS_GET_IID(nsIAccessibleSelectable))) { - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) { return NS_ERROR_FAILURE; // This accessible has been shut down } @@ -227,8 +227,8 @@ nsresult nsAccessible::QueryInterface(RE } if (aIID.Equals(NS_GET_IID(nsIAccessibleHyperLink))) { - nsCOMPtr parent(GetParent()); - nsCOMPtr hyperTextParent(do_QueryInterface(parent)); + nsIAccessible* parent(GetParent()); + nsIAccessibleHyperText* hyperTextParent(do_QueryInterface(parent)); if (hyperTextParent) { *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); @@ -275,7 +275,7 @@ NS_IMETHODIMP nsAccessible::GetName(nsAS NS_IMETHODIMP nsAccessible::GetName(nsAString& aName) { aName.Truncate(); - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) { return NS_ERROR_FAILURE; // Node shut down } @@ -301,7 +301,7 @@ NS_IMETHODIMP nsAccessible::GetDescripti // 2. It has no DHTML describedby property // 3. it doesn't have an accName; or // 4. its title attribute already equals to its accName nsAutoString name; - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) { return NS_ERROR_FAILURE; // Node shut down } @@ -354,7 +354,7 @@ static PRInt32 static PRInt32 GetAccessModifierMask(nsIContent* aContent) { - nsCOMPtr prefBranch = + nsIPrefBranch* prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID); if (!prefBranch) return 0; @@ -373,13 +373,13 @@ GetAccessModifierMask(nsIContent* aConte } // get the docShell to this DOMNode, return 0 on failure - nsCOMPtr document = aContent->GetCurrentDoc(); + nsIDocument* document = aContent->GetCurrentDoc(); if (!document) return 0; - nsCOMPtr container = document->GetContainer(); + nsISupports* container = document->GetContainer(); if (!container) return 0; - nsCOMPtr treeItem(do_QueryInterface(container)); + nsIDocShellTreeItem* treeItem(do_QueryInterface(container)); if (!treeItem) return 0; @@ -405,7 +405,7 @@ nsAccessible::GetKeyboardShortcut(nsAStr { aAccessKey.Truncate(); - nsCOMPtr content(do_QueryInterface(mDOMNode)); + nsIContent* content(do_QueryInterface(mDOMNode)); if (!content) return NS_ERROR_FAILURE; @@ -413,8 +413,8 @@ nsAccessible::GetKeyboardShortcut(nsAStr if (!key && content->IsNodeOfType(nsIContent::eELEMENT)) { // Copy access key from label node unless it is labeled // via an ancestor