Changeset 163173 in webkit

Timestamp:

Jan 31, 2014 9:26:46 AM (10 years ago)

Author:

andersca@apple.com

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:

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/API/c/WKURL.cpp (modified) (1 diff)
• Source/WebKit2/Shared/APIURL.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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):
+
 2014-01-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/WKURL.cpp

@@ -53 +53 @@
 bool WKURLIsEqual(WKURLRef a, WKURLRef b)
 {
-    return toImpl(a)->string() == toImpl(b)->string();
+    return API::URL::equals(*toImpl(a), *toImpl(b));
 }
 

trunk/Source/WebKit2/Shared/APIURL.h

@@ -59 +59 @@
     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
     {
@@ -110 +115 @@
     }
 
+    const WebCore::URL& url() const
+    {
+        parseURLIfNecessary();
+        return *m_parsedURL;
+    }
+
     void parseURLIfNecessary() const
     {

trunk/Tools/ChangeLog

@@ +1 @@
+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:
+
 2014-01-31  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp

@@ -110 +110 @@
 
 // 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;