Commit 81fe0db7 authored by Ed Morley's avatar Ed Morley
Browse files

Merge mozilla-central and fx-team

parents 9a670c04 b68928df

accessible/src/atk/ApplicationAccessibleWrap.cpp

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

}



bool

void

ApplicationAccessibleWrap::Init()

{

    if (ShouldA11yBeEnabled()) {
@@ -615,7 +615,7 @@ ApplicationAccessibleWrap::Init() 
        }

    }



    return ApplicationAccessible::Init();

    ApplicationAccessible::Init();

}



void

accessible/src/atk/ApplicationAccessibleWrap.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public: 
  virtual ~ApplicationAccessibleWrap();



  // nsAccessNode

  virtual bool Init();

  virtual void Init();



  // Accessible

  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);

accessible/src/base/nsAccDocManager.cpp

+1 −4
Original line number Diff line number Diff line
@@ -388,10 +388,7 @@ nsAccDocManager::CreateDocOrRootAccessible(nsIDocument* aDocument) 
  mDocAccessibleCache.Put(aDocument, docAcc);



  // Initialize the document accessible.

  if (!docAcc->Init()) {

    docAcc->Shutdown();

    return nullptr;

  }

  docAcc->Init();

  docAcc->SetRoleMapEntry(aria::GetRoleMap(aDocument));



  // Bind the document to the tree.

accessible/src/base/nsAccessNode.cpp

+1 −6
Original line number Diff line number Diff line
@@ -96,12 +96,7 @@ nsAccessNode::GetApplicationAccessible() 
    // Addref on create. Will Release in ShutdownXPAccessibility()

    NS_ADDREF(gApplicationAccessible);



    nsresult rv = gApplicationAccessible->Init();

    if (NS_FAILED(rv)) {

      gApplicationAccessible->Shutdown();

      NS_RELEASE(gApplicationAccessible);

      return nullptr;

    }

    gApplicationAccessible->Init();

  }



  return gApplicationAccessible;

accessible/src/base/nsTextEquivUtils.cpp

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "AccIterator.h"

#include "nsAccessibilityService.h"

#include "nsAccUtils.h"

#include "nsStyleStructInlines.h"



#include "nsIDOMXULLabeledControlEl.h"
@@ -126,7 +127,7 @@ nsTextEquivUtils::AppendTextEquivFromTextContent(nsIContent *aContent, 
        // level), we need to add spaces around that block's text, so we don't

        // get words jammed together in final name.

        const nsStyleDisplay* display = frame->GetStyleDisplay();

        if (display->IsBlockOutside() ||

        if (display->IsBlockOutsideStyle() ||

            display->mDisplay == NS_STYLE_DISPLAY_TABLE_CELL) {

          isHTMLBlock = true;

          if (!aString->IsEmpty()) {