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

Merge inbound to m-c.

parents 3800f898 022850a2

accessible/src/base/a11yGeneric.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
    return NS_OK;                                                              \

  } else



#define NS_OK_DEFUNCT_OBJECT                                                   \

  NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x22)



#define NS_ENSURE_A11Y_SUCCESS(res, ret)                                       \

  PR_BEGIN_MACRO                                                               \

    nsresult __rv = res; /* Don't evaluate |res| more than once */             \

accessible/src/base/nsAccessiblePivot.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
class Accessible;

class nsIAccessibleTraversalRule;



// raised when current pivot's position is needed but it is not in the tree.

#define NS_ERROR_NOT_IN_TREE \

NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 0x26)



/**

 * Class represents an accessible pivot.

 */

accessible/src/base/nsTextEquivUtils.cpp

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 


using namespace mozilla::a11y;



#define NS_OK_NO_NAME_CLAUSE_HANDLED \

NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x24)



////////////////////////////////////////////////////////////////////////////////

// nsTextEquivUtils. Public.

accessible/src/generic/Accessible.h

+0 −12
Original line number Diff line number Diff line
@@ -78,18 +78,6 @@ class nsIView; 
typedef nsRefPtrHashtable<nsPtrHashKey<const void>, Accessible>

  AccessibleHashtable;



// see Accessible::GetAttrValue

#define NS_OK_NO_ARIA_VALUE \

NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x21)



// see Accessible::GetNameInternal

#define NS_OK_EMPTY_NAME \

NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x23)



// see Accessible::GetNameInternal

#define NS_OK_NAME_FROM_TOOLTIP \

NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x25)





#define NS_ACCESSIBLE_IMPL_IID                          \

{  /* 133c8bf4-4913-4355-bd50-426bd1d6e1ad */           \

accessible/src/html/HTMLTableAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "nsITableLayout.h"

#include "nsITableCellLayout.h"

#include "nsFrameSelection.h"

#include "nsLayoutErrors.h"

#include "nsError.h"

#include "nsArrayUtils.h"

#include "nsComponentManagerUtils.h"