mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 04:45:45 +00:00
Bug 1497480 - Part 1: Set the root for spelling checker to shadow root if the contenteditable nodes are in the shadow DOM; r=smaug
Differential Revision: https://phabricator.services.mozilla.com/D9542 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
e5453b98ac
commit
fbdd9bcacf
@ -1370,8 +1370,12 @@ nsresult mozInlineSpellChecker::DoSpellCheck(mozInlineSpellWordUtil& aWordUtil,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
aWordUtil.SetEnd(endNode, endOffset);
|
||||
aWordUtil.SetPosition(beginNode, beginOffset);
|
||||
nsresult rv =
|
||||
aWordUtil.SetPositionAndEnd(beginNode, beginOffset, endNode, endOffset);
|
||||
if (NS_FAILED(rv)) {
|
||||
// Just bail out and don't try to spell-check this
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
// aWordUtil.SetPosition flushes pending notifications, check editor again.
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include "mozInlineSpellWordUtil.h"
|
||||
|
||||
#include "mozilla/BinarySearch.h"
|
||||
#include "mozilla/HTMLEditor.h"
|
||||
#include "mozilla/TextEditor.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
|
||||
@ -60,8 +61,10 @@ mozInlineSpellWordUtil::Init(TextEditor* aTextEditor)
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Find the root node for the editor. For contenteditable we'll need something
|
||||
// cleverer here.
|
||||
mIsContentEditableOrDesignMode = !!aTextEditor->AsHTMLEditor();
|
||||
|
||||
// Find the root node for the editor. For contenteditable the mRootNode could
|
||||
// change to shadow root if the begin and end are inside the shadowDOM.
|
||||
mRootNode = aTextEditor->GetRoot();
|
||||
if (NS_WARN_IF(!mRootNode)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
@ -145,7 +148,7 @@ FindNextTextNode(nsINode* aNode, int32_t aOffset, nsINode* aRoot)
|
||||
return checkNode;
|
||||
}
|
||||
|
||||
// mozInlineSpellWordUtil::SetEnd
|
||||
// mozInlineSpellWordUtil::SetPositionAndEnd
|
||||
//
|
||||
// We have two ranges "hard" and "soft". The hard boundary is simply
|
||||
// the scope of the root node. The soft boundary is that which is set
|
||||
@ -163,34 +166,44 @@ FindNextTextNode(nsINode* aNode, int32_t aOffset, nsINode* aRoot)
|
||||
// position.
|
||||
|
||||
nsresult
|
||||
mozInlineSpellWordUtil::SetEnd(nsINode* aEndNode, int32_t aEndOffset)
|
||||
mozInlineSpellWordUtil::SetPositionAndEnd(nsINode* aPositionNode,
|
||||
int32_t aPositionOffset,
|
||||
nsINode* aEndNode,
|
||||
int32_t aEndOffset)
|
||||
{
|
||||
MOZ_ASSERT(aPositionNode, "Null begin node?");
|
||||
MOZ_ASSERT(aEndNode, "Null end node?");
|
||||
|
||||
NS_ASSERTION(mRootNode, "Not initialized");
|
||||
|
||||
// Find a appropriate root if we are dealing with contenteditable nodes which
|
||||
// are in the shadow DOM.
|
||||
if (mIsContentEditableOrDesignMode) {
|
||||
nsINode* rootNode = aPositionNode->SubtreeRoot();
|
||||
if (rootNode != aEndNode->SubtreeRoot()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (ShadowRoot::FromNode(rootNode)) {
|
||||
mRootNode = rootNode;
|
||||
}
|
||||
}
|
||||
|
||||
InvalidateWords();
|
||||
|
||||
if (!IsSpellCheckingTextNode(aPositionNode)) {
|
||||
// Start at the start of the first text node after aNode/aOffset.
|
||||
aPositionNode = FindNextTextNode(aPositionNode, aPositionOffset, mRootNode);
|
||||
aPositionOffset = 0;
|
||||
}
|
||||
mSoftBegin = NodeOffset(aPositionNode, aPositionOffset);
|
||||
|
||||
if (!IsSpellCheckingTextNode(aEndNode)) {
|
||||
// End at the start of the first text node after aEndNode/aEndOffset.
|
||||
aEndNode = FindNextTextNode(aEndNode, aEndOffset, mRootNode);
|
||||
aEndOffset = 0;
|
||||
}
|
||||
mSoftEnd = NodeOffset(aEndNode, aEndOffset);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
mozInlineSpellWordUtil::SetPosition(nsINode* aNode, int32_t aOffset)
|
||||
{
|
||||
InvalidateWords();
|
||||
|
||||
if (!IsSpellCheckingTextNode(aNode)) {
|
||||
// Start at the start of the first text node after aNode/aOffset.
|
||||
aNode = FindNextTextNode(aNode, aOffset, mRootNode);
|
||||
aOffset = 0;
|
||||
}
|
||||
mSoftBegin = NodeOffset(aNode, aOffset);
|
||||
|
||||
nsresult rv = EnsureWords();
|
||||
if (NS_FAILED(rv)) {
|
||||
@ -198,8 +211,10 @@ mozInlineSpellWordUtil::SetPosition(nsINode* aNode, int32_t aOffset)
|
||||
}
|
||||
|
||||
int32_t textOffset = MapDOMPositionToSoftTextOffset(mSoftBegin);
|
||||
if (textOffset < 0)
|
||||
if (textOffset < 0) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
mNextWordIndex = FindRealWordContaining(textOffset, HINT_END, true);
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -80,29 +80,27 @@ public:
|
||||
* The basic operation is:
|
||||
*
|
||||
* 1. Call Init with the weak pointer to the editor that you're using.
|
||||
* 2. Call SetEnd to set where you want to stop spellchecking. We'll stop
|
||||
* at the word boundary after that. If SetEnd is not called, we'll stop
|
||||
* at the end of the document's root element.
|
||||
* 3. Call SetPosition to initialize the current position inside the
|
||||
* previously given range.
|
||||
* 4. Call GetNextWord over and over until it returns false.
|
||||
* 2. Call SetPositionAndEnd to to initialize the current position inside the
|
||||
* previously given range and set where you want to stop spellchecking.
|
||||
* We'll stop at the word boundary after that. If SetEnd is not called,
|
||||
* we'll stop at the end of the root element.
|
||||
* 3. Call GetNextWord over and over until it returns false.
|
||||
*/
|
||||
|
||||
class MOZ_STACK_CLASS mozInlineSpellWordUtil
|
||||
{
|
||||
public:
|
||||
mozInlineSpellWordUtil()
|
||||
: mRootNode(nullptr),
|
||||
: mIsContentEditableOrDesignMode(false), mRootNode(nullptr),
|
||||
mSoftBegin(nullptr, 0), mSoftEnd(nullptr, 0),
|
||||
mNextWordIndex(-1), mSoftTextValid(false) {}
|
||||
|
||||
nsresult Init(mozilla::TextEditor* aTextEditor);
|
||||
|
||||
nsresult SetEnd(nsINode* aEndNode, int32_t aEndOffset);
|
||||
|
||||
// sets the current position, this should be inside the range. If we are in
|
||||
// the middle of a word, we'll move to its start.
|
||||
nsresult SetPosition(nsINode* aNode, int32_t aOffset);
|
||||
nsresult SetPositionAndEnd(nsINode* aPositionNode, int32_t aPositionOffset,
|
||||
nsINode* aEndNode, int32_t aEndOffset);
|
||||
|
||||
// Given a point inside or immediately following a word, this returns the
|
||||
// DOM range that exactly encloses that word's characters. The current
|
||||
@ -138,6 +136,7 @@ private:
|
||||
|
||||
// cached stuff for the editor, set by Init
|
||||
nsCOMPtr<nsIDocument> mDocument;
|
||||
bool mIsContentEditableOrDesignMode;
|
||||
|
||||
// range to check, see SetPosition and SetEnd
|
||||
nsINode* mRootNode;
|
||||
|
Loading…
Reference in New Issue
Block a user