[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit dffd0073aebadb45cf7d1ab8ded79f47f74dee1c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 20:04:30 2010 +0000

    2010-02-02  Bryan Yeung  <bryeung at bryeung-chrome.(none)>
    
            Reviewed by Darin Adler.
    
            Avoid using an invalidated KURL object in baseURI.
    
            https://bugs.webkit.org/show_bug.cgi?id=34492
    
            This change fixes baseURI for Chromium (where the KURL implementation
            does not allow invalid KURLs to carry relative paths).  This is
            regression tested by
            LayoutTests/svg/W3C-SVG-1.1/struct-image-07-t.svg
    
            * dom/Element.cpp:
            (WebCore::Element::baseURI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe3e76e..b853fad 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-02  Bryan Yeung  <bryeung at bryeung-chrome.(none)>
+
+        Reviewed by Darin Adler.
+
+        Avoid using an invalidated KURL object in baseURI.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34492
+
+        This change fixes baseURI for Chromium (where the KURL implementation
+        does not allow invalid KURLs to carry relative paths).  This is
+        regression tested by
+        LayoutTests/svg/W3C-SVG-1.1/struct-image-07-t.svg
+
+        * dom/Element.cpp:
+        (WebCore::Element::baseURI):
+
 2010-02-02  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index ac4fdb3..729ec8d 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -702,7 +702,8 @@ void Element::setPrefix(const AtomicString& prefix, ExceptionCode& ec)
 
 KURL Element::baseURI() const
 {
-    KURL base(KURL(), getAttribute(baseAttr));
+    const AtomicString& baseAttribute = getAttribute(baseAttr);
+    KURL base(KURL(), baseAttribute);
     if (!base.protocol().isEmpty())
         return base;
 
@@ -714,7 +715,7 @@ KURL Element::baseURI() const
     if (parentBase.isNull())
         return base;
 
-    return KURL(parentBase, base.string());
+    return KURL(parentBase, baseAttribute);
 }
 
 void Element::createAttributeMap() const

-- 
WebKit Debian packaging