Title: [203878] branches/safari-602-branch/Source/WebKit2
- Revision
- 203878
- Author
- bshaf...@apple.com
- Date
- 2016-07-29 00:12:05 -0700 (Fri, 29 Jul 2016)
Log Message
Merge r203724. rdar://problem/27536113
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203877 => 203878)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:12:02 UTC (rev 203877)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:12:05 UTC (rev 203878)
@@ -1,5 +1,25 @@
2016-07-28 Babak Shafiei <bshaf...@apple.com>
+ Merge r203724. rdar://problem/27536113
+
+ 2016-07-26 Enrica Casucci <enr...@apple.com>
+
+ Support configurable autocapitalization.
+ https://bugs.webkit.org/show_bug.cgi?id=158860
+ rdar://problem/27536113
+
+ Reviewed by Tim Horton.
+
+ Autocapitalization should be enabled/disabled regardless of whether
+ we are using advance spelling feature.
+
+ * UIProcess/mac/TextCheckerMac.mm:
+ (WebKit::TextChecker::checkTextOfParagraph):
+ (WebKit::TextChecker::getGuessesForWord):
+
+
+2016-07-28 Babak Shafiei <bshaf...@apple.com>
+
Merge r203687. rdar://problem/27399998
2016-07-25 Chris Dumez <cdu...@apple.com>
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm (203877 => 203878)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2016-07-29 07:12:02 UTC (rev 203877)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2016-07-29 07:12:05 UTC (rev 203878)
@@ -47,12 +47,10 @@
static NSString* const WebAutomaticLinkDetectionEnabled = @"WebAutomaticLinkDetectionEnabled";
static NSString* const WebAutomaticTextReplacementEnabled = @"WebAutomaticTextReplacementEnabled";
-#if HAVE(ADVANCED_SPELL_CHECKING)
// FIXME: this needs to be removed and replaced with NSTextCheckingSuppressInitialCapitalizationKey as soon as
// rdar://problem/26800924 is fixed.
static NSString* const WebTextCheckingSuppressInitialCapitalizationKey = @"SuppressInitialCapitalization";
-#endif
using namespace WebCore;
@@ -308,7 +306,7 @@
options = @{ NSTextCheckingInsertionPointKey : @(insertionPoint),
WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
#else
- UNUSED_PARAM(initialCapitalizationEnabled);
+ options = @{ WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
#endif
NSArray *incomingResults = [[NSSpellChecker sharedSpellChecker] checkString:textString.get()
range:NSMakeRange(0, text.length())
@@ -449,6 +447,8 @@
#if HAVE(ADVANCED_SPELL_CHECKING)
options = @{ NSTextCheckingInsertionPointKey : @(insertionPoint),
WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
+#else
+ options = @{ WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
#endif
if (context.length()) {
[checker checkString:context range:NSMakeRange(0, context.length()) types:NSTextCheckingTypeOrthography options:options inSpellDocumentWithTag:spellDocumentTag orthography:&orthography wordCount:0];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
