[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[oliver at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c6cd8d9251ec568963949f7647d766c92d7a064d
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 20:38:58 2009 +0000

    Build fix
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90fbad4..ada0ddd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -5,6 +5,13 @@
         * svg/SVGListTraits.h:
         (WebCore::):
 
+2009-12-03  Oliver Hunt  <oliver at apple.com>
+
+        Build fix
+
+        * svg/SVGListTraits.h:
+        (WebCore::):
+
 2009-12-03  Brady Eidson  <beidson at apple.com>
 
         No wonder editing WebCore.exp repeatedly while I worked on this patch never seemed to stick.
diff --git a/WebCore/svg/SVGListTraits.h b/WebCore/svg/SVGListTraits.h
index 99590ed..e2bce7c 100644
--- a/WebCore/svg/SVGListTraits.h
+++ b/WebCore/svg/SVGListTraits.h
@@ -60,7 +60,7 @@ namespace WebCore {
 
     template<>
     struct SVGListTraits<false, float> {
-        static double nullItem() { return 0; }
+        static float nullItem() { return 0; }
         static bool isNull(double) { return false; }
     };
 

-- 
WebKit Debian packaging