Title: [163173] trunk
- Revision
- 163173
- Author
- [email protected]
- Date
- 2014-01-31 09:26:46 -0800 (Fri, 31 Jan 2014)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163172 => 163173)
--- 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)
@@ -1,3 +1,22 @@
+2014-01-31 Anders Carlsson <[email protected]>
+
+ 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):
+
2014-01-31 Brady Eidson <[email protected]>
IDB: When deleting object stores/indexes, also delete associated records
Modified: trunk/Source/WebKit2/Shared/API/c/WKURL.cpp (163172 => 163173)
--- 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)
@@ -52,7 +52,7 @@
bool WKURLIsEqual(WKURLRef a, WKURLRef b)
{
- return toImpl(a)->string() == toImpl(b)->string();
+ return API::URL::equals(*toImpl(a), *toImpl(b));
}
WKStringRef WKURLCopyHostName(WKURLRef url)
Modified: trunk/Source/WebKit2/Shared/APIURL.h (163172 => 163173)
--- 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)
@@ -58,6 +58,11 @@
const WTF::String& string() const { return m_string; }
+ static bool equals(const URL& a, const URL& b)
+ {
+ return a.url() == b.url();
+ }
+
WTF::String host() const
{
parseURLIfNecessary();
@@ -109,6 +114,12 @@
{
}
+ const WebCore::URL& url() const
+ {
+ parseURLIfNecessary();
+ return *m_parsedURL;
+ }
+
void parseURLIfNecessary() const
{
if (m_parsedURL)
Modified: trunk/Tools/ChangeLog (163172 => 163173)
--- trunk/Tools/ChangeLog 2014-01-31 17:03:17 UTC (rev 163172)
+++ trunk/Tools/ChangeLog 2014-01-31 17:26:46 UTC (rev 163173)
@@ -1,3 +1,14 @@
+2014-01-31 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-01-31 Csaba Osztrogonác <[email protected]>
[jhbuild] Disable escape sequences in EWS output
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp (163172 => 163173)
--- 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)
@@ -109,11 +109,7 @@
}
// FIXME: http://webkit.org/b/127934 REGRESSION (r163037): WebKit2.PageLoadBasic API test failing on Mountain Lion
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080
-TEST(WebKit2, DISABLED_PageLoadBasic)
-#else
TEST(WebKit2, PageLoadBasic)
-#endif
{
State state;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
