<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196090] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196090">196090</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-02-03 16:01:46 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Accepted candidates should not be autocorrected
https://bugs.webkit.org/show_bug.cgi?id=153813
-and corresponding-
rdar://problem/24066924
Reviewed by Darin Adler.
New document marker to mark inserted candidates. This was we can treat
inserted candidates just like a RejectedCorrection and we won’t accidentally
autocorrect them later on.
* dom/DocumentMarker.h:
(WebCore::DocumentMarker::AllMarkers::AllMarkers):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::processMarkersOnTextToBeReplacedByResult):
When handling an acceptant candidate, set m_isHandlingAcceptedCandidate to
true while the text is being inserted, and then mark the range as an accepted
candidate.
* editing/Editor.cpp:
(WebCore::Editor::handleAcceptedCandidate):
* editing/Editor.h:
(WebCore::Editor::isHandlingAcceptedCandidate):
If frame.editor. isHandlingAcceptedCandidate() then return early from
markMisspellingsAfterTyping.
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::markMisspellingsAfterTyping):
Add some test infrastructure.
* testing/Internals.cpp:
(WebCore::Internals::handleAcceptedCandidate):
* testing/Internals.h:
* testing/Internals.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerh">trunk/Source/WebCore/dom/DocumentMarker.h</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-02-03 Beth Dakin <bdakin@apple.com>
+
+ Accepted candidates should not be autocorrected
+ https://bugs.webkit.org/show_bug.cgi?id=153813
+ -and corresponding-
+ rdar://problem/24066924
+
+ Reviewed by Darin Adler.
+
+ New document marker to mark inserted candidates. This was we can treat
+ inserted candidates just like a RejectedCorrection and we won’t accidentally
+ autocorrect them later on.
+ * dom/DocumentMarker.h:
+ (WebCore::DocumentMarker::AllMarkers::AllMarkers):
+ * editing/AlternativeTextController.cpp:
+ (WebCore::AlternativeTextController::processMarkersOnTextToBeReplacedByResult):
+
+ When handling an acceptant candidate, set m_isHandlingAcceptedCandidate to
+ true while the text is being inserted, and then mark the range as an accepted
+ candidate.
+ * editing/Editor.cpp:
+ (WebCore::Editor::handleAcceptedCandidate):
+ * editing/Editor.h:
+ (WebCore::Editor::isHandlingAcceptedCandidate):
+
+ If frame.editor. isHandlingAcceptedCandidate() then return early from
+ markMisspellingsAfterTyping.
+ * editing/TypingCommand.cpp:
+ (WebCore::TypingCommand::markMisspellingsAfterTyping):
+
+ Add some test infrastructure.
+ * testing/Internals.cpp:
+ (WebCore::Internals::handleAcceptedCandidate):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-02-03 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Pass entire request (rather than just URL) to clients of WebCoreAVCFResourceLoader
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarker.h (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarker.h 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/dom/DocumentMarker.h 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> DictationPhraseWithAlternatives = 1 << 11,
</span><span class="cx"> DictationResult = 1 << 12,
</span><span class="cx"> #endif
</span><ins>+ // This marker indicates that the user has selected a text candidate.
+ AcceptedCandidate = 1 << 13,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MarkerTypes {
</span><span class="lines">@@ -102,12 +104,12 @@
</span><span class="cx"> AllMarkers()
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #if !ENABLE(TELEPHONE_NUMBER_DETECTION)
</span><del>- : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives)
</del><ins>+ : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives | AcceptedCandidate)
</ins><span class="cx"> #else
</span><del>- : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives | TelephoneNumber)
</del><ins>+ : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives | TelephoneNumber | AcceptedCandidate)
</ins><span class="cx"> #endif // !ENABLE(TELEPHONE_NUMBER_DETECTION)
</span><span class="cx"> #else
</span><del>- : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives | TelephoneNumber | DictationPhraseWithAlternatives | DictationResult)
</del><ins>+ : MarkerTypes(Spelling | Grammar | TextMatch | Replacement | CorrectionIndicator | RejectedCorrection | Autocorrected | SpellCheckingExemption | DeletedAutocorrection | DictationAlternatives | TelephoneNumber | DictationPhraseWithAlternatives | DictationResult | AcceptedCandidate)
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -600,6 +600,9 @@
</span><span class="cx"> if (markerController.hasMarkers(rangeWithAlternative, DocumentMarker::RejectedCorrection))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (markerController.hasMarkers(rangeWithAlternative, DocumentMarker::AcceptedCandidate))
+ return false;
+
</ins><span class="cx"> Position beginningOfRange = rangeWithAlternative->startPosition();
</span><span class="cx"> Position precedingCharacterPosition = beginningOfRange.previous();
</span><span class="cx"> RefPtr<Range> precedingCharacterRange = Range::create(*m_frame.document(), precedingCharacterPosition, beginningOfRange);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -3557,15 +3557,26 @@
</span><span class="cx"> {
</span><span class="cx"> const VisibleSelection& selection = m_frame.selection().selection();
</span><span class="cx"> RefPtr<Range> candidateRange = candidateRangeForSelection(m_frame);
</span><ins>+ int candidateLength = acceptedCandidate.length;
</ins><span class="cx">
</span><ins>+ m_isHandlingAcceptedCandidate = true;
+
</ins><span class="cx"> if (candidateWouldReplaceText(selection))
</span><span class="cx"> m_frame.selection().setSelectedRange(candidateRange.get(), UPSTREAM, true);
</span><span class="cx">
</span><span class="cx"> insertText(acceptedCandidate.replacement, 0);
</span><span class="cx">
</span><span class="cx"> // Some candidates come with a space built in, and we do not need to add another space in that case.
</span><del>- if (!acceptedCandidate.replacement.endsWith(' '))
</del><ins>+ if (!acceptedCandidate.replacement.endsWith(' ')) {
</ins><span class="cx"> insertText(ASCIILiteral(" "), 0);
</span><ins>+ ++candidateLength;
+ }
+
+ RefPtr<Range> insertedCandidateRange = rangeExpandedAroundPositionByCharacters(selection.visibleStart(), candidateLength);
+ if (insertedCandidateRange)
+ insertedCandidateRange->startContainer().document().markers().addMarker(insertedCandidateRange.get(), DocumentMarker::AcceptedCandidate, acceptedCandidate.replacement);
+
+ m_isHandlingAcceptedCandidate = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::unifiedTextCheckerEnabled() const
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/editing/Editor.h 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -457,6 +457,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String stringForCandidateRequest() const;
</span><span class="cx"> WEBCORE_EXPORT void handleAcceptedCandidate(TextCheckingResult);
</span><ins>+ bool isHandlingAcceptedCandidate() const { return m_isHandlingAcceptedCandidate; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> class WebContentReader;
</span><span class="lines">@@ -519,6 +520,7 @@
</span><span class="cx"> Timer m_editorUIUpdateTimer;
</span><span class="cx"> bool m_editorUIUpdateTimerShouldCheckSpellingAndGrammar;
</span><span class="cx"> bool m_editorUIUpdateTimerWasTriggeredByDictation;
</span><ins>+ bool m_isHandlingAcceptedCandidate { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
</span><span class="cx"> bool shouldDetectTelephoneNumbers();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -301,6 +301,8 @@
</span><span class="cx"> && !frame.editor().isAutomaticDashSubstitutionEnabled()
</span><span class="cx"> && !frame.editor().isAutomaticTextReplacementEnabled())
</span><span class="cx"> return;
</span><ins>+ if (frame.editor().isHandlingAcceptedCandidate())
+ return;
</ins><span class="cx"> #else
</span><span class="cx"> if (!frame.editor().isContinuousSpellCheckingEnabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -1790,6 +1790,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::handleAcceptedCandidate(const String& candidate, ExceptionCode&)
+{
+ if (!contextDocument() || !contextDocument()->frame())
+ return;
+
+ TextCheckingResult result;
+ result.type = TextCheckingTypeNone;
+ result.length = candidate.length();
+ result.replacement = candidate;
+ contextDocument()->frame()->editor().handleAcceptedCandidate(result);
+}
+
</ins><span class="cx"> bool Internals::isOverwriteModeEnabled(ExceptionCode&)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/testing/Internals.h 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -221,6 +221,8 @@
</span><span class="cx"> void setAutomaticTextReplacementEnabled(bool enabled, ExceptionCode&);
</span><span class="cx"> void setAutomaticSpellingCorrectionEnabled(bool enabled, ExceptionCode&);
</span><span class="cx">
</span><ins>+ void handleAcceptedCandidate(const String& candidate, ExceptionCode&);
+
</ins><span class="cx"> bool isOverwriteModeEnabled(ExceptionCode&);
</span><span class="cx"> void toggleOverwriteModeEnabled(ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (196089 => 196090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-02-04 00:00:24 UTC (rev 196089)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-02-04 00:01:46 UTC (rev 196090)
</span><span class="lines">@@ -205,6 +205,8 @@
</span><span class="cx"> [RaisesException] void setAutomaticTextReplacementEnabled(boolean enabled);
</span><span class="cx"> [RaisesException] void setAutomaticSpellingCorrectionEnabled(boolean enabled);
</span><span class="cx">
</span><ins>+ [RaisesException] void handleAcceptedCandidate(DOMString candidate);
+
</ins><span class="cx"> [RaisesException] boolean isOverwriteModeEnabled();
</span><span class="cx"> [RaisesException] void toggleOverwriteModeEnabled();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>