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

[levin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d17b7070de28750eccafa048a778ecba60fd62f3
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 3 00:54:13 2010 +0000

    2010-02-02  David Levin  <levin at chromium.org>
    
            No review, rolling out r54245.
            http://trac.webkit.org/changeset/54245
            https://bugs.webkit.org/show_bug.cgi?id=34492
    
            This patch seems to have broken thousands of chromium tests on
            Windows (and since it was for chromium, I'm rolling it out).
    
            * dom/Element.cpp:
            (WebCore::Element::baseURI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67f5b56..03ec854 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-02  David Levin  <levin at chromium.org>
+
+        No review, rolling out r54245.
+        http://trac.webkit.org/changeset/54245
+        https://bugs.webkit.org/show_bug.cgi?id=34492
+
+        This patch seems to have broken thousands of chromium tests on
+        Windows (and since it was for chromium, I'm rolling it out).
+
+        * dom/Element.cpp:
+        (WebCore::Element::baseURI):
+
 2010-02-02  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index 729ec8d..ac4fdb3 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -702,8 +702,7 @@ void Element::setPrefix(const AtomicString& prefix, ExceptionCode& ec)
 
 KURL Element::baseURI() const
 {
-    const AtomicString& baseAttribute = getAttribute(baseAttr);
-    KURL base(KURL(), baseAttribute);
+    KURL base(KURL(), getAttribute(baseAttr));
     if (!base.protocol().isEmpty())
         return base;
 
@@ -715,7 +714,7 @@ KURL Element::baseURI() const
     if (parentBase.isNull())
         return base;
 
-    return KURL(parentBase, baseAttribute);
+    return KURL(parentBase, base.string());
 }
 
 void Element::createAttributeMap() const

-- 
WebKit Debian packaging