diff options
| author | ap <ap@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2007-10-31 08:22:43 +0000 |
|---|---|---|
| committer | ap <ap@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2007-10-31 08:22:43 +0000 |
| commit | a7af10ab30bf044cd9ef91425d7d12076bbb965d (patch) | |
| tree | a33b55590beb6bbcf05d821ae1ee38aefc9d7426 | |
| parent | 1fb054ad41e199f12d04ecf4a7097af426afff9d (diff) | |
| download | chromium_src-a7af10ab30bf044cd9ef91425d7d12076bbb965d.zip chromium_src-a7af10ab30bf044cd9ef91425d7d12076bbb965d.tar.gz chromium_src-a7af10ab30bf044cd9ef91425d7d12076bbb965d.tar.bz2 | |
Reviewed by Anders.
http://bugs.webkit.org/show_bug.cgi?id=15762
XSLStylesheet loads subresources from a wrong URL
Covered by corrected existing tests.
* xml/XSLStyleSheet.cpp:
(WebCore::XSLStyleSheet::parseString): Pass stylesheet URL, not
the document one.
git-svn-id: svn://svn.chromium.org/blink/trunk@27302 bbb929c8-8fbe-4397-9dbb-9b2b20218538
5 files changed, 27 insertions, 3 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog index e230798..e0b8aec 100644 --- a/third_party/WebKit/LayoutTests/ChangeLog +++ b/third_party/WebKit/LayoutTests/ChangeLog @@ -1,3 +1,14 @@ +2007-10-31 Alexey Proskuryakov <ap@webkit.org> + + Reviewed by Anders. + + http://bugs.webkit.org/show_bug.cgi?id=15762 + XSLStylesheet loads subresources from a wrong URL + + * fast/xsl/resources/xslt-second-level-import.xsl: + * fast/parser/resources/external-entities.xsl.xsl: + These tests depended on old buggy behavior. + 2007-10-29 Antti Koivisto <antti@apple.com> Reviewed by Maciej. diff --git a/third_party/WebKit/LayoutTests/fast/parser/resources/external-entities.xsl b/third_party/WebKit/LayoutTests/fast/parser/resources/external-entities.xsl index 0b408e4..000ff9b 100644 --- a/third_party/WebKit/LayoutTests/fast/parser/resources/external-entities.xsl +++ b/third_party/WebKit/LayoutTests/fast/parser/resources/external-entities.xsl @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE xsl:stylesheet SYSTEM "resources/external-entities.dtd">
+<!DOCTYPE xsl:stylesheet SYSTEM "external-entities.dtd">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
<HTML>
diff --git a/third_party/WebKit/LayoutTests/fast/xsl/resources/xslt-second-level-import.xsl b/third_party/WebKit/LayoutTests/fast/xsl/resources/xslt-second-level-import.xsl index 96b4980..be8651e 100644 --- a/third_party/WebKit/LayoutTests/fast/xsl/resources/xslt-second-level-import.xsl +++ b/third_party/WebKit/LayoutTests/fast/xsl/resources/xslt-second-level-import.xsl @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE xsl:stylesheet SYSTEM "resources/xslt-second-level-import.xsl.dtd"> +<!DOCTYPE xsl:stylesheet SYSTEM "xslt-second-level-import.xsl.dtd"> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:include href="xslt-second-level-import2.xsl" /> <xsl:template match="/"> diff --git a/third_party/WebKit/WebCore/ChangeLog b/third_party/WebKit/WebCore/ChangeLog index 619b9b0..2baeb2e2 100644 --- a/third_party/WebKit/WebCore/ChangeLog +++ b/third_party/WebKit/WebCore/ChangeLog @@ -1,5 +1,18 @@ 2007-10-31 Alexey Proskuryakov <ap@webkit.org> + Reviewed by Anders. + + http://bugs.webkit.org/show_bug.cgi?id=15762 + XSLStylesheet loads subresources from a wrong URL + + Covered by corrected existing tests. + + * xml/XSLStyleSheet.cpp: + (WebCore::XSLStyleSheet::parseString): Pass stylesheet URL, not + the document one. + +2007-10-31 Alexey Proskuryakov <ap@webkit.org> + Reviewed by Darin. http://bugs.webkit.org/show_bug.cgi?id=10818 diff --git a/third_party/WebKit/WebCore/xml/XSLStyleSheet.cpp b/third_party/WebKit/WebCore/xml/XSLStyleSheet.cpp index 7abae7e..22a0464 100644 --- a/third_party/WebKit/WebCore/xml/XSLStyleSheet.cpp +++ b/third_party/WebKit/WebCore/xml/XSLStyleSheet.cpp @@ -145,7 +145,7 @@ bool XSLStyleSheet::parseString(const String& string, bool strict) xmlSetStructuredErrorFunc(chrome, XSLTProcessor::parseErrorFunc); m_stylesheetDoc = xmlReadMemory(reinterpret_cast<const char*>(string.characters()), string.length() * sizeof(UChar), - m_ownerDocument->URL().ascii(), + href().utf8().data(), BOMHighByte == 0xFF ? "UTF-16LE" : "UTF-16BE", XML_PARSE_NOENT | XML_PARSE_DTDATTR | XML_PARSE_NOWARNING | XML_PARSE_NOCDATA); loadChildSheets(); |