Title: [193673] branches/safari-601-branch/Source/WebKit/mac
- Revision
- 193673
- Author
- matthew_han...@apple.com
- Date
- 2015-12-07 16:23:51 -0800 (Mon, 07 Dec 2015)
Log Message
Merge r191261. rdar://problem/23769808
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (193672 => 193673)
--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-12-08 00:23:49 UTC (rev 193672)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-12-08 00:23:51 UTC (rev 193673)
@@ -1,3 +1,12 @@
+2015-10-17 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Build fix after r191260
+
+ Unreviewed.
+
+ * WebView/WebView.mm:
+ (+[WebView initialize]):
+
2015-10-18 Myles C. Maxfield <mmaxfi...@apple.com>
Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"
Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm (193672 => 193673)
--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm 2015-12-08 00:23:49 UTC (rev 193672)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm 2015-12-08 00:23:51 UTC (rev 193673)
@@ -4686,18 +4686,15 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_cacheModelChangedNotification:) name:WebPreferencesCacheModelChangedInternalNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
#if PLATFORM(IOS)
continuousSpellCheckingEnabled = NO;
-#endif
-#if !PLATFORM(IOS)
+#else
+
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
continuousSpellCheckingEnabled = [defaults boolForKey:WebContinuousSpellCheckingEnabled];
grammarCheckingEnabled = [defaults boolForKey:WebGrammarCheckingEnabled];
-#endif
-#if !PLATFORM(IOS)
automaticQuoteSubstitutionEnabled = [self _shouldAutomaticQuoteSubstitutionBeEnabled];
automaticLinkDetectionEnabled = [defaults boolForKey:WebAutomaticLinkDetectionEnabled];
automaticDashSubstitutionEnabled = [self _shouldAutomaticDashSubstitutionBeEnabled];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
