<!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>[195552] trunk/Source/WebKit/mac</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/195552">195552</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 13:38:07 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK1: Handle soft spaces after accepted candidates
https://bugs.webkit.org/show_bug.cgi?id=153442
-and corresponding-
rdar://problem/23958418
Reviewed by Tim Horton.
The space at the end of candidates is a soft space. If that space exists,
cache the range of the space in m_softSpaceRange.
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::handleAcceptedCandidate):
New ivar in WebHTMLViewPrivate softSpaceRange keeps track to the NSRange of a
soft space if the last text that was inserted has a soft space at the end.
* WebView/WebHTMLView.mm:
(-[WebHTMLView initWithFrame:]):
(-[WebHTMLView _setSoftSpaceRange:]):
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.
(-[WebHTMLView insertText:]):
* WebView/WebHTMLViewInternal.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewInternalh">trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (195551 => 195552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-25 21:12:22 UTC (rev 195551)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-25 21:38:07 UTC (rev 195552)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-01-25 Beth Dakin <bdakin@apple.com>
+
+ WK1: Handle soft spaces after accepted candidates
+ https://bugs.webkit.org/show_bug.cgi?id=153442
+ -and corresponding-
+ rdar://problem/23958418
+
+ Reviewed by Tim Horton.
+
+ The space at the end of candidates is a soft space. If that space exists,
+ cache the range of the space in m_softSpaceRange.
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::handleAcceptedCandidate):
+
+ New ivar in WebHTMLViewPrivate softSpaceRange keeps track to the NSRange of a
+ soft space if the last text that was inserted has a soft space at the end.
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView initWithFrame:]):
+ (-[WebHTMLView _setSoftSpaceRange:]):
+
+ 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.
+ (-[WebHTMLView insertText:]):
+ * WebView/WebHTMLViewInternal.h:
+
</ins><span class="cx"> 2016-01-17 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (195551 => 195552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-01-25 21:12:22 UTC (rev 195551)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-01-25 21:38:07 UTC (rev 195552)
</span><span class="lines">@@ -1215,6 +1215,17 @@
</span><span class="cx"> if (selection != m_lastSelectionForRequestedCandidates)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ NSView <WebDocumentView> *view = [[[m_webView selectedFrame] frameView] documentView];
+ if ([view isKindOfClass:[WebHTMLView class]]) {
+ 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:@" "])
+ [(WebHTMLView *)view _setSoftSpaceRange:softSpaceRange];
+ }
+ }
+
</ins><span class="cx"> frame->editor().handleAcceptedCandidate(textCheckingResultFromNSTextCheckingResult(acceptedCandidate));
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (195551 => 195552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-01-25 21:12:22 UTC (rev 195551)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-01-25 21:38:07 UTC (rev 195552)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/NSSpellCheckerSPI.h>
</ins><span class="cx"> #import <WebCore/NSURLFileTypeMappingsSPI.h>
</span><span class="cx"> #import <WebCore/NSViewSPI.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="lines">@@ -977,6 +978,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> BOOL installedTrackingArea;
</span><span class="cx"> id flagsChangedEventMonitor;
</span><ins>+ NSRange softSpaceRange;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -2844,6 +2846,7 @@
</span><span class="cx"> _private = [[WebHTMLViewPrivate alloc] init];
</span><span class="cx">
</span><span class="cx"> _private->pluginController = [[WebPluginController alloc] initWithDocumentView:self];
</span><ins>+ _private->softSpaceRange = NSMakeRange(NSNotFound, 0);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> [[NSNotificationCenter defaultCenter]
</span><span class="cx"> addObserver:self selector:@selector(markedTextUpdate:)
</span><span class="lines">@@ -6126,8 +6129,13 @@
</span><span class="cx"> [fontManager setSelectedFont:font isMultiple:multipleFonts];
</span><span class="cx"> [fontManager setSelectedAttributes:(attributes ? attributes : @{ }) isMultiple:multipleFonts];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><ins>+- (void)_setSoftSpaceRange:(NSRange)range
+{
+ _private->softSpaceRange = range;
+}
+#endif // !PLATFORM(IOS)
+
</ins><span class="cx"> - (BOOL)_canSmartCopyOrDelete
</span><span class="cx"> {
</span><span class="cx"> if (![[self _webView] smartInsertDeleteEnabled])
</span><span class="lines">@@ -7086,6 +7094,14 @@
</span><span class="cx"> if (!coreFrame || !coreFrame->editor().canEdit())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ if (_private->softSpaceRange.location != NSNotFound && (replacementRange.location == NSMaxRange(_private->softSpaceRange) || replacementRange.location == NSNotFound) && replacementRange.length == 0 && [[NSSpellChecker sharedSpellChecker] deletesAutospaceBeforeString:text language:nil])
+ replacementRange = _private->softSpaceRange;
+#endif
+#if !PLATFORM(IOS)
+ _private->softSpaceRange = NSMakeRange(NSNotFound, 0);
+#endif
+
</ins><span class="cx"> if (replacementRange.location != NSNotFound)
</span><span class="cx"> [[self _frame] _selectNSRange:replacementRange];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h (195551 => 195552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h 2016-01-25 21:12:22 UTC (rev 195551)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h 2016-01-25 21:38:07 UTC (rev 195552)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> - (void)_selectionChanged;
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)_updateFontPanel;
</span><ins>+- (void)_setSoftSpaceRange:(NSRange)range;
</ins><span class="cx"> #endif
</span><span class="cx"> - (BOOL)_canSmartCopyOrDelete;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>