Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

Issue 2457523003: Support 'insertReplacementText' for spellcheck (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
index 9c780a63b799d153c031bb37dc2ea6248d9a54fb..29e7f844ccf14cc3da9a83db349002543f1157da 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
@@ -28,10 +28,12 @@
#include "core/HTMLNames.h"
#include "core/InputTypeNames.h"
+#include "core/clipboard/DataObject.h"
#include "core/dom/Document.h"
#include "core/dom/Element.h"
#include "core/dom/ElementTraversal.h"
#include "core/dom/NodeTraversal.h"
+#include "core/dom/Range.h"
#include "core/editing/EditingUtilities.h"
#include "core/editing/Editor.h"
#include "core/editing/EphemeralRange.h"
@@ -818,14 +820,39 @@ void SpellChecker::replaceMisspelledRange(const String& text) {
markers[0]->endOffset()));
if (markerRange.isNull())
return;
+
frame().selection().setSelection(
SelectionInDOMTree::Builder().setBaseAndExtent(markerRange).build());
- // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
- // needs to be audited. See http://crbug.com/590369 for more details.
- frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+ // Dispatch 'beforeinput'.
+ Element* target = frame().editor().findEventTargetFromSelection();
+ RangeVector* ranges = new RangeVector(
+ 1, createRange(
+ frame().selection().selection().toNormalizedEphemeralRange()));
chongz 2016/10/27 16:41:24 I think you can just do ``` new RangeVector(1, m_f
+
+ bool cancel = dispatchBeforeInputPlainText(
+ target, InputEvent::InputType::InsertReplacementText, text,
+ DataTransfer::DataTransferType::InsertReplacementText,
+ DataTransferAccessPolicy::DataTransferReadable,
+ ranges) != DispatchEventResult::NotCanceled;
chongz 2016/10/27 16:41:25 Can you add the following check after dispatching
- frame().editor().replaceSelectionWithText(text, false, false);
+ if (cancel) {
+ // reset selection
+ frame().selection().setSelection(SelectionInDOMTree::Builder()
chongz 2016/10/27 16:41:25 Thinking more about this I think we shouldn't rese
+ .collapse(markerRange.endPosition())
+ .build(),
+ FrameSelection::CloseTyping |
+ FrameSelection::ClearTypingStyle |
+ FrameSelection::DoNotSetFocus);
+ frame().selection().revealSelection();
+ } else {
+ // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+ // needs to be audited. See http://crbug.com/590369 for more details.
+ frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+ frame().editor().replaceSelectionWithText(
chongz 2016/10/27 16:41:25 Actually can we dispatch 'beforeinput' right befor
chaopeng 2016/10/28 00:33:08 frame().document()->updateStyleAndLayoutIgnorePend
chongz 2016/10/28 02:12:16 I see, I'm not sure how |updateStyleAndLayoutIgnor
+ text, false, false, InputEvent::InputType::InsertReplacementText);
+ }
}
static bool shouldCheckOldSelection(const Position& oldSelectionStart) {

Powered by Google App Engine
This is Rietveld 408576698