Attachment 359406 Details for Bug 193545 – Patch

[patch] Patch

bug-193545-20190117124606.patch (text/plain), 4.75 KB, created by Tim Horton on 2019-01-17 12:46:07 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-01-17 12:46:07 PST

Size: 4.75 KB

patch

obsolete

>Subversion Revision: 240122
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index c1a3f6ba974dd89949427b783c1cab02e7813648..35d6a4b0bfebc39317612eb3d94d2a7fec88cb9a 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-17  Tim Horton  <timothy_horton@apple.com>
>+
>+        Adopt NSTextCheckingSuppressInitialCapitalizationKey
>+        https://bugs.webkit.org/show_bug.cgi?id=193545
>+
>+        Reviewed by Dean Jackson.
>+
>+        * pal/spi/mac/NSSpellCheckerSPI.h:
>+
> 2019-01-16  Tim Horton  <timothy_horton@apple.com>
> 
>         Unreviewed build fix.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b470139390e8f2a68041ed8c3e76badc1a75bc8e..bd14b12433f2583a1373076977c667deac71f197 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-17  Tim Horton  <timothy_horton@apple.com>
>+
>+        Adopt NSTextCheckingSuppressInitialCapitalizationKey
>+        https://bugs.webkit.org/show_bug.cgi?id=193545
>+
>+        Reviewed by Dean Jackson.
>+
>+        * UIProcess/mac/TextCheckerMac.mm:
>+        (WebKit::TextChecker::checkTextOfParagraph):
>+        (WebKit::TextChecker::getGuessesForWord):
>+
> 2019-01-16  Dean Jackson  <dino@apple.com>
> 
>         (iPad) Link tapping is sluggish on many sites
>diff --git a/Source/WebCore/PAL/pal/spi/mac/NSSpellCheckerSPI.h b/Source/WebCore/PAL/pal/spi/mac/NSSpellCheckerSPI.h
>index 5c21447a3655fe9184583ce8c556d9894c02d4cc..2f6030ea25cfba1ee158868ec77632cac374a342 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/NSSpellCheckerSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/NSSpellCheckerSPI.h
>@@ -35,6 +35,8 @@
> extern NSString *NSTextCheckingInsertionPointKey;
> #endif
> 
>+extern NSString *NSTextCheckingSuppressInitialCapitalizationKey;
>+
> @interface NSSpellChecker ()
> 
> #if HAVE(ADVANCED_SPELL_CHECKING)
>diff --git a/Source/WebKit/UIProcess/mac/TextCheckerMac.mm b/Source/WebKit/UIProcess/mac/TextCheckerMac.mm
>index c4e9c25f9dc14fe77a4df2f71612a9a92c7cdbc7..3b84f2564d004fd15155259b92d3ba5d04732ee6 100644
>--- a/Source/WebKit/UIProcess/mac/TextCheckerMac.mm
>+++ b/Source/WebKit/UIProcess/mac/TextCheckerMac.mm
>@@ -48,11 +48,6 @@ static NSString* const WebAutomaticDashSubstitutionEnabled = @"WebAutomaticDashS
> static NSString* const WebAutomaticLinkDetectionEnabled = @"WebAutomaticLinkDetectionEnabled";
> static NSString* const WebAutomaticTextReplacementEnabled = @"WebAutomaticTextReplacementEnabled";
> 
>-// FIXME: this needs to be removed and replaced with NSTextCheckingSuppressInitialCapitalizationKey as soon as
>-// rdar://problem/26800924 is fixed.
>-
>-static NSString* const WebTextCheckingSuppressInitialCapitalizationKey = @"SuppressInitialCapitalization";
>-
> namespace WebKit {
> using namespace WebCore;
> 
>@@ -328,10 +323,12 @@ Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(SpellDocumentTag sp
>     RetainPtr<NSString> textString = text.createNSStringWithoutCopying();
>     NSDictionary *options = nil;
> #if HAVE(ADVANCED_SPELL_CHECKING)
>-    options = @{ NSTextCheckingInsertionPointKey : @(insertionPoint),
>-                 WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
>+    options = @{
>+        NSTextCheckingInsertionPointKey : @(insertionPoint),
>+        NSTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled)
>+    };
> #else
>-    options = @{ WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
>+    options = @{ NSTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
> #endif
>     NSArray *incomingResults = [[NSSpellChecker sharedSpellChecker] checkString:textString.get()
>                                                                           range:NSMakeRange(0, text.length())
>@@ -470,10 +467,12 @@ void TextChecker::getGuessesForWord(SpellDocumentTag spellDocumentTag, const Str
>     NSSpellChecker *checker = [NSSpellChecker sharedSpellChecker];
>     NSDictionary *options = nil;
> #if HAVE(ADVANCED_SPELL_CHECKING)
>-    options = @{ NSTextCheckingInsertionPointKey : @(insertionPoint),
>-                 WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
>+    options = @{
>+        NSTextCheckingInsertionPointKey : @(insertionPoint),
>+        NSTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled)
>+    };
> #else
>-    options = @{ WebTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
>+    options = @{ NSTextCheckingSuppressInitialCapitalizationKey : @(!initialCapitalizationEnabled) };
> #endif
>     if (context.length()) {
>         [checker checkString:context range:NSMakeRange(0, context.length()) types:NSTextCheckingTypeOrthography options:options inSpellDocumentWithTag:spellDocumentTag orthography:&orthography wordCount:0];

Actions: View | Formatted Diff | Diff

Attachments on bug 193545: 359399 | 359406