[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[oliver at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 838636b016ad7f3f55e210305d65ccf199607110
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 23:13:27 2009 +0000

    Fix up some issues in my SVGListTraits change from yesterday.
    
    Reviewed by Deth Bakin
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 043962c..c17ffbd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-04  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Fix up some issues in my SVGListTraits change from yesterday.
+
+        * svg/SVGListTraits.h:
+        (WebCore::):
+
 2009-12-04  Albert J. Wong  <ajwong at chromium.org>
 
         Not reviewed: chromium build fix.
diff --git a/WebCore/svg/SVGListTraits.h b/WebCore/svg/SVGListTraits.h
index e2bce7c..f58b9b9 100644
--- a/WebCore/svg/SVGListTraits.h
+++ b/WebCore/svg/SVGListTraits.h
@@ -36,14 +36,14 @@ namespace WebCore {
 
     template<typename ItemPtr>
     struct SVGListTraits<true, ItemPtr*> {
-        static ItemPtr nullItem() { return 0; }
-        static bool isNull(ItemPtr it) { return !it; }
+        static ItemPtr* nullItem() { return 0; }
+        static bool isNull(ItemPtr* it) { return !it; }
     };
     
     template<typename ItemPtr>
     struct SVGListTraits<true, RefPtr<ItemPtr> > {
         static RefPtr<ItemPtr> nullItem() { return 0; }
-        static bool isNull(RefPtr<ItemPtr> it) { return !it; }
+        static bool isNull(const RefPtr<ItemPtr>& it) { return !it; }
     };
     
     template<typename Item>
@@ -61,7 +61,7 @@ namespace WebCore {
     template<>
     struct SVGListTraits<false, float> {
         static float nullItem() { return 0; }
-        static bool isNull(double) { return false; }
+        static bool isNull(float) { return false; }
     };
 
 

-- 
WebKit Debian packaging