<!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" />
<title>[163173] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163173">163173</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 09:26:46 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: WebKit2.PageLoadBasic API test is failing
https://bugs.webkit.org/show_bug.cgi?id=127892
Reviewed by Dan Bernstein.
Source/WebKit2:
On Mountain Lion, URLs returned by -[NSBundle URLForResource:withExtension:subdirectory] include
localhost as the hostname, but WebCore::URL normalizes those URLs and removes the host name.
Because of this, URLs created by WKURLCreateWithCFURL won't be equal to urls passed through
the WebCore::URL constructor. Change WKURLIsEqual to compare the normalized URLs.
* Shared/API/c/WKURL.cpp:
(WKURLIsEqual):
* Shared/APIURL.h:
(API::URL::equals):
(API::URL::url):
Tools:
Re-enable test.
* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKURLcpp">trunk/Source/WebKit2/Shared/API/c/WKURL.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIURLh">trunk/Source/WebKit2/Shared/APIURL.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PageLoadBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163172 => 163173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Source/WebKit2/ChangeLog        2014-01-31 17:26:46 UTC (rev 163173)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-31 Anders Carlsson <andersca@apple.com>
+
+ REGRESSION: WebKit2.PageLoadBasic API test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=127892
+
+ Reviewed by Dan Bernstein.
+
+ On Mountain Lion, URLs returned by -[NSBundle URLForResource:withExtension:subdirectory] include
+ localhost as the hostname, but WebCore::URL normalizes those URLs and removes the host name.
+
+ Because of this, URLs created by WKURLCreateWithCFURL won't be equal to urls passed through
+ the WebCore::URL constructor. Change WKURLIsEqual to compare the normalized URLs.
+
+ * Shared/API/c/WKURL.cpp:
+ (WKURLIsEqual):
+ * Shared/APIURL.h:
+ (API::URL::equals):
+ (API::URL::url):
+
</ins><span class="cx"> 2014-01-31 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: When deleting object stores/indexes, also delete associated records
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKURL.cpp (163172 => 163173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKURL.cpp        2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Source/WebKit2/Shared/API/c/WKURL.cpp        2014-01-31 17:26:46 UTC (rev 163173)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool WKURLIsEqual(WKURLRef a, WKURLRef b)
</span><span class="cx"> {
</span><del>- return toImpl(a)->string() == toImpl(b)->string();
</del><ins>+ return API::URL::equals(*toImpl(a), *toImpl(b));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKURLCopyHostName(WKURLRef url)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIURL.h (163172 => 163173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURL.h        2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Source/WebKit2/Shared/APIURL.h        2014-01-31 17:26:46 UTC (rev 163173)
</span><span class="lines">@@ -58,6 +58,11 @@
</span><span class="cx">
</span><span class="cx"> const WTF::String& string() const { return m_string; }
</span><span class="cx">
</span><ins>+ static bool equals(const URL& a, const URL& b)
+ {
+ return a.url() == b.url();
+ }
+
</ins><span class="cx"> WTF::String host() const
</span><span class="cx"> {
</span><span class="cx"> parseURLIfNecessary();
</span><span class="lines">@@ -109,6 +114,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const WebCore::URL& url() const
+ {
+ parseURLIfNecessary();
+ return *m_parsedURL;
+ }
+
</ins><span class="cx"> void parseURLIfNecessary() const
</span><span class="cx"> {
</span><span class="cx"> if (m_parsedURL)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163172 => 163173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Tools/ChangeLog        2014-01-31 17:26:46 UTC (rev 163173)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-31 Anders Carlsson <andersca@apple.com>
+
+ REGRESSION: WebKit2.PageLoadBasic API test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=127892
+
+ Reviewed by Dan Bernstein.
+
+ Re-enable test.
+
+ * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+
</ins><span class="cx"> 2014-01-31 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [jhbuild] Disable escape sequences in EWS output
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PageLoadBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp (163172 => 163173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp        2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp        2014-01-31 17:26:46 UTC (rev 163173)
</span><span class="lines">@@ -109,11 +109,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: http://webkit.org/b/127934 REGRESSION (r163037): WebKit2.PageLoadBasic API test failing on Mountain Lion
</span><del>-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080
-TEST(WebKit2, DISABLED_PageLoadBasic)
-#else
</del><span class="cx"> TEST(WebKit2, PageLoadBasic)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> State state;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>