Commit f3d29e82 authored by David Anderson's avatar David Anderson
Browse files

Merge from mozilla-central.

parent a55618a8

.hgtags

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ a95d426422816513477e5863add1b00ac7041dcb AURORA_BASE_20110412 
462c726144bc1fb45b61e774f64ac5d61b4e047c UPDATE_PACKAGING_R14

5eb553dd2ceae5f88d80f27afc5ef3935c5d43b0 AURORA_BASE_20110705

41b84b87c816403e1b74963d8094cff0406c989e AURORA_BASE_20110816

c0983049bcaa9551e5f276d5a77ce154c151e0b0 AURORA_BASE_20110927

accessible/public/nsIAccessibilityService.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public: 
   *                        should be returned from the cache or can be created

   */

  virtual nsAccessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,

                                                  PRBool aCanCreate) = 0;

                                                  bool aCanCreate) = 0;



  /**

   * Creates accessible for the given DOM node or frame.

accessible/src/atk/nsAccessibleWrap.cpp

+10 −10
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ nsAccessibleWrap::Shutdown() 
    nsAccessible::Shutdown();

}



MaiHyperlink* nsAccessibleWrap::GetMaiHyperlink(PRBool aCreate /* = PR_TRUE */)

MaiHyperlink* nsAccessibleWrap::GetMaiHyperlink(bool aCreate /* = true */)

{

    // make sure mAtkObject is created

    GetAtkObject();
@@ -550,7 +550,7 @@ GetUniqueMaiAtkTypeName(PRUint16 interfacesBits) 
    return name;

}



PRBool nsAccessibleWrap::IsValidObject()

bool nsAccessibleWrap::IsValidObject()

{

    // to ensure we are not shut down

    return !IsDefunct();
@@ -768,7 +768,7 @@ ConvertToAtkAttributeSet(nsIPersistentProperties* aAttributes) 
    nsresult rv = aAttributes->Enumerate(getter_AddRefs(propEnum));

    NS_ENSURE_SUCCESS(rv, nsnull);



    PRBool hasMore;

    bool hasMore;

    while (NS_SUCCEEDED(propEnum->HasMoreElements(&hasMore)) && hasMore) {

        nsCOMPtr<nsISupports> sup;

        rv = propEnum->GetNext(getter_AddRefs(sup));
@@ -909,7 +909,7 @@ TranslateStates(PRUint64 aState, AtkStateSet* aStateSet) 
  PRUint64 bitMask = 1;

  while (gAtkStateMap[stateIndex].stateMapEntryType != kNoSuchState) {

    if (gAtkStateMap[stateIndex].atkState) { // There's potentially an ATK state for this

      PRBool isStateOn = (aState & bitMask) != 0;

      bool isStateOn = (aState & bitMask) != 0;

      if (gAtkStateMap[stateIndex].stateMapEntryType == kMapOpposite) {

        isStateOn = !isStateOn;

      }
@@ -1241,7 +1241,7 @@ nsAccessibleWrap::FirePlatformEvent(AccEvent* aEvent) 
        g_signal_emit(atkObj, id, 0);



        // Always fire a current focus event after activation.

        rootAcc->FireCurrentFocusEvent();

        FocusMgr()->ForceFocusEvent();

      } break;



    case nsIAccessibleEvent::EVENT_WINDOW_DEACTIVATE:
@@ -1319,7 +1319,7 @@ nsAccessibleWrap::FireAtkStateChangeEvent(AccEvent* aEvent, 
    AccStateChangeEvent* event = downcast_accEvent(aEvent);

    NS_ENSURE_TRUE(event, NS_ERROR_FAILURE);



    PRBool isEnabled = event->IsStateEnabled();

    bool isEnabled = event->IsStateEnabled();

    PRInt32 stateIndex = AtkStateMap::GetStateIndexFor(event->GetState());

    if (stateIndex >= 0) {

        NS_ASSERTION(gAtkStateMap[stateIndex].stateMapEntryType != kNoSuchState,
@@ -1353,8 +1353,8 @@ nsAccessibleWrap::FireAtkTextChangedEvent(AccEvent* aEvent, 


    PRInt32 start = event->GetStartOffset();

    PRUint32 length = event->GetLength();

    PRBool isInserted = event->IsTextInserted();

    PRBool isFromUserInput = aEvent->IsFromUserInput();

    bool isInserted = event->IsTextInserted();

    bool isFromUserInput = aEvent->IsFromUserInput();

    char* signal_name = nsnull;



  if (gAvailableAtkSignals == eUnknown)
@@ -1384,7 +1384,7 @@ nsAccessibleWrap::FireAtkTextChangedEvent(AccEvent* aEvent, 


nsresult

nsAccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent,

                                       AtkObject *aObject, PRBool aIsAdded)

                                       AtkObject *aObject, bool aIsAdded)

{

    if (aIsAdded)

        MAI_LOG_DEBUG(("\n\nReceived: Show event\n"));
@@ -1395,7 +1395,7 @@ nsAccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent, 
    AtkObject *parentObject = getParentCB(aObject);

    NS_ENSURE_STATE(parentObject);



    PRBool isFromUserInput = aEvent->IsFromUserInput();

    bool isFromUserInput = aEvent->IsFromUserInput();

    char *signal_name = g_strconcat(aIsAdded ? "children_changed::add" :  "children_changed::remove",

                                    isFromUserInput ? "" : kNonUserInputEvent, NULL);

    g_signal_emit_by_name(parentObject, signal_name, indexInParent, aObject, NULL);

accessible/src/atk/nsAccessibleWrap.h

+3 −3
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ public: 
    AtkObject * GetAtkObject(void);

    static AtkObject * GetAtkObject(nsIAccessible * acc);



    PRBool IsValidObject();

    bool IsValidObject();

    

    // get/set the MaiHyperlink object for this nsAccessibleWrap

    MaiHyperlink* GetMaiHyperlink(PRBool aCreate = PR_TRUE);

    MaiHyperlink* GetMaiHyperlink(bool aCreate = true);

    void SetMaiHyperlink(MaiHyperlink* aMaiHyperlink);



    static const char * ReturnString(nsAString &aString) {
@@ -122,7 +122,7 @@ protected: 
    nsresult FireAtkStateChangeEvent(AccEvent* aEvent, AtkObject *aObject);

    nsresult FireAtkTextChangedEvent(AccEvent* aEvent, AtkObject *aObject);

    nsresult FireAtkShowHideEvent(AccEvent* aEvent, AtkObject *aObject,

                                  PRBool aIsAdded);

                                  bool aIsAdded);



    AtkObject *mAtkObject;

accessible/src/atk/nsApplicationAccessibleWrap.cpp

+4 −4
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, 
  return TRUE;

}



PRBool

bool

nsApplicationAccessibleWrap::Init()

{

    // XXX following code is copied from widget/src/gtk2/nsWindow.cpp
@@ -619,7 +619,7 @@ nsApplicationAccessibleWrap::Init() 
    // see bug 390761



    // check if accessibility enabled/disabled by environment variable

    PRBool isGnomeATEnabled = PR_FALSE;

    bool isGnomeATEnabled = false;

    const char *envValue = PR_GetEnv(sAccEnv);

    if (envValue) {

        isGnomeATEnabled = !!atoi(envValue);
@@ -752,7 +752,7 @@ gboolean fireRootAccessibleAddedCB(gpointer data) 
    return FALSE;

}



PRBool

bool

nsApplicationAccessibleWrap::AppendChild(nsAccessible *aChild)

{

    if (!nsApplicationAccessible::AppendChild(aChild))
@@ -779,7 +779,7 @@ nsApplicationAccessibleWrap::AppendChild(nsAccessible *aChild) 
    return PR_TRUE;

}



PRBool

bool

nsApplicationAccessibleWrap::RemoveChild(nsAccessible* aChild)

{

    PRInt32 index = aChild->IndexInParent();