зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1387143 part 15. Remove nsISelectionPrivate::Get/SetSelectionDirection. r=mats
This commit is contained in:
Родитель
b904b76fa3
Коммит
7fe6dda3aa
|
@ -4119,16 +4119,6 @@ Selection::ResetColors(ErrorResult& aRv)
|
|||
mCustomColors = nullptr;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP_(nsDirection)
|
||||
Selection::GetSelectionDirection() {
|
||||
return mDirection;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP_(void)
|
||||
Selection::SetSelectionDirection(nsDirection aDirection) {
|
||||
mDirection = aDirection;
|
||||
}
|
||||
|
||||
JSObject*
|
||||
Selection::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
|
|
|
@ -31,12 +31,6 @@ native ScrollAxis(nsIPresShell::ScrollAxis);
|
|||
[uuid(0c9f4f74-ee7e-4fe9-be6b-0ba856368178)]
|
||||
interface nsISelectionPrivate : nsISupports
|
||||
{
|
||||
/**
|
||||
* Get the direction of the selection.
|
||||
*/
|
||||
[noscript, notxpcom] nsDirection getSelectionDirection();
|
||||
[noscript, notxpcom] void setSelectionDirection(in nsDirection aDirection);
|
||||
|
||||
/**
|
||||
* Returns the type of the selection (see nsISelectionController for
|
||||
* available constants).
|
||||
|
|
|
@ -1662,7 +1662,7 @@ nsTextEditorState::GetSelectionDirection(ErrorResult& aRv)
|
|||
return nsITextControlFrame::eForward; // Doesn't really matter
|
||||
}
|
||||
|
||||
nsDirection direction = sel->GetSelectionDirection();
|
||||
nsDirection direction = sel->GetDirection();
|
||||
if (direction == eDirNext) {
|
||||
return nsITextControlFrame::eForward;
|
||||
}
|
||||
|
|
|
@ -887,13 +887,10 @@ nsTextControlFrame::SetSelectionInternal(nsINode* aStartNode,
|
|||
selCon->GetSelection(nsISelectionController::SELECTION_NORMAL);
|
||||
NS_ENSURE_TRUE(selection, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsISelectionPrivate> selPriv = do_QueryObject(selection, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsDirection direction;
|
||||
if (aDirection == eNone) {
|
||||
// Preserve the direction
|
||||
direction = selPriv->GetSelectionDirection();
|
||||
direction = selection->GetDirection();
|
||||
} else {
|
||||
direction = (aDirection == eBackward) ? eDirPrevious : eDirNext;
|
||||
}
|
||||
|
@ -909,7 +906,7 @@ nsTextControlFrame::SetSelectionInternal(nsINode* aStartNode,
|
|||
return err.StealNSResult();
|
||||
}
|
||||
|
||||
selPriv->SetSelectionDirection(direction);
|
||||
selection->SetDirection(direction);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче