corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1387143 part 28. Remove nsISelection::AsSelection(). r=mats

Browse Source
This commit is contained in:
Boris Zbarsky
2018-05-08 13:52:42 -04:00
parent bcab2c9f4c
commit deb12f1f80
20 changed files with 43 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
accessible/base/SelectionManager.cpp
View File

@@ -48,19 +48,16 @@ SelectionManager::SelectionManager() :
void
SelectionManager::ClearControlSelectionListener()
{
// Remove 'this' registered as selection listener for the normal selection.
nsCOMPtr<nsISelection> normalSel = do_QueryReferent(mCurrCtrlNormalSel);
if (normalSel) {
normalSel->AsSelection()->RemoveSelectionListener(this);
if (mCurrCtrlNormalSel) {
mCurrCtrlNormalSel->RemoveSelectionListener(this);
mCurrCtrlNormalSel = nullptr;
}
// Remove 'this' registered as selection listener for the spellcheck
// selection.
nsCOMPtr<nsISelection> spellSel = do_QueryReferent(mCurrCtrlSpellSel);
if (spellSel) {
spellSel->AsSelection()->RemoveSelectionListener(this);
if (mCurrCtrlSpellSel) {
mCurrCtrlSpellSel->RemoveSelectionListener(this);
mCurrCtrlSpellSel = nullptr;
}
}
@@ -85,12 +82,12 @@ SelectionManager::SetControlSelectionListener(dom::Element* aFocusedElm)
// Register 'this' as selection listener for the normal selection.
Selection* normalSel = frameSel->GetSelection(SelectionType::eNormal);
normalSel->AddSelectionListener(this);
mCurrCtrlNormalSel = do_GetWeakReference(normalSel);
mCurrCtrlNormalSel = normalSel;
// Register 'this' as selection listener for the spell check selection.
Selection* spellSel = frameSel->GetSelection(SelectionType::eSpellCheck);
spellSel->AddSelectionListener(this);
mCurrCtrlSpellSel = do_GetWeakReference(spellSel);
mCurrCtrlSpellSel = spellSel;
}
void