[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrowe at apple.com mrowe at apple.com
Wed Dec 22 13:26:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8a5366accc405607f482b7ccd53dd38b0c42d1c5
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 07:20:40 2010 +0000

    Roll out r67533 to fix the build.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index cc27fa7..0f26019 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -14,17 +14,6 @@
         (WebEditorClient::dismissCorrectionPanel): Ditto
         (WebEditorClient::isShowingCorrectionPanel): Query whether autocorrection panel is shown.
 
-2010-09-14  Jia Pu  <jpu at apple.com>
-
-        Reviewed by Dan Bernstein.
-
-        WebKit should use system wide spell checking preference when application specific one isn't set.
-        https://bugs.webkit.org/show_bug.cgi?id=45789
-
-        * WebView/WebView.mm:
-        (+[WebView initialize]): Use system wide autocorrection and text substitution preferences
-           when the application level preferences are not set.
-
 2010-09-14  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index d2e975f..1c5f9f6 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2636,13 +2636,6 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
     automaticTextReplacementEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticTextReplacementEnabled];
     automaticSpellingCorrectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticSpellingCorrectionEnabled];
 #endif
-
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticTextReplacementEnabled])
-        automaticTextReplacementEnabled = [NSSpellChecker isAutomaticTextReplacementEnabled];
-    if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticSpellingCorrectionEnabled])
-        automaticTextReplacementEnabled = [NSSpellChecker isAutomaticSpellingCorrectionEnabled];
-#endif
 }
 
 + (void)_applicationWillTerminate

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list