[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
levin at chromium.org
levin at chromium.org
Wed Feb 10 22:11:00 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit b0be50ac2fc2e11bb84f21cef25add52035617cd
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 3 16:09:31 2010 +0000
2010-02-02 Bryan Yeung <bryeung at google.com>
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
This is a re-application of this patch since it was mistakenly identified as
the cause of a big chromium test regression and rolled out in r54264.
* dom/Element.cpp:
(WebCore::Element::baseURI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54282 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 651271b..23de8f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-02 Bryan Yeung <bryeung at google.com>
+
+ 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
+
+ This is a re-application of this patch since it was mistakenly identified as
+ the cause of a big chromium test regression and rolled out in r54264.
+
+ * dom/Element.cpp:
+ (WebCore::Element::baseURI):
+
2010-02-03 No'am Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Laszlo Gombos.
@@ -582,7 +601,7 @@
anymore. Keep copying the scripts, though, since other projects
(outside of the WebKit repository) do use those.
-2010-02-02 Bryan Yeung <bryeung at bryeung-chrome.(none)>
+2010-02-02 Bryan Yeung <bryeung at google.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
More information about the Pkg-webkit-commits
mailing list