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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 199e7779913e423440f34387a4a43f2e92a611fd
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 02:01:21 2010 +0000

    2010-12-06  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Sam Weinig.
    
            Fix two WebKit2 prefs issues.
    
            * Shared/WebPreferencesStore.h: Include font-family preferences
            in the FOR_EACH_WEBKIT_STRING_PREFERENCE macro, actually propagating
            font family prefs to WebCore settings.
    
            * UIProcess/WebPageGroup.cpp:
            (WebKit::WebPageGroup::WebPageGroup):
            (WebKit::WebPageGroup::~WebPageGroup): Add and remove the WebPageGroup
            from the preference object it creates. This allows preference changes
            to actually be propagated to the web process.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 41ea32b..735c6a0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-06  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix two WebKit2 prefs issues.
+
+        * Shared/WebPreferencesStore.h: Include font-family preferences
+        in the FOR_EACH_WEBKIT_STRING_PREFERENCE macro, actually propagating
+        font family prefs to WebCore settings.
+        
+        * UIProcess/WebPageGroup.cpp:
+        (WebKit::WebPageGroup::WebPageGroup):
+        (WebKit::WebPageGroup::~WebPageGroup): Add and remove the WebPageGroup
+        from the preference object it creates. This allows preference changes
+        to actually be propagated to the web process.
+
 2010-12-06  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 6cfb290..e634316 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -65,10 +65,6 @@ namespace WebKit {
     macro(DefaultFixedFontSize, defaultFixedFontSize, UInt32, uint32_t, 13) \
     \
 
-#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
-    macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, "ISO-8859-1") \
-    \
-
 #if PLATFORM(WIN)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
@@ -93,11 +89,16 @@ namespace WebKit {
 
 #endif
 
+#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+    FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
+    macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, "ISO-8859-1") \
+    \
+
+
 #define FOR_EACH_WEBKIT_PREFERENCE(macro) \
     FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
     FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
     FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
-    FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     \
 
 namespace WebPreferencesKey {
diff --git a/WebKit2/UIProcess/WebPageGroup.cpp b/WebKit2/UIProcess/WebPageGroup.cpp
index 3f52d1d..901b393 100644
--- a/WebKit2/UIProcess/WebPageGroup.cpp
+++ b/WebKit2/UIProcess/WebPageGroup.cpp
@@ -71,12 +71,14 @@ WebPageGroup::WebPageGroup(const String& identifier, bool visibleToInjectedBundl
         m_data.identifer = m_data.identifer = makeString("__uniquePageGroupID-", String::number(m_data.pageGroupID));
         m_preferences = WebPreferences::create();
     }
+    m_preferences->addPageGroup(this);
 
     m_data.visibleToInjectedBundle = visibleToInjectedBundle;    
 }
 
 WebPageGroup::~WebPageGroup()
 {
+    m_preferences->removePageGroup(this);
     webPageGroupMap().remove(pageGroupID());
 }
 

-- 
WebKit Debian packaging