From 5c53d0b96cf9898a0e8d4443f36e4606ecdebf77 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Sun, 30 Sep 2001 20:35:55 +0000 Subject: [PATCH] #79798 r=ftang, sr=kin@netscape.com Cursor is an ambigous term - use caret to refer to the text caret in Bidi functions git-svn-id: svn://10.0.0.236/trunk@104268 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsSelection.cpp | 24 +++++++++---------- mozilla/editor/base/nsHTMLEditRules.cpp | 2 +- mozilla/editor/base/nsTextEditRules.cpp | 2 +- mozilla/editor/base/nsTextEditRulesBidi.cpp | 4 ++-- .../editor/libeditor/html/nsHTMLEditRules.cpp | 2 +- .../editor/libeditor/text/nsTextEditRules.cpp | 2 +- .../libeditor/text/nsTextEditRulesBidi.cpp | 4 ++-- mozilla/layout/base/nsCaret.cpp | 4 ++-- mozilla/layout/base/nsIPresShell.h | 14 +++++------ mozilla/layout/base/nsPresShell.cpp | 12 +++++----- mozilla/layout/base/public/nsIPresShell.h | 14 +++++------ mozilla/layout/base/src/nsCaret.cpp | 4 ++-- mozilla/layout/generic/nsSelection.cpp | 24 +++++++++---------- mozilla/layout/html/base/src/nsPresShell.cpp | 12 +++++----- mozilla/xpfe/bootstrap/mozilla-bin.order | 2 +- 15 files changed, 63 insertions(+), 63 deletions(-) diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp index b16e5b49cdd..d95ae2a8a2a 100644 --- a/mozilla/content/base/src/nsSelection.cpp +++ b/mozilla/content/base/src/nsSelection.cpp @@ -1629,7 +1629,7 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA // set the cursor Bidi level to the paragraph embedding level theFrame->GetBidiProperty(context, nsLayoutAtoms::baseLevel, (void**)&level, sizeof(level) ); - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); break; default: @@ -1640,7 +1640,7 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA { theFrame->GetBidiProperty(context, nsLayoutAtoms::embeddingLevel, (void**)&level, sizeof(level) ); - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); } else BidiLevelFromMove(context, shell, pos.mResultContent, pos.mContentOffset, aKeycode); @@ -2460,7 +2460,7 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, nsIFrame* firstFrame=nsnull; nsIFrame* secondFrame=nsnull; - aPresShell->GetCursorBidiLevel(¤tLevel); + aPresShell->GetCaretBidiLevel(¤tLevel); switch (aKeycode) { @@ -2469,9 +2469,9 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, case nsIDOMKeyEvent::DOM_VK_LEFT: GetPrevNextBidiLevels(aContext, aNode, aContentOffset, &firstFrame, &secondFrame, &firstLevel, &secondLevel); if (HINTLEFT==mHint) - aPresShell->SetCursorBidiLevel(firstLevel); + aPresShell->SetCaretBidiLevel(firstLevel); else - aPresShell->SetCursorBidiLevel(secondLevel); + aPresShell->SetCaretBidiLevel(secondLevel); break; /* @@ -2479,12 +2479,12 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, case nsIDOMKeyEvent::DOM_VK_UP: case nsIDOMKeyEvent::DOM_VK_DOWN: GetPrevNextBidiLevels(aContext, aNode, aContentOffset, &firstFrame, &secondFrame, &firstLevel, &secondLevel); - aPresShell->SetCursorBidiLevel(PR_MIN(firstLevel, secondLevel)); + aPresShell->SetCaretBidiLevel(PR_MIN(firstLevel, secondLevel)); break; */ default: - aPresShell->UndefineCursorBidiLevel(); + aPresShell->UndefineCaretBidiLevel(); } } @@ -2516,7 +2516,7 @@ void nsSelection::BidiLevelFromClick(nsIContent *aNode, PRUint32 aContentOffset) clickInFrame->GetBidiProperty(context, nsLayoutAtoms::embeddingLevel, (void**)&frameLevel, sizeof(frameLevel) ); - shell->SetCursorBidiLevel(frameLevel); + shell->SetCaretBidiLevel(frameLevel); } #endif //IBMBIDI @@ -7596,17 +7596,17 @@ nsTypedSelection::SelectionLanguageChange(PRBool aLangRTL) if ((level != levelBefore) && (level != levelAfter)) level = PR_MIN(levelBefore, levelAfter); if ((level & 1) == aLangRTL) - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); else - shell->SetCursorBidiLevel(level + 1); + shell->SetCaretBidiLevel(level + 1); } else { // if cursor is between characters with opposite orientations, changing the keyboard language must change // the cursor level to that of the adjacent character with the orientation corresponding to the new language. if ((levelBefore & 1) == aLangRTL) - shell->SetCursorBidiLevel(levelBefore); + shell->SetCaretBidiLevel(levelBefore); else - shell->SetCursorBidiLevel(levelAfter); + shell->SetCaretBidiLevel(levelAfter); } #endif // IBMBIDI return NS_OK; diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index 4e022890d87..a2ef60f34ac 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -342,7 +342,7 @@ nsHTMLEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection) nsCOMPtr shell; mEditor->GetPresShell(getter_AddRefs(shell)); if (shell) { - shell->UndefineCursorBidiLevel(); + shell->UndefineCaretBidiLevel(); } } #endif diff --git a/mozilla/editor/base/nsTextEditRules.cpp b/mozilla/editor/base/nsTextEditRules.cpp index cf59ced3e9f..ad5d656bec5 100644 --- a/mozilla/editor/base/nsTextEditRules.cpp +++ b/mozilla/editor/base/nsTextEditRules.cpp @@ -233,7 +233,7 @@ nsTextEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection) nsCOMPtr shell; mEditor->GetPresShell(getter_AddRefs(shell)); if (shell) { - shell->UndefineCursorBidiLevel(); + shell->UndefineCaretBidiLevel(); } } #endif diff --git a/mozilla/editor/base/nsTextEditRulesBidi.cpp b/mozilla/editor/base/nsTextEditRulesBidi.cpp index 5b3213e712c..0aaaa1e1c9b 100644 --- a/mozilla/editor/base/nsTextEditRulesBidi.cpp +++ b/mozilla/editor/base/nsTextEditRulesBidi.cpp @@ -139,7 +139,7 @@ nsTextEditRules::CheckBidiLevelForDeletion(nsIDOMNode *aSelNode, { levelAfter = levelBefore; } - res = shell->GetCursorBidiLevel(¤tCursorLevel); + res = shell->GetCaretBidiLevel(¤tCursorLevel); if (NS_FAILED(res)) return res; levelOfDeletion = (nsIEditor::eNext==aAction) ? levelAfter : levelBefore; @@ -156,7 +156,7 @@ nsTextEditRules::CheckBidiLevelForDeletion(nsIDOMNode *aSelNode, // Set the bidi level of the caret to that of the // character that will be (or would have been) deleted - res = shell->SetCursorBidiLevel(levelOfDeletion); + res = shell->SetCaretBidiLevel(levelOfDeletion); if (NS_FAILED(res)) return res; } diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index 4e022890d87..a2ef60f34ac 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -342,7 +342,7 @@ nsHTMLEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection) nsCOMPtr shell; mEditor->GetPresShell(getter_AddRefs(shell)); if (shell) { - shell->UndefineCursorBidiLevel(); + shell->UndefineCaretBidiLevel(); } } #endif diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp index cf59ced3e9f..ad5d656bec5 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp +++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp @@ -233,7 +233,7 @@ nsTextEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection) nsCOMPtr shell; mEditor->GetPresShell(getter_AddRefs(shell)); if (shell) { - shell->UndefineCursorBidiLevel(); + shell->UndefineCaretBidiLevel(); } } #endif diff --git a/mozilla/editor/libeditor/text/nsTextEditRulesBidi.cpp b/mozilla/editor/libeditor/text/nsTextEditRulesBidi.cpp index 5b3213e712c..0aaaa1e1c9b 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRulesBidi.cpp +++ b/mozilla/editor/libeditor/text/nsTextEditRulesBidi.cpp @@ -139,7 +139,7 @@ nsTextEditRules::CheckBidiLevelForDeletion(nsIDOMNode *aSelNode, { levelAfter = levelBefore; } - res = shell->GetCursorBidiLevel(¤tCursorLevel); + res = shell->GetCaretBidiLevel(¤tCursorLevel); if (NS_FAILED(res)) return res; levelOfDeletion = (nsIEditor::eNext==aAction) ? levelAfter : levelBefore; @@ -156,7 +156,7 @@ nsTextEditRules::CheckBidiLevelForDeletion(nsIDOMNode *aSelNode, // Set the bidi level of the caret to that of the // character that will be (or would have been) deleted - res = shell->SetCursorBidiLevel(levelOfDeletion); + res = shell->SetCaretBidiLevel(levelOfDeletion); if (NS_FAILED(res)) return res; } diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index 0694b42b96e..01eb0531487 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -556,7 +556,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset() if (bidiEnabled) { - presShell->GetCursorBidiLevel(&bidiLevel); + presShell->GetCaretBidiLevel(&bidiLevel); if (bidiLevel & BIDI_LEVEL_UNDEFINED) { PRUint8 newBidiLevel; @@ -568,7 +568,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset() { theFrame->GetBidiProperty(presContext, nsLayoutAtoms::embeddingLevel, (void**)&newBidiLevel, sizeof(newBidiLevel) ); - presShell->SetCursorBidiLevel(newBidiLevel); + presShell->SetCaretBidiLevel(newBidiLevel); bidiLevel = newBidiLevel; } } diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h index 864c97c95ef..a35b36d585c 100644 --- a/mozilla/layout/base/nsIPresShell.h +++ b/mozilla/layout/base/nsIPresShell.h @@ -95,7 +95,7 @@ class nsIDOMNode; #define VERIFY_REFLOW_INCLUDE_SPACE_MANAGER 0x40 #define VERIFY_REFLOW_DURING_RESIZE_REFLOW 0x80 -#ifdef IBMBIDI // Constant for Set/Get CursorBidiLevel +#ifdef IBMBIDI // Constant for Set/Get CaretBidiLevel #define BIDI_LEVEL_UNDEFINED 0x80 #endif @@ -567,19 +567,19 @@ public: #ifdef IBMBIDI /** - * SetCursorBidiLevel will set the Bidi embedding level for the cursor. 0-63 + * SetCaretBidiLevel will set the Bidi embedding level for the cursor. 0-63 */ - NS_IMETHOD SetCursorBidiLevel(PRUint8 aLevel) = 0; + NS_IMETHOD SetCaretBidiLevel(PRUint8 aLevel) = 0; /** - * GetCursorBidiLevel will get the Bidi embedding level for the cursor. 0-63 + * GetCaretBidiLevel will get the Bidi embedding level for the cursor. 0-63 */ - NS_IMETHOD GetCursorBidiLevel(PRUint8 *aOutLevel) = 0; + NS_IMETHOD GetCaretBidiLevel(PRUint8 *aOutLevel) = 0; /** - * UndefineCursorBidiLevel will set the Bidi embedding level for the cursor to an out-of-range value + * UndefineCaretBidiLevel will set the Bidi embedding level for the cursor to an out-of-range value */ - NS_IMETHOD UndefineCursorBidiLevel(void) = 0; + NS_IMETHOD UndefineCaretBidiLevel(void) = 0; /** * Reconstruct and reflow frame model diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 7214a1778d2..d5949ed1713 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -939,9 +939,9 @@ public: NS_IMETHOD IsReflowLocked(PRBool* aIsLocked); #ifdef IBMBIDI - NS_IMETHOD SetCursorBidiLevel(PRUint8 aLevel); - NS_IMETHOD GetCursorBidiLevel(PRUint8 *aOutLevel); - NS_IMETHOD UndefineCursorBidiLevel(); + NS_IMETHOD SetCaretBidiLevel(PRUint8 aLevel); + NS_IMETHOD GetCaretBidiLevel(PRUint8 *aOutLevel); + NS_IMETHOD UndefineCaretBidiLevel(); NS_IMETHOD BidiStyleChangeReflow(); #endif @@ -5322,7 +5322,7 @@ PresShell::GetPlaceholderFrameFor(nsIFrame* aFrame, } #ifdef IBMBIDI NS_IMETHODIMP -PresShell::SetCursorBidiLevel(PRUint8 aLevel) +PresShell::SetCaretBidiLevel(PRUint8 aLevel) { // If the current level is undefined, we have just inserted new text. // In this case, we don't want to reset the keyboard language @@ -5337,7 +5337,7 @@ PresShell::SetCursorBidiLevel(PRUint8 aLevel) } NS_IMETHODIMP -PresShell::GetCursorBidiLevel(PRUint8 *aOutLevel) +PresShell::GetCaretBidiLevel(PRUint8 *aOutLevel) { if (!aOutLevel) { return NS_ERROR_INVALID_ARG; } *aOutLevel = mBidiLevel; @@ -5345,7 +5345,7 @@ PresShell::GetCursorBidiLevel(PRUint8 *aOutLevel) } NS_IMETHODIMP -PresShell::UndefineCursorBidiLevel() +PresShell::UndefineCaretBidiLevel() { mBidiLevel |= BIDI_LEVEL_UNDEFINED; return NS_OK; diff --git a/mozilla/layout/base/public/nsIPresShell.h b/mozilla/layout/base/public/nsIPresShell.h index 864c97c95ef..a35b36d585c 100644 --- a/mozilla/layout/base/public/nsIPresShell.h +++ b/mozilla/layout/base/public/nsIPresShell.h @@ -95,7 +95,7 @@ class nsIDOMNode; #define VERIFY_REFLOW_INCLUDE_SPACE_MANAGER 0x40 #define VERIFY_REFLOW_DURING_RESIZE_REFLOW 0x80 -#ifdef IBMBIDI // Constant for Set/Get CursorBidiLevel +#ifdef IBMBIDI // Constant for Set/Get CaretBidiLevel #define BIDI_LEVEL_UNDEFINED 0x80 #endif @@ -567,19 +567,19 @@ public: #ifdef IBMBIDI /** - * SetCursorBidiLevel will set the Bidi embedding level for the cursor. 0-63 + * SetCaretBidiLevel will set the Bidi embedding level for the cursor. 0-63 */ - NS_IMETHOD SetCursorBidiLevel(PRUint8 aLevel) = 0; + NS_IMETHOD SetCaretBidiLevel(PRUint8 aLevel) = 0; /** - * GetCursorBidiLevel will get the Bidi embedding level for the cursor. 0-63 + * GetCaretBidiLevel will get the Bidi embedding level for the cursor. 0-63 */ - NS_IMETHOD GetCursorBidiLevel(PRUint8 *aOutLevel) = 0; + NS_IMETHOD GetCaretBidiLevel(PRUint8 *aOutLevel) = 0; /** - * UndefineCursorBidiLevel will set the Bidi embedding level for the cursor to an out-of-range value + * UndefineCaretBidiLevel will set the Bidi embedding level for the cursor to an out-of-range value */ - NS_IMETHOD UndefineCursorBidiLevel(void) = 0; + NS_IMETHOD UndefineCaretBidiLevel(void) = 0; /** * Reconstruct and reflow frame model diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp index 0694b42b96e..01eb0531487 100644 --- a/mozilla/layout/base/src/nsCaret.cpp +++ b/mozilla/layout/base/src/nsCaret.cpp @@ -556,7 +556,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset() if (bidiEnabled) { - presShell->GetCursorBidiLevel(&bidiLevel); + presShell->GetCaretBidiLevel(&bidiLevel); if (bidiLevel & BIDI_LEVEL_UNDEFINED) { PRUint8 newBidiLevel; @@ -568,7 +568,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset() { theFrame->GetBidiProperty(presContext, nsLayoutAtoms::embeddingLevel, (void**)&newBidiLevel, sizeof(newBidiLevel) ); - presShell->SetCursorBidiLevel(newBidiLevel); + presShell->SetCaretBidiLevel(newBidiLevel); bidiLevel = newBidiLevel; } } diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index b16e5b49cdd..d95ae2a8a2a 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -1629,7 +1629,7 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA // set the cursor Bidi level to the paragraph embedding level theFrame->GetBidiProperty(context, nsLayoutAtoms::baseLevel, (void**)&level, sizeof(level) ); - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); break; default: @@ -1640,7 +1640,7 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA { theFrame->GetBidiProperty(context, nsLayoutAtoms::embeddingLevel, (void**)&level, sizeof(level) ); - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); } else BidiLevelFromMove(context, shell, pos.mResultContent, pos.mContentOffset, aKeycode); @@ -2460,7 +2460,7 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, nsIFrame* firstFrame=nsnull; nsIFrame* secondFrame=nsnull; - aPresShell->GetCursorBidiLevel(¤tLevel); + aPresShell->GetCaretBidiLevel(¤tLevel); switch (aKeycode) { @@ -2469,9 +2469,9 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, case nsIDOMKeyEvent::DOM_VK_LEFT: GetPrevNextBidiLevels(aContext, aNode, aContentOffset, &firstFrame, &secondFrame, &firstLevel, &secondLevel); if (HINTLEFT==mHint) - aPresShell->SetCursorBidiLevel(firstLevel); + aPresShell->SetCaretBidiLevel(firstLevel); else - aPresShell->SetCursorBidiLevel(secondLevel); + aPresShell->SetCaretBidiLevel(secondLevel); break; /* @@ -2479,12 +2479,12 @@ void nsSelection::BidiLevelFromMove(nsIPresContext* aContext, case nsIDOMKeyEvent::DOM_VK_UP: case nsIDOMKeyEvent::DOM_VK_DOWN: GetPrevNextBidiLevels(aContext, aNode, aContentOffset, &firstFrame, &secondFrame, &firstLevel, &secondLevel); - aPresShell->SetCursorBidiLevel(PR_MIN(firstLevel, secondLevel)); + aPresShell->SetCaretBidiLevel(PR_MIN(firstLevel, secondLevel)); break; */ default: - aPresShell->UndefineCursorBidiLevel(); + aPresShell->UndefineCaretBidiLevel(); } } @@ -2516,7 +2516,7 @@ void nsSelection::BidiLevelFromClick(nsIContent *aNode, PRUint32 aContentOffset) clickInFrame->GetBidiProperty(context, nsLayoutAtoms::embeddingLevel, (void**)&frameLevel, sizeof(frameLevel) ); - shell->SetCursorBidiLevel(frameLevel); + shell->SetCaretBidiLevel(frameLevel); } #endif //IBMBIDI @@ -7596,17 +7596,17 @@ nsTypedSelection::SelectionLanguageChange(PRBool aLangRTL) if ((level != levelBefore) && (level != levelAfter)) level = PR_MIN(levelBefore, levelAfter); if ((level & 1) == aLangRTL) - shell->SetCursorBidiLevel(level); + shell->SetCaretBidiLevel(level); else - shell->SetCursorBidiLevel(level + 1); + shell->SetCaretBidiLevel(level + 1); } else { // if cursor is between characters with opposite orientations, changing the keyboard language must change // the cursor level to that of the adjacent character with the orientation corresponding to the new language. if ((levelBefore & 1) == aLangRTL) - shell->SetCursorBidiLevel(levelBefore); + shell->SetCaretBidiLevel(levelBefore); else - shell->SetCursorBidiLevel(levelAfter); + shell->SetCaretBidiLevel(levelAfter); } #endif // IBMBIDI return NS_OK; diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 7214a1778d2..d5949ed1713 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -939,9 +939,9 @@ public: NS_IMETHOD IsReflowLocked(PRBool* aIsLocked); #ifdef IBMBIDI - NS_IMETHOD SetCursorBidiLevel(PRUint8 aLevel); - NS_IMETHOD GetCursorBidiLevel(PRUint8 *aOutLevel); - NS_IMETHOD UndefineCursorBidiLevel(); + NS_IMETHOD SetCaretBidiLevel(PRUint8 aLevel); + NS_IMETHOD GetCaretBidiLevel(PRUint8 *aOutLevel); + NS_IMETHOD UndefineCaretBidiLevel(); NS_IMETHOD BidiStyleChangeReflow(); #endif @@ -5322,7 +5322,7 @@ PresShell::GetPlaceholderFrameFor(nsIFrame* aFrame, } #ifdef IBMBIDI NS_IMETHODIMP -PresShell::SetCursorBidiLevel(PRUint8 aLevel) +PresShell::SetCaretBidiLevel(PRUint8 aLevel) { // If the current level is undefined, we have just inserted new text. // In this case, we don't want to reset the keyboard language @@ -5337,7 +5337,7 @@ PresShell::SetCursorBidiLevel(PRUint8 aLevel) } NS_IMETHODIMP -PresShell::GetCursorBidiLevel(PRUint8 *aOutLevel) +PresShell::GetCaretBidiLevel(PRUint8 *aOutLevel) { if (!aOutLevel) { return NS_ERROR_INVALID_ARG; } *aOutLevel = mBidiLevel; @@ -5345,7 +5345,7 @@ PresShell::GetCursorBidiLevel(PRUint8 *aOutLevel) } NS_IMETHODIMP -PresShell::UndefineCursorBidiLevel() +PresShell::UndefineCaretBidiLevel() { mBidiLevel |= BIDI_LEVEL_UNDEFINED; return NS_OK; diff --git a/mozilla/xpfe/bootstrap/mozilla-bin.order b/mozilla/xpfe/bootstrap/mozilla-bin.order index 76653d54793..6b6059be26a 100644 --- a/mozilla/xpfe/bootstrap/mozilla-bin.order +++ b/mozilla/xpfe/bootstrap/mozilla-bin.order @@ -9990,7 +9990,7 @@ DidInsertText__15nsTextEditRulesP12nsISelectionUi DidInsert__15nsTextEditRulesP12nsISelectionUi IsMozEditorBogusNode__8nsEditorP10nsIDOMNode IsEditable__8nsEditorP10nsIDOMNode -UndefineCursorBidiLevel__9PresShell +UndefineCaretBidiLevel__9PresShell EndUpdateViewBatch__8nsEditor GetCaretVisible__7nsCaretPi EndReflowBatching__9PresShelli