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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5e123b6f40c918c7156d702528f9ede4ac9a479f
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 07:20:19 2010 +0000

    WebKit should use system wide spell checking preference when application specific one isn't set.
    https://bugs.webkit.org/show_bug.cgi?id=45789
    <rdar://problem/8416041>
    
    Patch by Jia Pu <jpu at apple.com> on 2010-09-17
    Reviewed by Dan Bernstein.
    
    * 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@67696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 57bd1bb..04d71ec 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-17  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
+        <rdar://problem/8416041>
+
+        * WebView/WebView.mm:
+        (+[WebView initialize]): Use system wide autocorrection and text substitution preferences
+          when the application level preferences are not set.
+
 2010-09-16  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 1c5f9f6..77e71cf 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -174,6 +174,10 @@
 #import <wtf/StdLibExtras.h>
 #import <wtf/Threading.h>
 
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#import <AppKit/NSTextChecker.h>
+#endif
+
 #if ENABLE(DASHBOARD_SUPPORT)
 #import <WebKit/WebDashboardRegion.h>
 #endif
@@ -2636,6 +2640,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