<!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>[195547] trunk/Source</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/195547">195547</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 12:29:53 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle soft spaces after accepted candidates
https://bugs.webkit.org/show_bug.cgi?id=153331
-and corresponding-
rdar://problem/23958418
Reviewed by Darin Adler.
Source/WebCore:
Candidates now come with built-in spaces, so we should not insert a space for
them.
* editing/Editor.cpp:
(WebCore::Editor::handleAcceptedCandidate):
New SPI to properly handle these soft spaces.
* platform/spi/mac/NSSpellCheckerSPI.h:
Source/WebKit2:
New member variable m_softSpaceRange keeps track to the NSRange of a soft
space if the last text that was inserted has a soft space at the end.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::WebViewImpl):
The space at the end of candidates is a soft space. If that space exists,
cache the range of the space in m_softSpaceRange.
(WebKit::WebViewImpl::handleAcceptedCandidate):
When new text is inserted, find out if it is being inserted right after a
soft space. If it is, then [NSSpellChecker deletesAutospaceBeforeString] will
tell us if the space needs to be removed. If that is the case, then set the
replacementString to the soft space.
(WebKit::WebViewImpl::insertText):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh">trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebCore/ChangeLog 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-25 Beth Dakin <bdakin@apple.com>
+
+ Handle soft spaces after accepted candidates
+ https://bugs.webkit.org/show_bug.cgi?id=153331
+ -and corresponding-
+ rdar://problem/23958418
+
+ Reviewed by Darin Adler.
+
+ Candidates now come with built-in spaces, so we should not insert a space for
+ them.
+ * editing/Editor.cpp:
+ (WebCore::Editor::handleAcceptedCandidate):
+
+ New SPI to properly handle these soft spaces.
+ * platform/spi/mac/NSSpellCheckerSPI.h:
+
</ins><span class="cx"> 2016-01-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Copy forwarding headers before building a project
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -3562,7 +3562,10 @@
</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><del>- insertText(String(" "), 0);
</del><ins>+
+ // Some candidates come with a space built in, and we do not need to add another space in that case.
+ if (!acceptedCandidate.replacement.endsWith(' '))
+ insertText(ASCIILiteral(" "), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::unifiedTextCheckerEnabled() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> @interface NSSpellChecker ()
</span><span class="cx"> - (NSInteger)requestCandidatesForSelectedRange:(NSRange)selectedRange inString:(NSString *)stringToCheck types:(NSTextCheckingTypes)checkingTypes options:(NSDictionary<NSString *, id> *)options inSpellDocumentWithTag:(NSInteger)tag completionHandler:(void (^)(NSInteger sequenceNumber, NSArray<NSTextCheckingResult *> *candidates))completionHandler;
</span><ins>+- (BOOL)deletesAutospaceBeforeString:(NSString *)string language:(NSString *)language;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 102000
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-01-25 Beth Dakin <bdakin@apple.com>
+
+ Handle soft spaces after accepted candidates
+ https://bugs.webkit.org/show_bug.cgi?id=153331
+ -and corresponding-
+ rdar://problem/23958418
+
+ Reviewed by Darin Adler.
+
+ New member variable m_softSpaceRange keeps track to the NSRange of a soft
+ space if the last text that was inserted has a soft space at the end.
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::WebViewImpl):
+
+ The space at the end of candidates is a soft space. If that space exists,
+ cache the range of the space in m_softSpaceRange.
+ (WebKit::WebViewImpl::handleAcceptedCandidate):
+
+ When new text is inserted, find out if it is being inserted right after a
+ soft space. If it is, then [NSSpellChecker deletesAutospaceBeforeString] will
+ tell us if the space needs to be removed. If that is the case, then set the
+ replacementString to the soft space.
+ (WebKit::WebViewImpl::insertText):
+
</ins><span class="cx"> 2016-01-25 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKitTestRunner: Credential cache is not cleared between tests
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -637,6 +637,7 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><span class="cx"> String m_lastStringForCandidateRequest;
</span><span class="cx"> #endif
</span><ins>+ NSRange m_softSpaceRange { NSNotFound, 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (195546 => 195547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-01-25 20:25:08 UTC (rev 195546)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-01-25 20:29:53 UTC (rev 195547)
</span><span class="lines">@@ -2210,6 +2210,14 @@
</span><span class="cx"> if (m_lastStringForCandidateRequest != postLayoutData.stringForCandidateRequest)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ NSRange range = [acceptedCandidate range];
+ if (acceptedCandidate.replacementString && [acceptedCandidate.replacementString length] > 0) {
+ NSRange replacedRange = NSMakeRange(range.location, [acceptedCandidate.replacementString length]);
+ NSRange softSpaceRange = NSMakeRange(NSMaxRange(replacedRange) - 1, 1);
+ if ([acceptedCandidate.replacementString hasSuffix:@" "])
+ m_softSpaceRange = softSpaceRange;
+ }
+
</ins><span class="cx"> m_page->handleAcceptedCandidate(textCheckingResultFromNSTextCheckingResult(acceptedCandidate));
</span><span class="cx"> }
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><span class="lines">@@ -3511,13 +3519,22 @@
</span><span class="cx"> } else
</span><span class="cx"> text = string;
</span><span class="cx">
</span><ins>+ BOOL needToRemoveSoftSpace = NO;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ if (m_softSpaceRange.location != NSNotFound && (replacementRange.location == NSMaxRange(m_softSpaceRange) || replacementRange.location == NSNotFound) && replacementRange.length == 0 && [[NSSpellChecker sharedSpellChecker] deletesAutospaceBeforeString:text language:nil]) {
+ replacementRange = m_softSpaceRange;
+ needToRemoveSoftSpace = YES;
+ }
+#endif
+ m_softSpaceRange = NSMakeRange(NSNotFound, 0);
+
</ins><span class="cx"> // insertText can be called for several reasons:
</span><span class="cx"> // - If it's from normal key event processing (including key bindings), we save the action to perform it later.
</span><span class="cx"> // - If it's from an input method, then we should insert the text now.
</span><span class="cx"> // - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse),
</span><span class="cx"> // then we also execute it immediately, as there will be no other chance.
</span><span class="cx"> Vector<WebCore::KeypressCommand>* keypressCommands = m_collectedKeypressCommands;
</span><del>- if (keypressCommands) {
</del><ins>+ if (keypressCommands && !needToRemoveSoftSpace) {
</ins><span class="cx"> ASSERT(replacementRange.location == NSNotFound);
</span><span class="cx"> WebCore::KeypressCommand command("insertText:", text);
</span><span class="cx"> keypressCommands->append(command);
</span></span></pre>
</div>
</div>
</body>
</html>