[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aestes at apple.com
aestes at apple.com
Wed Dec 22 12:39:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9d830034cb0f0fd572307adc2fe08885794e6503
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 21:32:57 2010 +0000
A URL in a <param> should be parsed the same as if it were specified as
the data attribute of an <object>.
https://bugs.webkit.org/show_bug.cgi?id=44671
Reviewed by Eric Carlson.
WebCore:
Test: fast/replaced/object-param-url-control-char.html
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::updateWidget): Call deprecatedParseURL()
on <param> values of names that we treat as URLs ("src", "movie", "code"
and "url").
LayoutTests:
* fast/replaced/object-param-url-control-char-expected.txt: Added.
* fast/replaced/object-param-url-control-char.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 84cc0e2..4c3a323 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-26 Andy Estes <aestes at apple.com>
+
+ Reviewed by Eric Carlson.
+
+ A URL in a <param> should be parsed the same as if it were specified as
+ the data attribute of an <object>.
+ https://bugs.webkit.org/show_bug.cgi?id=44671
+
+ * fast/replaced/object-param-url-control-char-expected.txt: Added.
+ * fast/replaced/object-param-url-control-char.html: Added.
+
2010-08-26 Oliver Hunt <oliver at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/fast/replaced/object-param-url-control-char-expected.txt b/LayoutTests/fast/replaced/object-param-url-control-char-expected.txt
new file mode 100644
index 0000000..775aa69
--- /dev/null
+++ b/LayoutTests/fast/replaced/object-param-url-control-char-expected.txt
@@ -0,0 +1,4 @@
+
+This test verifies that a URL specified in a <param> of an <object> is parsed the same as if it was specified as the data attribute of the <object>. Specifically, this verifies that control characters and leading/trailing whitespace are stripped, and that a resource surrounded with url('') is understood.
+
+PASS
diff --git a/LayoutTests/fast/replaced/object-param-url-control-char.html b/LayoutTests/fast/replaced/object-param-url-control-char.html
new file mode 100644
index 0000000..95590f4
--- /dev/null
+++ b/LayoutTests/fast/replaced/object-param-url-control-char.html
@@ -0,0 +1,30 @@
+<html>
+ <head>
+ <script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+ document.addEventListener("beforeload", function(event) {
+ var console = document.getElementById("console");
+
+ if (event.url == "scheme://url-with-control-char/")
+ console.innerHTML = "PASS";
+ else
+ console.innerHTML = "FAIL";
+
+ event.preventDefault();
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }, true);
+ </script>
+ </head>
+ <body>
+ <object width="0" height="0">
+ <param name="movie" value="
uRl('scheme://url-with-control-char/')
">
+ </object>
+ <p>This test verifies that a URL specified in a <param> of an <object> is parsed the same as if it was specified as the data attribute of the <object>. Specifically, this verifies that control characters and leading/trailing whitespace are stripped, and that a resource surrounded with url('') is understood.</p>
+ <div id="console"></div>
+ </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aa04b81..28bb1a4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-26 Andy Estes <aestes at apple.com>
+
+ Reviewed by Eric Carlson.
+
+ A URL in a <param> should be parsed the same as if it were specified as
+ the data attribute of an <object>.
+ https://bugs.webkit.org/show_bug.cgi?id=44671
+
+ Test: fast/replaced/object-param-url-control-char.html
+
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::updateWidget): Call deprecatedParseURL()
+ on <param> values of names that we treat as URLs ("src", "movie", "code"
+ and "url").
+
2010-08-26 Stephen White <senorblanco at chromium.org>
Unreviewed; build fix.
diff --git a/WebCore/rendering/RenderEmbeddedObject.cpp b/WebCore/rendering/RenderEmbeddedObject.cpp
index 55b230b..027903d 100644
--- a/WebCore/rendering/RenderEmbeddedObject.cpp
+++ b/WebCore/rendering/RenderEmbeddedObject.cpp
@@ -228,7 +228,7 @@ void RenderEmbeddedObject::updateWidget(bool onlyCreateNonNetscapePlugins)
HTMLParamElement* p = static_cast<HTMLParamElement*>(child);
String name = p->name();
if (url.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url")))
- url = p->value();
+ url = deprecatedParseURL(p->value());
if (serviceType.isEmpty() && equalIgnoringCase(name, "type")) {
serviceType = p->value();
size_t pos = serviceType.find(";");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list