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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3e8db997c404adcf250e835b1e1265f26209443c
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 02:00:16 2010 +0000

    Fix clang++ build.
    
    * Scripts/webkit2/messages.py:
    DrawingAreaInfo is a struct.
    
    * Shared/WebPreferencesStore.cpp:
    (WebKit::valueForKey):
    Move valueForKey above code that uses it.
    
    * UIProcess/mac/WebInspectorProxyMac.mm:
    (-[WebInspectorProxyObjCAdapter windowWillClose:]):
    Remove trailing semicolon.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c29c509..148e502 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-09  Anders Carlsson  <andersca at apple.com>
+
+        Fix clang++ build.
+
+        * Scripts/webkit2/messages.py:
+        DrawingAreaInfo is a struct.
+
+        * Shared/WebPreferencesStore.cpp:
+        (WebKit::valueForKey):
+        Move valueForKey above code that uses it.
+
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (-[WebInspectorProxyObjCAdapter windowWillClose:]):
+        Remove trailing semicolon.
+
 2010-12-09  Timothy Hatcher  <timothy at apple.com>
 
         Add support for transparent WebKit2 WKViews.
diff --git a/WebKit2/Scripts/webkit2/messages.py b/WebKit2/Scripts/webkit2/messages.py
index 1059d12..d4c6d00 100644
--- a/WebKit2/Scripts/webkit2/messages.py
+++ b/WebKit2/Scripts/webkit2/messages.py
@@ -253,6 +253,7 @@ def struct_or_class(namespace, type):
         'WebCore::PluginInfo',
         'WebCore::ViewportArguments',
         'WebCore::WindowFeatures',
+        'WebKit::DrawingAreaInfo',
         'WebKit::PlatformPopupMenuData',
         'WebKit::PluginProcessCreationParameters',
         'WebKit::WebNavigationDataStore',
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index bd8f01a..c15ee65 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -123,6 +123,15 @@ uint32_t defaultValueForKey(const String& key)
     return defaults.get(key);
 }
 
+template<typename MapType>
+static typename MapType::MappedType valueForKey(const MapType& map, const typename MapType::KeyType& key)
+{
+    typename MapType::const_iterator it = map.find(key);
+    if (it != map.end())
+        return it->second;
+
+    return defaultValueForKey<typename MapType::MappedType>(key);
+}
 
 template<typename MapType>
 static bool setValueForKey(MapType& map, const typename MapType::KeyType& key, const typename MapType::MappedType& value)
@@ -135,16 +144,6 @@ static bool setValueForKey(MapType& map, const typename MapType::KeyType& key, c
     return true;
 }
 
-template<typename MapType>
-static typename MapType::MappedType valueForKey(const MapType& map, const typename MapType::KeyType& key)
-{
-    typename MapType::const_iterator it = map.find(key);
-    if (it != map.end())
-        return it->second;
-
-    return defaultValueForKey<typename MapType::MappedType>(key);
-}
-
 bool WebPreferencesStore::setStringValueForKey(const String& key, const String& value)
 {
     return setValueForKey(m_stringValues, key, value);
diff --git a/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm b/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
index 11a72fa..a889739 100644
--- a/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
+++ b/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
@@ -64,7 +64,7 @@ static const CGFloat windowContentBorderThickness = 55;
     return self;
 }
 
-- (void)windowWillClose:(NSNotification *)notification;
+- (void)windowWillClose:(NSNotification *)notification
 {
     _inspectorProxy->close();
 }

-- 
WebKit Debian packaging