author | Alexander Surkov <surkov.alexander@gmail.com> |
Fri, 23 Mar 2012 21:21:31 +0900 | |
changeset 90151 | 21fabfdbeaab98df15d9980b679b901cb7fb87a9 |
parent 90150 | 7beb8fd466295eb9e0033093abdbaf12ff473fb6 |
child 90152 | d85d2f90b632b95e62c56af90421c4b12a6ba3a3 |
push id | 22323 |
push user | bmo@edmorley.co.uk |
push date | Sat, 24 Mar 2012 16:06:07 +0000 |
treeherder | mozilla-central@20a01901480f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | tbsaunde |
bugs | 706784 |
milestone | 14.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/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -645,17 +645,17 @@ protected: * Cache accessible children. */ virtual void CacheChildren(); /** * Set accessible parent and index in parent. */ virtual void BindToParent(nsAccessible* aParent, PRUint32 aIndexInParent); - void UnbindFromParent(); + virtual void UnbindFromParent(); /** * Return sibling accessible at the given offset. */ virtual nsAccessible* GetSiblingAtOffset(PRInt32 aOffset, nsresult *aError = nsnull) const; /**
--- a/accessible/src/base/nsBaseWidgetAccessible.cpp +++ b/accessible/src/base/nsBaseWidgetAccessible.cpp @@ -243,16 +243,26 @@ nsLinkableAccessible::BindToParent(nsAcc if (nsCoreUtils::HasClickListener(walkUpAcc->GetContent())) { mActionAcc = walkUpAcc; mIsOnclick = true; return; } } } +void +nsLinkableAccessible::UnbindFromParent() +{ + mActionAcc = nsnull; + mIsLink = false; + mIsOnclick = false; + + nsAccessibleWrap::UnbindFromParent(); +} + //////////////////////////////////////////////////////////////////////////////// // nsEnumRoleAccessible //////////////////////////////////////////////////////////////////////////////// nsEnumRoleAccessible:: nsEnumRoleAccessible(nsIContent* aNode, nsDocAccessible* aDoc, roles::Role aRole) : nsAccessibleWrap(aNode, aDoc), mRole(aRole)
--- a/accessible/src/base/nsBaseWidgetAccessible.h +++ b/accessible/src/base/nsBaseWidgetAccessible.h @@ -103,16 +103,17 @@ public: virtual KeyBinding AccessKey() const; // HyperLinkAccessible virtual already_AddRefed<nsIURI> AnchorURIAt(PRUint32 aAnchorIndex); protected: // nsAccessible virtual void BindToParent(nsAccessible* aParent, PRUint32 aIndexInParent); + virtual void UnbindFromParent(); /** * Parent accessible that provides an action for this linkable accessible. */ nsAccessible* mActionAcc; bool mIsLink; bool mIsOnclick; };