<!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>[198547] 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/198547">198547</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 13:21:28 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Advanced spell checking should be guarded behind
HAVE(ADVANCED_SPELL_CHECKING)
https://bugs.webkit.org/show_bug.cgi?id=155738
Reviewed by Geoff Garen.
Source/WebCore:
* config.h:
(WebCore::ScrollableArea::systemLanguageIsRTL):
* platform/spi/mac/NSSpellCheckerSPI.h:
Source/WebKit/mac:
* WebCoreSupport/WebEditorClient.mm:
(insertionPointFromCurrentSelection):
(WebEditorClient::checkTextOfParagraph):
(WebEditorClient::getGuessesForWord):
(WebEditorClient::requestCandidatesForSelection):
(WebEditorClient::handleRequestedCandidates):
(WebEditorClient::requestCheckingOfString):
* WebKitPrefix.h:
* WebView/WebHTMLView.mm:
(-[WebHTMLView insertText:]):
Source/WebKit2:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::requestCandidatesForSelectionIfNeeded):
(WebKit::WebViewImpl::handleRequestedCandidates):
(WebKit::WebViewImpl::insertText):
* UIProcess/mac/TextCheckerMac.mm:
(WebKit::TextChecker::checkTextOfParagraph):
(WebKit::TextChecker::getGuessesForWord):
* config.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh">trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h</a></li>
<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="#trunkSourceWebKitmacWebKitPrefixh">trunk/Source/WebKit/mac/WebKitPrefix.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTextCheckerMacmm">trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-22 Beth Dakin <bdakin@apple.com>
+
+ Advanced spell checking should be guarded behind
+ HAVE(ADVANCED_SPELL_CHECKING)
+ https://bugs.webkit.org/show_bug.cgi?id=155738
+
+ Reviewed by Geoff Garen.
+
+ * config.h:
+ (WebCore::ScrollableArea::systemLanguageIsRTL):
+ * platform/spi/mac/NSSpellCheckerSPI.h:
+
</ins><span class="cx"> 2016-03-22 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Change "dialog" role description to "web dialog" so users can distinguish from native alerts
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebCore/config.h 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -130,3 +130,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WebKitAdditionsDefines.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #ifndef NSSpellCheckerSPI_h
</span><span class="cx"> #define NSSpellCheckerSPI_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx">
</span><span class="cx"> // FIXME: This header should include system headers when possible.
</span><span class="cx">
</span><span class="lines">@@ -37,6 +37,6 @@
</span><span class="cx"> + (BOOL)isAutomaticTextCompletionEnabled;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 102000
</del><ins>+#endif // HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx">
</span><span class="cx"> #endif // NSSpellCheckerSPI_h
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-22 Beth Dakin <bdakin@apple.com>
+
+ Advanced spell checking should be guarded behind
+ HAVE(ADVANCED_SPELL_CHECKING)
+ https://bugs.webkit.org/show_bug.cgi?id=155738
+
+ Reviewed by Geoff Garen.
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (insertionPointFromCurrentSelection):
+ (WebEditorClient::checkTextOfParagraph):
+ (WebEditorClient::getGuessesForWord):
+ (WebEditorClient::requestCandidatesForSelection):
+ (WebEditorClient::handleRequestedCandidates):
+ (WebEditorClient::requestCheckingOfString):
+ * WebKitPrefix.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
</ins><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -1050,7 +1050,7 @@
</span><span class="cx"> return results;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> static int insertionPointFromCurrentSelection(const VisibleSelection& currentSelection)
</span><span class="cx"> {
</span><span class="cx"> VisiblePosition selectionStart = currentSelection.visibleStart();
</span><span class="lines">@@ -1062,7 +1062,7 @@
</span><span class="cx"> Vector<TextCheckingResult> WebEditorClient::checkTextOfParagraph(StringView string, TextCheckingTypeMask checkingTypes, const VisibleSelection& currentSelection)
</span><span class="cx"> {
</span><span class="cx"> NSDictionary *options = nil;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> options = @{ NSTextCheckingInsertionPointKey : [NSNumber numberWithUnsignedInteger:insertionPointFromCurrentSelection(currentSelection)] };
</span><span class="cx"> #endif
</span><span class="cx"> return core([[NSSpellChecker sharedSpellChecker] checkString:string.createNSStringWithoutCopying().get() range:NSMakeRange(0, string.length()) types:(checkingTypes | NSTextCheckingTypeOrthography) options:options inSpellDocumentWithTag:spellCheckerDocumentTag() orthography:NULL wordCount:NULL], checkingTypes);
</span><span class="lines">@@ -1108,7 +1108,7 @@
</span><span class="cx"> NSOrthography* orthography = nil;
</span><span class="cx"> NSSpellChecker *checker = [NSSpellChecker sharedSpellChecker];
</span><span class="cx"> NSDictionary *options = nil;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> options = @{ NSTextCheckingInsertionPointKey : [NSNumber numberWithUnsignedInteger:insertionPointFromCurrentSelection(currentSelection)] };
</span><span class="cx"> #endif
</span><span class="cx"> if (context.length()) {
</span><span class="lines">@@ -1145,6 +1145,7 @@
</span><span class="cx">
</span><span class="cx"> m_lastSelectionForRequestedCandidates = selection;
</span><span class="cx">
</span><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> VisiblePosition selectionStart = selection.visibleStart();
</span><span class="cx"> VisiblePosition selectionEnd = selection.visibleEnd();
</span><span class="cx"> VisiblePosition paragraphStart = startOfParagraph(selectionStart);
</span><span class="lines">@@ -1164,6 +1165,7 @@
</span><span class="cx"> weakEditor->handleRequestedCandidates(sequenceNumber, candidates);
</span><span class="cx"> });
</span><span class="cx"> }];
</span><ins>+#endif // HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::handleRequestedCandidates(NSInteger sequenceNumber, NSArray<NSTextCheckingResult *> *candidates)
</span><span class="lines">@@ -1296,7 +1298,7 @@
</span><span class="cx"> NSRange range = NSMakeRange(0, m_textCheckingRequest->data().text().length());
</span><span class="cx"> NSRunLoop* currentLoop = [NSRunLoop currentRunLoop];
</span><span class="cx"> NSDictionary *options = nil;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> options = @{ NSTextCheckingInsertionPointKey : [NSNumber numberWithUnsignedInteger:insertionPointFromCurrentSelection(currentSelection)] };
</span><span class="cx"> #endif
</span><span class="cx"> [[NSSpellChecker sharedSpellChecker] requestCheckingOfString:m_textCheckingRequest->data().text() range:range types:NSTextCheckingAllSystemTypes options:options inSpellDocumentWithTag:0 completionHandler:^(NSInteger, NSArray* results, NSOrthography*, NSInteger) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKitPrefix.h (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKitPrefix.h 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit/mac/WebKitPrefix.h 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -92,3 +92,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <wtf/DisallowCType.h>
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WebKitAdditionsDefines.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -7145,7 +7145,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> BOOL needToRemoveSoftSpace = NO;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> if (_private->softSpaceRange.location != NSNotFound && (replacementRange.location == NSMaxRange(_private->softSpaceRange) || replacementRange.location == NSNotFound) && !replacementRange.length && [[NSSpellChecker sharedSpellChecker] deletesAutospaceBeforeString:text language:nil]) {
</span><span class="cx"> replacementRange = _private->softSpaceRange;
</span><span class="cx"> needToRemoveSoftSpace = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-22 Beth Dakin <bdakin@apple.com>
+
+ Advanced spell checking should be guarded behind
+ HAVE(ADVANCED_SPELL_CHECKING)
+ https://bugs.webkit.org/show_bug.cgi?id=155738
+
+ Reviewed by Geoff Garen.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::requestCandidatesForSelectionIfNeeded):
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+ (WebKit::WebViewImpl::insertText):
+ * UIProcess/mac/TextCheckerMac.mm:
+ (WebKit::TextChecker::checkTextOfParagraph):
+ (WebKit::TextChecker::getGuessesForWord):
+ * config.h:
+
</ins><span class="cx"> 2016-03-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a setting to let the client toggle support for network cache speculative validation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -2146,6 +2146,7 @@
</span><span class="cx"> auto& postLayoutData = editorState.postLayoutData();
</span><span class="cx"> m_lastStringForCandidateRequest = postLayoutData.stringForCandidateRequest;
</span><span class="cx">
</span><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> NSRange rangeForCandidates = NSMakeRange(postLayoutData.candidateRequestStartPosition, postLayoutData.selectedTextLength);
</span><span class="cx"> NSTextCheckingTypes checkingTypes = NSTextCheckingTypeSpelling | NSTextCheckingTypeReplacement | NSTextCheckingTypeCorrection;
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><span class="lines">@@ -2156,6 +2157,7 @@
</span><span class="cx"> weakThis->handleRequestedCandidates(sequenceNumber, candidates);
</span><span class="cx"> });
</span><span class="cx"> }];
</span><ins>+#endif // HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::handleRequestedCandidates(NSInteger sequenceNumber, NSArray<NSTextCheckingResult *> *candidates)
</span><span class="lines">@@ -3515,7 +3517,7 @@
</span><span class="cx"> text = string;
</span><span class="cx">
</span><span class="cx"> BOOL needToRemoveSoftSpace = NO;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> if (m_softSpaceRange.location != NSNotFound && (replacementRange.location == NSMaxRange(m_softSpaceRange) || replacementRange.location == NSNotFound) && replacementRange.length == 0 && [[NSSpellChecker sharedSpellChecker] deletesAutospaceBeforeString:text language:nil]) {
</span><span class="cx"> replacementRange = m_softSpaceRange;
</span><span class="cx"> needToRemoveSoftSpace = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTextCheckerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSString> textString = text.createNSStringWithoutCopying();
</span><span class="cx"> NSDictionary *options = nil;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> options = @{ NSTextCheckingInsertionPointKey : [NSNumber numberWithUnsignedInteger:insertionPoint] };
</span><span class="cx"> #endif
</span><span class="cx"> NSArray *incomingResults = [[NSSpellChecker sharedSpellChecker] checkString:textString.get()
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> NSOrthography* orthography = nil;
</span><span class="cx"> NSSpellChecker *checker = [NSSpellChecker sharedSpellChecker];
</span><span class="cx"> NSDictionary *options = nil;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><ins>+#if HAVE(ADVANCED_SPELL_CHECKING)
</ins><span class="cx"> options = @{ NSTextCheckingInsertionPointKey : [NSNumber numberWithUnsignedInteger:insertionPoint] };
</span><span class="cx"> #endif
</span><span class="cx"> if (context.length()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (198546 => 198547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2016-03-22 19:39:38 UTC (rev 198546)
+++ trunk/Source/WebKit2/config.h 2016-03-22 20:21:28 UTC (rev 198547)
</span><span class="lines">@@ -129,3 +129,7 @@
</span><span class="cx"> #define HAVE_LINK_PREVIEW 0
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WebKitAdditionsDefines.h>
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>