author | Aryeh Gregor <ayg@aryeh.name> |
Fri, 27 Jul 2012 16:53:02 +0300 | |
changeset 101202 | 865a6f2d3a831e77a6756780acd1d3dbc501bdfa |
parent 101201 | cb017d0510296e4f873855f4c9ab09129a64a578 |
child 101203 | 8d9891ef7bcbab357e42ad4b1386a9bccf890065 |
push id | 12896 |
push user | ayg@aryeh.name |
push date | Thu, 02 Aug 2012 09:31:29 +0000 |
treeherder | mozilla-inbound@430c7512acee [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | surkov |
bugs | 779091 |
milestone | 17.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/atk/ApplicationAccessibleWrap.cpp +++ b/accessible/src/atk/ApplicationAccessibleWrap.cpp @@ -567,17 +567,17 @@ toplevel_event_watcher(GSignalInvocation } } } return TRUE; } -bool +void ApplicationAccessibleWrap::Init() { if (ShouldA11yBeEnabled()) { // load and initialize gail library nsresult rv = LoadGtkModule(sGail); if (NS_SUCCEEDED(rv)) { (*sGail.init)(); } @@ -610,17 +610,17 @@ ApplicationAccessibleWrap::Init() reinterpret_cast<gpointer>(nsIAccessibleEvent::EVENT_SHOW), NULL); sToplevel_hide_hook = g_signal_add_emission_hook(g_signal_lookup("hide", GTK_TYPE_WINDOW), 0, toplevel_event_watcher, reinterpret_cast<gpointer>(nsIAccessibleEvent::EVENT_HIDE), NULL); } } - return ApplicationAccessible::Init(); + ApplicationAccessible::Init(); } void ApplicationAccessibleWrap::Unload() { if (sToplevel_event_hook_added) { sToplevel_event_hook_added = false; g_signal_remove_emission_hook(g_signal_lookup("show", GTK_TYPE_WINDOW),
--- a/accessible/src/atk/ApplicationAccessibleWrap.h +++ b/accessible/src/atk/ApplicationAccessibleWrap.h @@ -18,17 +18,17 @@ public: static void Unload(); static void PreCreate(); public: ApplicationAccessibleWrap(); virtual ~ApplicationAccessibleWrap(); // nsAccessNode - virtual bool Init(); + virtual void Init(); // Accessible virtual mozilla::a11y::ENameValueFlag Name(nsString& aName); virtual bool AppendChild(Accessible* aChild); virtual bool RemoveChild(Accessible* aChild); /** * Return the atk object for app root accessible.
--- a/accessible/src/base/nsAccDocManager.cpp +++ b/accessible/src/base/nsAccDocManager.cpp @@ -383,20 +383,17 @@ nsAccDocManager::CreateDocOrRootAccessib nsRefPtr<DocAccessible> docAcc = isRootDoc ? new RootAccessibleWrap(aDocument, rootElm, presShell) : new DocAccessibleWrap(aDocument, rootElm, presShell); // Cache the document accessible into document cache. 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. if (isRootDoc) { Accessible* appAcc = nsAccessNode::GetApplicationAccessible(); if (!appAcc->AppendChild(docAcc)) { docAcc->Shutdown(); return nullptr;
--- a/accessible/src/base/nsAccessNode.cpp +++ b/accessible/src/base/nsAccessNode.cpp @@ -91,22 +91,17 @@ nsAccessNode::GetApplicationAccessible() if (!gApplicationAccessible) { ApplicationAccessibleWrap::PreCreate(); gApplicationAccessible = new ApplicationAccessibleWrap(); // 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; } void nsAccessNode::ShutdownXPAccessibility() { // Called by nsAccessibilityService::Shutdown()
--- a/accessible/src/generic/Accessible.cpp +++ b/accessible/src/generic/Accessible.cpp @@ -190,20 +190,19 @@ Accessible::~Accessible() } void Accessible::SetRoleMapEntry(nsRoleMapEntry* aRoleMapEntry) { mRoleMapEntry = aRoleMapEntry; } -bool +void Accessible::Init() { - return true; } NS_IMETHODIMP Accessible::GetDocument(nsIAccessibleDocument** aDocument) { NS_ENSURE_ARG_POINTER(aDocument); NS_IF_ADDREF(*aDocument = Document());
--- a/accessible/src/generic/Accessible.h +++ b/accessible/src/generic/Accessible.h @@ -124,17 +124,17 @@ public: virtual void Shutdown(); ////////////////////////////////////////////////////////////////////////////// // Public methods /** * Initialize the accessible. */ - virtual bool Init(); + virtual void Init(); /** * Get the description of this accessible. */ virtual void Description(nsString& aDescription); /** * Get the value of this accessible.
--- a/accessible/src/generic/ApplicationAccessible.cpp +++ b/accessible/src/generic/ApplicationAccessible.cpp @@ -263,21 +263,20 @@ ApplicationAccessible::GetPlatformVersio AppendUTF8toUTF16(cversion, aVersion); return NS_OK; } //////////////////////////////////////////////////////////////////////////////// // nsAccessNode public methods -bool +void ApplicationAccessible::Init() { mAppInfo = do_GetService("@mozilla.org/xre/app-info;1"); - return true; } void ApplicationAccessible::Shutdown() { mAppInfo = nullptr; }
--- a/accessible/src/generic/ApplicationAccessible.h +++ b/accessible/src/generic/ApplicationAccessible.h @@ -56,17 +56,17 @@ public: NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString &aName); NS_IMETHOD GetActionDescription(PRUint8 aIndex, nsAString &aDescription); NS_IMETHOD DoAction(PRUint8 aIndex); // nsIAccessibleApplication NS_DECL_NSIACCESSIBLEAPPLICATION // nsAccessNode - virtual bool Init(); + virtual void Init(); virtual void Shutdown(); virtual bool IsPrimaryForNode() const; // Accessible virtual GroupPos GroupPosition(); virtual ENameValueFlag Name(nsString& aName); virtual void ApplyARIAState(PRUint64* aState) const; virtual void Description(nsString& aDescription);
--- a/accessible/src/generic/DocAccessible.cpp +++ b/accessible/src/generic/DocAccessible.cpp @@ -599,37 +599,34 @@ DocAccessible::GetAccessible(nsINode* aN #endif return accessible; } //////////////////////////////////////////////////////////////////////////////// // nsAccessNode -bool +void DocAccessible::Init() { #ifdef DEBUG if (logging::IsEnabled(logging::eDocCreate)) logging::DocCreate("document initialize", mDocument, this); #endif // Initialize notification controller. mNotificationController = new NotificationController(this, mPresShell); - if (!mNotificationController) - return false; // Mark the document accessible as loaded if its DOM document was loaded at // this point (this can happen because a11y is started late or DOM document // having no container was loaded. if (mDocument->GetReadyStateEnum() == nsIDocument::READYSTATE_COMPLETE) mLoadState |= eDOMLoaded; AddEventListeners(); - return true; } void DocAccessible::Shutdown() { if (!mPresShell) // already shutdown return; @@ -1392,22 +1389,17 @@ DocAccessible::BindToDocument(Accessible // Put into DOM node cache. if (aAccessible->IsPrimaryForNode()) mNodeToAccessibleMap.Put(aAccessible->GetNode(), aAccessible); // Put into unique ID cache. mAccessibleCache.Put(aAccessible->UniqueID(), aAccessible); // Initialize the accessible. - if (!aAccessible->Init()) { - NS_ERROR("Failed to initialize an accessible!"); - - UnbindFromDocument(aAccessible); - return false; - } + aAccessible->Init(); aAccessible->SetRoleMapEntry(aRoleMapEntry); if (aAccessible->IsElement()) AddDependentIDsFor(aAccessible); return true; }
--- a/accessible/src/generic/DocAccessible.h +++ b/accessible/src/generic/DocAccessible.h @@ -66,17 +66,17 @@ public: // nsIScrollPositionListener virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) {} virtual void ScrollPositionDidChange(nscoord aX, nscoord aY); // nsIDocumentObserver NS_DECL_NSIDOCUMENTOBSERVER // nsAccessNode - virtual bool Init(); + virtual void Init(); virtual void Shutdown(); virtual nsIFrame* GetFrame() const; virtual nsINode* GetNode() const { return mDocument; } virtual nsIDocument* GetDocumentNode() const { return mDocument; } // Accessible virtual mozilla::a11y::ENameValueFlag Name(nsString& aName); virtual void Description(nsString& aDescription);
--- a/accessible/src/xul/XULTreeAccessible.cpp +++ b/accessible/src/xul/XULTreeAccessible.cpp @@ -1145,24 +1145,21 @@ XULTreeItemAccessible::Name(nsString& aN GetCellName(mColumn, aName); return eNameOK; } //////////////////////////////////////////////////////////////////////////////// // XULTreeItemAccessible: nsAccessNode implementation -bool +void XULTreeItemAccessible::Init() { - if (!XULTreeItemAccessibleBase::Init()) - return false; - + XULTreeItemAccessibleBase::Init(); Name(mCachedName); - return true; } void XULTreeItemAccessible::Shutdown() { mColumn = nullptr; XULTreeItemAccessibleBase::Shutdown(); }
--- a/accessible/src/xul/XULTreeAccessible.h +++ b/accessible/src/xul/XULTreeAccessible.h @@ -230,17 +230,17 @@ public: nsITreeView* aTreeView, PRInt32 aRow); // nsISupports and cycle collection NS_DECL_ISUPPORTS_INHERITED NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XULTreeItemAccessible, XULTreeItemAccessibleBase) // nsAccessNode - virtual bool Init(); + virtual void Init(); virtual void Shutdown(); // Accessible virtual ENameValueFlag Name(nsString& aName); virtual a11y::role NativeRole(); // XULTreeItemAccessibleBase virtual void RowInvalidated(PRInt32 aStartColIdx, PRInt32 aEndColIdx);
--- a/accessible/src/xul/XULTreeGridAccessible.cpp +++ b/accessible/src/xul/XULTreeGridAccessible.cpp @@ -774,30 +774,29 @@ XULTreeGridCellAccessible::IsSelected(bo NS_ENSURE_SUCCESS(rv, rv); return selection->IsSelected(mRow, aIsSelected); } //////////////////////////////////////////////////////////////////////////////// // XULTreeGridCellAccessible: nsAccessNode implementation -bool +void XULTreeGridCellAccessible::Init() { - if (!LeafAccessible::Init() || !mTreeView) - return false; + LeafAccessible::Init(); + + NS_ASSERTION(mTreeView, "mTreeView is null"); PRInt16 type; mColumn->GetType(&type); if (type == nsITreeColumn::TYPE_CHECKBOX) mTreeView->GetCellValue(mRow, mColumn, mCachedTextEquiv); else mTreeView->GetCellText(mRow, mColumn, mCachedTextEquiv); - - return true; } bool XULTreeGridCellAccessible::IsPrimaryForNode() const { return false; }
--- a/accessible/src/xul/XULTreeGridAccessible.h +++ b/accessible/src/xul/XULTreeGridAccessible.h @@ -145,17 +145,17 @@ public: NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName); NS_IMETHOD DoAction(PRUint8 aIndex); // nsIAccessibleTableCell NS_DECL_OR_FORWARD_NSIACCESSIBLETABLECELL_WITH_XPCACCESSIBLETABLECELL // nsAccessNode - virtual bool Init(); + virtual void Init(); virtual bool IsPrimaryForNode() const; // Accessible virtual void Shutdown(); virtual ENameValueFlag Name(nsString& aName); virtual Accessible* FocusedChild(); virtual nsresult GetAttributesInternal(nsIPersistentProperties* aAttributes); virtual PRInt32 IndexInParent() const;