Commit ec69e2de authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge inbound to m-c.

parents 9a161834 5c8e580b

accessible/src/base/ARIAMap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ static nsRoleMapEntry sWAIRoleMaps[] = 
    eNoValue,

    ePressAction,

    eNoLiveAttr,

    kGenericAccType,

    kNoReqStates,

    eARIAPressed

    eButton,

    kNoReqStates

    // eARIAPressed is auto applied on any button

  },

  { // checkbox

    &nsGkAtoms::checkbox,

accessible/src/base/ARIAStateMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState) 
    {

      static const TokenTypeData data(

        nsGkAtoms::aria_pressed, eMixedType,

        states::CHECKABLE, states::PRESSED);

        0, states::PRESSED);



      MapTokenType(aElement, aState, data);

      return true;

accessible/src/base/AccTypes.h

+11 −10
Original line number Diff line number Diff line
@@ -69,16 +69,17 @@ enum AccType { 
enum AccGenericType {

  eAutoComplete = 1 << 0,

  eAutoCompletePopup = 1 << 1,

  eCombobox = 1 << 2,

  eDocument = 1 << 3,

  eHyperText = 1 << 4,

  eList = 1 << 5,

  eListControl = 1 << 6,

  eMenuButton = 1 << 7,

  eSelect = 1 << 8,

  eTable = 1 << 9,

  eTableCell = 1 << 10,

  eTableRow = 1 << 11,

  eButton = 1 << 2,

  eCombobox = 1 << 3,

  eDocument = 1 << 4,

  eHyperText = 1 << 5,

  eList = 1 << 6,

  eListControl = 1 << 7,

  eMenuButton = 1 << 8,

  eSelect = 1 << 9,

  eTable = 1 << 10,

  eTableCell = 1 << 11,

  eTableRow = 1 << 12,



  eLastAccGenericType = eTableRow

};

accessible/src/generic/Accessible.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1573,6 +1573,10 @@ Accessible::ApplyARIAState(uint64_t* aState) const 
    }    

  }



  // special case: A native button element whose role got transformed by ARIA to a toggle button

  if (IsButton())

    aria::MapToState(aria::eARIAPressed, element, aState);



  if (!mRoleMapEntry)

    return;

accessible/src/generic/Accessible.h

+3 −1
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ public: 
  bool IsAutoCompletePopup() const

    { return HasGenericType(eAutoCompletePopup); }



  bool IsButton() const { return HasGenericType(eButton); }



  bool IsCombobox() const { return HasGenericType(eCombobox); }



  bool IsDoc() const { return HasGenericType(eDocument); }
@@ -990,7 +992,7 @@ protected: 
  static const uint8_t kStateFlagsBits = 7;

  static const uint8_t kContextFlagsBits = 1;

  static const uint8_t kTypeBits = 6;

  static const uint8_t kGenericTypesBits = 12;

  static const uint8_t kGenericTypesBits = 13;



  /**

   * Keep in sync with ChildrenFlags, StateFlags, ContextFlags, and AccTypes.