<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23911] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23911">23911</a></dd>
<dt>Author</dt> <dd>bdash</dd>
<dt>Date</dt> <dd>2007-07-01 07:20:13 -0700 (Sun, 01 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-07-01 MorganL <morganl.webkit@yahoo.com>
Reviewed by Darin.
Fix for http://bugs.webkit.org/show_bug.cgi?id=14448
HTMLObjectElement::data should return an absolute URL
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::isImageType):
(WebCore::HTMLObjectElement::data):
2007-07-01 MorganL <morganl.webkit@yahoo.com>
Reviewed by Darin.
Tests for http://bugs.webkit.org/show_bug.cgi?id=14448
HTMLObjectElement::data should return an absolute URL
* fast/dom/object-data-absurl-expected.txt: Added.
* fast/dom/object-data-absurl.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlHTMLObjectElementcpp">trunk/WebCore/html/HTMLObjectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomobjectdataabsurlexpectedtxt">trunk/LayoutTests/fast/dom/object-data-absurl-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomobjectdataabsurlhtml">trunk/LayoutTests/fast/dom/object-data-absurl.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (23910 => 23911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2007-07-01 14:17:48 UTC (rev 23910)
+++ trunk/LayoutTests/ChangeLog 2007-07-01 14:20:13 UTC (rev 23911)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-07-01 MorganL <morganl.webkit@yahoo.com>
+
+ Reviewed by Darin.
+
+ Tests for http://bugs.webkit.org/show_bug.cgi?id=14448
+ HTMLObjectElement::data should return an absolute URL
+
+ * fast/dom/object-data-absurl-expected.txt: Added.
+ * fast/dom/object-data-absurl.html: Added.
+
</ins><span class="cx"> 2007-06-29 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><span class="cx"> New test that makes sure we handle putting isindex into form data correctly.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomobjectdataabsurlexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/object-data-absurl-expected.txt (0 => 23911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/object-data-absurl-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/object-data-absurl-expected.txt 2007-07-01 14:20:13 UTC (rev 23911)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+This test checks that the data property of an HTMLObjectElement returns an absolute URL. See bug 14448 for reference.
+
+If the test passes, you should see the text PASS below the Apple logo.
+
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomobjectdataabsurlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/object-data-absurl.html (0 => 23911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/object-data-absurl.html (rev 0)
+++ trunk/LayoutTests/fast/dom/object-data-absurl.html 2007-07-01 14:20:13 UTC (rev 23911)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+function getBaseURL() {
+ var href = document.location.href;
+ var lastSlash = href.lastIndexOf("/");
+ return href.substring(0, lastSlash);
+}
+function test() {
+ var result;
+ var url = document.getElementsByTagName("object")[0].data;
+ if (url == "resources/apple.gif" || url.indexOf(getBaseURL()) != 0) {
+ result = "FAIL";
+ } else {
+ result = "PASS";
+ }
+ document.getElementById("console").appendChild(document.createTextNode(result));
+}
+</script>
+</head>
+<body onload="test()">
+<p>
+This test checks that the <tt>data</tt> property of an HTMLObjectElement returns an absolute URL.
+See <a href="http://bugs.webkit.org/show_bug.cgi?id=14448">bug 14448</a> for reference.
+</p>
+<p>
+If the test passes, you should see the text PASS below the Apple logo.
+</p>
+<object data="resources/apple.gif"></object>
+<div id="console"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (23910 => 23911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-07-01 14:17:48 UTC (rev 23910)
+++ trunk/WebCore/ChangeLog 2007-07-01 14:20:13 UTC (rev 23911)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-07-01 MorganL <morganl.webkit@yahoo.com>
+
+ Reviewed by Darin.
+
+ Fix for http://bugs.webkit.org/show_bug.cgi?id=14448
+ HTMLObjectElement::data should return an absolute URL
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::isImageType):
+ (WebCore::HTMLObjectElement::data):
+
</ins><span class="cx"> 2007-07-01 Holger Hans Peter Freyther <zecke@selfish.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLObjectElement.cpp (23910 => 23911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLObjectElement.cpp 2007-07-01 14:17:48 UTC (rev 23910)
+++ trunk/WebCore/html/HTMLObjectElement.cpp 2007-07-01 14:20:13 UTC (rev 23911)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (Frame* frame = document()->frame()) {
</span><del>- KURL completedURL(frame->loader()->completeURL(m_url));
</del><ins>+ KURL completedURL(document()->completeURL(m_url).deprecatedString());
</ins><span class="cx"> return frame->loader()->client()->objectContentType(completedURL, m_serviceType) == ObjectContentImage;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx">
</span><span class="cx"> String HTMLObjectElement::data() const
</span><span class="cx"> {
</span><del>- return getAttribute(dataAttr);
</del><ins>+ return document()->completeURL(getAttribute(dataAttr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLObjectElement::setData(const String& value)
</span></span></pre>
</div>
</div>
</body>
</html>