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

Bug 1393348 - part1: nsTextEditorState should use nsTextInputSelectionImpl::GetSelection(SelectionType) instead of nsTextInputSelectionImpl::GetSelection(RawSelectionType, nsISelection**) r=m_kato

Browse Source 
nsTextEditorState stores selection controller as
RefPtr<nsTextInputSelectionImpl> mSelCon.  However, some methods still use
nsTextInputSelectionImpl::GetSelection(RawSelectionType, nsISelection**) which
is a virtual method overriding nsISelectionController.

So, instead, we should make it use
nsTextInputSelectionImpl::GetSelection(SelectionType).

MozReview-Commit-ID: Cvxa85LegsO
This commit is contained in:
Masayuki Nakano
2017-08-24 16:19:28 +09:00
parent 9e8b92adb7
commit f9b51f8ff0
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
dom/html/nsTextEditorState.cpp
View File

@@ -504,10 +504,11 @@ nsTextInputSelectionImpl::SetCaretReadOnly(bool aReadOnly)
{
RefPtr<nsCaret> caret = shell->GetCaret();
if (caret) {
nsISelection* domSel =
Selection* selection =
mFrameSelection->GetSelection(SelectionType::eNormal);
if (domSel)
if (selection) {
caret->SetCaretReadOnly(aReadOnly);
}
return NS_OK;
}
}
@@ -547,10 +548,11 @@ nsTextInputSelectionImpl::SetCaretVisibilityDuringSelection(bool aVisibility)
{
RefPtr<nsCaret> caret = shell->GetCaret();
if (caret) {
nsISelection* domSel =
Selection* selection =
mFrameSelection->GetSelection(SelectionType::eNormal);
if (domSel)
if (selection) {
caret->SetVisibilityDuringSelection(aVisibility);
}
return NS_OK;
}
}
@@ -1338,22 +1340,16 @@ nsTextEditorState::BindToFrame(nsTextControlFrame* aFrame)
mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_ON);
// Get the caret and make it a selection listener.
RefPtr<nsISelection> domSelection;
if (NS_SUCCEEDED(mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL,
getter_AddRefs(domSelection))) &&
domSelection) {
nsCOMPtr<nsISelectionPrivate> selPriv(do_QueryInterface(domSelection));
// FYI: It's safe to use raw pointer for calling
// Selection::AddSelectionListner() because it only appends the listener
// to its internal array.
Selection* selection = mSelCon->GetSelection(SelectionType::eNormal);
if (selection) {
RefPtr<nsCaret> caret = shell->GetCaret();
nsCOMPtr<nsISelectionListener> listener;
if (caret) {
listener = do_QueryInterface(caret);
if (listener) {
selPriv->AddSelectionListener(listener);
}
selection->AddSelectionListener(caret);
}
selPriv->AddSelectionListener(static_cast<nsISelectionListener*>
(mTextListener));
selection->AddSelectionListener(mTextListener);
}
// If an editor exists from before, prepare it for usage
@@ -2208,14 +2204,13 @@ nsTextEditorState::UnbindFromFrame(nsTextControlFrame* aFrame)
if (mSelCon) {
if (mTextListener) {
RefPtr<nsISelection> domSelection;
if (NS_SUCCEEDED(mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL,
getter_AddRefs(domSelection))) &&
domSelection) {
nsCOMPtr<nsISelectionPrivate> selPriv(do_QueryInterface(domSelection));
selPriv->RemoveSelectionListener(static_cast<nsISelectionListener*>
(mTextListener));
// FYI: It's safe to use raw pointer for calling
// Selection::RemoveSelectionListener() because it only removes the
// listener from its array.
Selection* selection =
mSelCon->GetSelection(SelectionType::eNormal);
if (selection) {
selection->RemoveSelectionListener(mTextListener);
}
}
@@ -2647,11 +2642,11 @@ nsTextEditorState::SetValue(const nsAString& aValue, const nsAString* aOldValue,
{
AutoNoJSAPI nojsapi;
nsCOMPtr<nsISelection> domSel;
mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL,
getter_AddRefs(domSel));
SelectionBatcher selectionBatcher(domSel ? domSel->AsSelection() :
nullptr);
// FYI: It's safe to use raw pointer for selection here because
// SelectionBatcher will grab it with RefPtr.
Selection* selection =
mSelCon->GetSelection(SelectionType::eNormal);
SelectionBatcher selectionBatcher(selection);
if (NS_WARN_IF(!weakFrame.IsAlive())) {
return true;
@@ -2694,10 +2689,10 @@ nsTextEditorState::SetValue(const nsAString& aValue, const nsAString* aOldValue,
}
} else {
AutoDisableUndo disableUndo(textEditor);
if (domSel) {
if (selection) {
// Since we don't use undo transaction, we don't need to store
// selection state. SetText will set selection to tail.
domSel->RemoveAllRanges();
selection->RemoveAllRanges();
}
textEditor->SetText(newValue);