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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4ab43caad552d100379fd13336615cca9c33e88a
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 00:28:18 2010 +0000

    Windows build fix. Wrap calls to CFSTR in parentheses.
    
    * UIProcess/cf/WebBackForwardListCF.cpp:
    * UIProcess/cf/WebPageProxyCF.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 425c751..611b7f6 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-11  Brian Weinstein  <bweinstein at apple.com>
+
+        Windows build fix. Wrap calls to CFSTR in parentheses.
+
+        * UIProcess/cf/WebBackForwardListCF.cpp:
+        * UIProcess/cf/WebPageProxyCF.cpp:
+
 2010-10-11  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp b/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
index 6ee4091..e6ddea9 100644
--- a/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
+++ b/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
@@ -30,10 +30,10 @@ using namespace WebCore;
 
 namespace WebKit {
 
-DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryCurrentIndexKey, CFSTR("SessionHistoryCurrentIndex"));
-DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntriesKey, CFSTR("SessionHistoryEntries"));
-DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntryTitleKey, CFSTR("SessionHistoryEntryTitle"));
-DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntryURLKey, CFSTR("SessionHistoryEntryURL"));
+DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryCurrentIndexKey, (CFSTR("SessionHistoryCurrentIndex")));
+DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntriesKey, (CFSTR("SessionHistoryEntries")));
+DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntryTitleKey, (CFSTR("SessionHistoryEntryTitle")));
+DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryEntryURLKey, (CFSTR("SessionHistoryEntryURL")));
 
 CFDictionaryRef WebBackForwardList::createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback filter, void* context) const
 {
diff --git a/WebKit2/UIProcess/cf/WebPageProxyCF.cpp b/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
index c399a16..e7cd839 100644
--- a/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
+++ b/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
@@ -33,7 +33,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryKey, CFSTR("SessionHistory"));
+DEFINE_STATIC_GETTER(CFStringRef, SessionHistoryKey, (CFSTR("SessionHistory")));
 
 static const UInt32 CurrentSessionStateDataVersion = 1;
 

-- 
WebKit Debian packaging