Commit f4df5512 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

merge autoland to mozilla-central. r=merge a=merge 

MozReview-Commit-ID: Dv5XkOkXC25

--HG--
extra : amend_source : 4eaa41d385816069c3d4841bf8cda5a9db04e618
parents 6c0975fc d225f715

.gdbinit

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ def ps 
  end

end



# Define a "pa" command to display the string value for an nsIAtom

# Define a "pa" command to display the string value for an nsAtom

def pa

  set $atom = $arg0

  if (sizeof(*((&*$atom)->mString)) == 2)

.lldbinit

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ settings set target.inline-breakpoint-strategy always 
settings set target.prefer-dynamic-value run-target



# Show the string value in atoms.

type summary add nsIAtom --summary-string "${var.mString}"

type summary add nsAtom --summary-string "${var.mString}"



# Show the value of text nodes.

type summary add nsTextNode --summary-string "${var.mText}"

accessible/base/ARIAMap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ static const EStateRule sWAIUnivStateMap[] = { 


struct AttrCharacteristics

{

  nsIAtom** attributeName;

  nsAtom** attributeName;

  const uint8_t characteristics;

};
@@ -1361,7 +1361,7 @@ aria::UniversalStatesFor(mozilla::dom::Element* aElement) 
}



uint8_t

aria::AttrCharacteristicsFor(nsIAtom* aAtom)

aria::AttrCharacteristicsFor(nsAtom* aAtom)

{

  for (uint32_t i = 0; i < ArrayLength(gWAIUnivAttrMap); i++)

    if (*gWAIUnivAttrMap[i].attributeName == aAtom)
@@ -1389,7 +1389,7 @@ AttrIterator::Next(nsAString& aAttrName, nsAString& aAttrValue) 
    const nsAttrName* attr = mContent->GetAttrNameAt(mAttrIdx);

    mAttrIdx++;

    if (attr->NamespaceEquals(kNameSpaceID_None)) {

      nsIAtom* attrAtom = attr->Atom();

      nsAtom* attrAtom = attr->Atom();

      nsDependentAtomString attrStr(attrAtom);

      if (!StringBeginsWith(attrStr, NS_LITERAL_STRING("aria-")))

        continue; // Not ARIA

accessible/base/ARIAMap.h

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "mozilla/a11y/AccTypes.h"

#include "mozilla/a11y/Role.h"



#include "nsIAtom.h"

#include "nsAtom.h"

#include "nsIContent.h"



class nsINode;
@@ -140,7 +140,7 @@ struct nsRoleMapEntry 
  /**

   * Return true if matches to the given ARIA role.

   */

  bool Is(nsIAtom* aARIARole) const

  bool Is(nsAtom* aARIARole) const

    { return *roleAtom == aARIARole; }



  /**
@@ -156,7 +156,7 @@ struct nsRoleMapEntry 
    { return nsDependentAtomString(*roleAtom); }



  // ARIA role: string representation such as "button"

  nsIAtom** roleAtom;

  nsAtom** roleAtom;



  // Role mapping rule: maps to enum Role

  mozilla::a11y::role role;
@@ -274,7 +274,7 @@ uint64_t UniversalStatesFor(mozilla::dom::Element* aElement); 
 * @return       A bitflag representing the attribute characteristics

 *               (see above for possible bit masks, prefixed "ATTR_")

 */

uint8_t AttrCharacteristicsFor(nsIAtom* aAtom);

uint8_t AttrCharacteristicsFor(nsAtom* aAtom);



/**

 * Return true if the element has defined aria-hidden.

accessible/base/ARIAStateMap.cpp

+4 −4
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ using namespace mozilla::a11y::aria; 
struct EnumTypeData

{

  // ARIA attribute name.

  nsIAtom* const mAttrName;

  nsAtom* const mAttrName;



  // States if the attribute value is matched to the enum value. Used as

  // nsIContent::AttrValuesArray, last item must be nullptr.

  nsIAtom* const* const mValues[4];

  nsAtom* const* const mValues[4];



  // States applied if corresponding enum values are matched.

  const uint64_t mStates[3];
@@ -46,7 +46,7 @@ enum ETokenType 
 */

struct TokenTypeData

{

  TokenTypeData(nsIAtom* aAttrName, uint32_t aType,

  TokenTypeData(nsAtom* aAttrName, uint32_t aType,

                uint64_t aPermanentState,

                uint64_t aTrueState,

                uint64_t aFalseState = 0) :
@@ -55,7 +55,7 @@ struct TokenTypeData 
  { }



  // ARIA attribute name.

  nsIAtom* const mAttrName;

  nsAtom* const mAttrName;



  // Type.

  const uint32_t mType;