Merge mozilla-central into mozilla-inbound

This commit is contained in:
Ehsan Akhgari 2011-07-19 14:25:04 -04:00
commit 8809f5457f
3 changed files with 9 additions and 2 deletions

View File

@ -377,6 +377,12 @@ nsApplicationAccessible::InvalidateChildren()
// and RemoveChild() method calls.
}
KeyBinding
nsApplicationAccessible::AccessKey() const
{
return KeyBinding();
}
////////////////////////////////////////////////////////////////////////////////
// nsAccessible protected methods

View File

@ -129,6 +129,9 @@ public:
virtual void InvalidateChildren();
// ActionAccessible
virtual KeyBinding AccessKey() const;
protected:
// nsAccessible

View File

@ -1283,7 +1283,6 @@ var SelectionHelper = {
messageManager.addMessageListener("Browser:SelectionRange", this);
messageManager.addMessageListener("Browser:SelectionCopied", this);
Services.prefs.setBoolPref("accessibility.browsewithcaret", true);
this.popupState.target.messageManager.sendAsyncMessage("Browser:SelectionStart", { x: this.popupState.x, y: this.popupState.y });
BrowserUI.pushPopup(this, [this._start, this._end]);
@ -1313,7 +1312,6 @@ var SelectionHelper = {
}
this.popupState = null;
Services.prefs.setBoolPref("accessibility.browsewithcaret", false);
this._start.hidden = true;
this._end.hidden = true;