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

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7ee18bcf685757986b0532f003b1aedf633006fe
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 23:48:27 2010 +0000

            Build fix.
    
            * Shared/WebPreferencesStore.h: Actually remove encode(), which has been moved to WebPreferencesStore.cpp.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3af6641..c62dbf0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-31  Alexey Proskuryakov  <ap at apple.com>
 
+        Build fix.
+
+        * Shared/WebPreferencesStore.h: Actually remove encode(), which has been moved to WebPreferencesStore.cpp.
+
+2010-08-31  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by Sam Weinig.
 
         https://bugs.webkit.org/show_bug.cgi?id=42195
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index beec838..6ecda58 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -36,27 +36,7 @@ namespace WebKit {
 struct WebPreferencesStore {
     WebPreferencesStore();
 
-    void encode(CoreIPC::ArgumentEncoder* encoder) const
-    {
-        encoder->encode(javaScriptEnabled);
-        encoder->encode(loadsImagesAutomatically);
-        encoder->encode(pluginsEnabled);
-        encoder->encode(offlineWebApplicationCacheEnabled);
-        encoder->encode(localStorageEnabled);
-        encoder->encode(xssAuditorEnabled);
-        encoder->encode(fontSmoothingLevel);
-        encoder->encode(minimumFontSize);
-        encoder->encode(minimumLogicalFontSize);
-        encoder->encode(defaultFontSize);
-        encoder->encode(defaultFixedFontSize);
-        encoder->encode(standardFontFamily);
-        encoder->encode(cursiveFontFamily);
-        encoder->encode(fantasyFontFamily);
-        encoder->encode(fixedFontFamily);
-        encoder->encode(sansSerifFontFamily);
-        encoder->encode(serifFontFamily);
-    }
-
+    void encode(CoreIPC::ArgumentEncoder* encoder) const;
     static bool decode(CoreIPC::ArgumentDecoder*, WebPreferencesStore&);
 
     static void overrideXSSAuditorEnabledForTestRunner(bool);

-- 
WebKit Debian packaging