| author | Birunthan Mohanathas <birunthan@mohanathas.com> |
| Sun, 27 Apr 2014 03:06:00 -0400 | |
| changeset 198981 | 6c1c7e45c90289a0875b74f82f39e7ecf6a65af3 |
| parent 198980 | 2d59f550103f36528eb4664c9846cba2705a6481 |
| child 198982 | bb248db2c54c458c3e4e5f1cb9e3a1d8c3187f4f |
| push id | 3624 |
| push user | asasaki@mozilla.com |
| push date | Mon, 09 Jun 2014 21:49:01 +0000 |
| treeherder | mozilla-beta@b1a5da15899a [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | froydnj |
| bugs | 900908 |
| milestone | 31.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/accessible/src/base/DocManager.cpp +++ b/accessible/src/base/DocManager.cpp @@ -113,20 +113,20 @@ DocManager::Shutdown() progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this)); ClearDocCache(); } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS3(DocManager, - nsIWebProgressListener, - nsIDOMEventListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(DocManager, + nsIWebProgressListener, + nsIDOMEventListener, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// // nsIWebProgressListener NS_IMETHODIMP DocManager::OnStateChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest, uint32_t aStateFlags, nsresult aStatus)
--- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -147,22 +147,22 @@ nsAccessibilityService::~nsAccessibility { NS_ASSERTION(gIsShutdown, "Accessibility wasn't shutdown!"); gAccessibilityService = nullptr; } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService, - DocManager, - nsIAccessibilityService, - nsIAccessibleRetrieval, - nsIObserver, - nsISelectionListener) // from SelectionManager +NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService, + DocManager, + nsIAccessibilityService, + nsIAccessibleRetrieval, + nsIObserver, + nsISelectionListener) // from SelectionManager //////////////////////////////////////////////////////////////////////////////// // nsIObserver NS_IMETHODIMP nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) { @@ -251,17 +251,17 @@ public: sPluginTimers->RemoveElement(aTimer); return NS_OK; } private: nsCOMPtr<nsIContent> mContent; }; -NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback) +NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback) #endif already_AddRefed<Accessible> nsAccessibilityService::CreatePluginAccessible(nsObjectFrame* aFrame, nsIContent* aContent, Accessible* aContext) { // nsObjectFrame means a plugin, so we need to use the accessibility support
--- a/accessible/src/generic/ARIAGridAccessible.cpp +++ b/accessible/src/generic/ARIAGridAccessible.cpp @@ -30,19 +30,19 @@ ARIAGridAccessible:: ARIAGridAccessible(nsIContent* aContent, DocAccessible* aDoc) : AccessibleWrap(aContent, aDoc), xpcAccessibleTable(this) { } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible, - Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible, + Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // Accessible void ARIAGridAccessible::Shutdown() { mTable = nullptr; @@ -535,19 +535,19 @@ ARIAGridCellAccessible:: HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this) { mGenericTypes |= eTableCell; } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // nsIAccessibleTableCell TableAccessible* ARIAGridCellAccessible::Table() const { Accessible* table = TableFor(Row());
--- a/accessible/src/generic/ApplicationAccessible.cpp +++ b/accessible/src/generic/ApplicationAccessible.cpp @@ -28,18 +28,18 @@ ApplicationAccessible::ApplicationAccess { mType = eApplicationType; mAppInfo = do_GetService("@mozilla.org/xre/app-info;1"); } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible, - nsIAccessibleApplication) +NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible, + nsIAccessibleApplication) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible NS_IMETHODIMP ApplicationAccessible::GetParent(nsIAccessible** aAccessible) { NS_ENSURE_ARG_POINTER(aAccessible);
--- a/accessible/src/generic/FormControlAccessible.cpp +++ b/accessible/src/generic/FormControlAccessible.cpp @@ -27,19 +27,19 @@ template class mozilla::a11y::ProgressMe template<int Max> NS_IMPL_ADDREF_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible) template<int Max> NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible) template<int Max> -NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible<Max>, - LeafAccessible, - nsIAccessibleValue) +NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible<Max>, + LeafAccessible, + nsIAccessibleValue) //////////////////////////////////////////////////////////////////////////////// // Accessible template<int Max> role ProgressMeterAccessible<Max>::NativeRole() {
--- a/accessible/src/generic/ImageAccessible.cpp +++ b/accessible/src/generic/ImageAccessible.cpp @@ -30,18 +30,18 @@ using namespace mozilla::a11y; ImageAccessible:: ImageAccessible(nsIContent* aContent, DocAccessible* aDoc) : LinkableAccessible(aContent, aDoc) { mType = eImageType; } -NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible, - nsIAccessibleImage) +NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible, + nsIAccessibleImage) //////////////////////////////////////////////////////////////////////////////// // Accessible public uint64_t ImageAccessible::NativeState() { // The state is a bitfield, get our inherited state, then logically OR it with
--- a/accessible/src/generic/RootAccessible.cpp +++ b/accessible/src/generic/RootAccessible.cpp @@ -48,17 +48,17 @@ using namespace mozilla; using namespace mozilla::a11y; using namespace mozilla::dom; //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument) +NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument) //////////////////////////////////////////////////////////////////////////////// // Constructor/destructor RootAccessible:: RootAccessible(nsIDocument* aDocument, nsIContent* aRootContent, nsIPresShell* aPresShell) : DocAccessibleWrap(aDocument, aRootContent, aPresShell)
--- a/accessible/src/html/HTMLFormControlAccessible.cpp +++ b/accessible/src/html/HTMLFormControlAccessible.cpp @@ -287,20 +287,20 @@ HTMLButtonAccessible::IsWidget() const HTMLTextFieldAccessible:: HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) : HyperTextAccessibleWrap(aContent, aDoc) { mType = eHTMLTextFieldType; } -NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible, - Accessible, - nsIAccessibleText, - nsIAccessibleEditableText) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible, + Accessible, + nsIAccessibleText, + nsIAccessibleEditableText) role HTMLTextFieldAccessible::NativeRole() { if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type, nsGkAtoms::password, eIgnoreCase)) { return roles::PASSWORD_TEXT; }
--- a/accessible/src/html/HTMLLinkAccessible.cpp +++ b/accessible/src/html/HTMLLinkAccessible.cpp @@ -23,18 +23,18 @@ using namespace mozilla::a11y; HTMLLinkAccessible:: HTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) : HyperTextAccessibleWrap(aContent, aDoc) { } // Expose nsIAccessibleHyperLink unconditionally -NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap, - nsIAccessibleHyperLink) +NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap, + nsIAccessibleHyperLink) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible role HTMLLinkAccessible::NativeRole() { return roles::LINK;
--- a/accessible/src/html/HTMLTableAccessible.cpp +++ b/accessible/src/html/HTMLTableAccessible.cpp @@ -49,19 +49,19 @@ HTMLTableCellAccessible:: HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this) { mGenericTypes |= eTableCell; } //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: Accessible implementation void HTMLTableCellAccessible::Shutdown() { mTableCell = nullptr; @@ -355,18 +355,18 @@ HTMLTableRowAccessible::NativeRole() { return roles::ROW; } //////////////////////////////////////////////////////////////////////////////// // HTMLTableAccessible //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // HTMLTableAccessible: Accessible void HTMLTableAccessible::Shutdown() {