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

[snej at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit c1e49ad1bea9ab4d56a2aa1f5ce4ab613e96a1b9
Author: snej at chromium.org <snej at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 22:08:13 2009 +0000

    Build fix to my previous checkin, for Windows Chromium
    
    * svg/SVGAnimatedProperty.h:
    (WebCore::PropertySynchronizer::synchronize): Fix implicit-conversion error on AtomicString.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51135 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88d3fc5..5c874fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-18  Jens Alfke  <snej at chromium.org>
+
+        Build fix to my previous checkin, for Windows Chromium
+
+        * svg/SVGAnimatedProperty.h:
+        (WebCore::PropertySynchronizer::synchronize): Fix implicit-conversion error on AtomicString.
+
 2009-11-18  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/svg/SVGAnimatedProperty.h b/WebCore/svg/SVGAnimatedProperty.h
index 5ae677f..984046f 100644
--- a/WebCore/svg/SVGAnimatedProperty.h
+++ b/WebCore/svg/SVGAnimatedProperty.h
@@ -474,7 +474,7 @@ namespace WebCore {
     struct PropertySynchronizer<OwnerElement, DecoratedType, true> : Noncopyable {
         static void synchronize(const OwnerElement* ownerElement, const QualifiedName& attributeName, DecoratedType baseValue)
         {
-            String value(SVGAnimatedTypeValue<DecoratedType>::toString(baseValue));
+            AtomicString value(SVGAnimatedTypeValue<DecoratedType>::toString(baseValue));
 
             NamedNodeMap* namedAttrMap = ownerElement->attributes(false); 
             Attribute* old = namedAttrMap->getAttributeItem(attributeName);
@@ -483,7 +483,7 @@ namespace WebCore {
             else if (!old && !value.isNull()) 
                 namedAttrMap->addAttribute(const_cast<OwnerElement*>(ownerElement)->createAttribute(attributeName, value));
             else if (old && !value.isNull()) 
-                old->setValue(AtomicString(value)); 
+                old->setValue(value); 
         }
     };
 

-- 
WebKit Debian packaging