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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b85b50e8cc66f521e4374cd5f12792dfb88eab6c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 04:09:28 2010 +0000

    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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 2ac7cc2..c6dedc4 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+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 1c5f9f6..d2e975f 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2636,6 +2636,13 @@ 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