Changeset 243698 in webkit

Timestamp:

Apr 1, 2019, 11:21:01 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Add SPI to canonicalize NSURLs with WTF::URL
​https://bugs.webkit.org/show_bug.cgi?id=196415
<rdar://problem/44980271>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-04-01
Reviewed by Darin Adler.

Source/WebKitLegacy/mac:

• Misc/WebNSURLExtras.h:
• Misc/WebNSURLExtras.mm:

(-[NSURL _webkit_canonicalize_with_wtf]):
_webkit_canonicalize is old and changing it causes strange bugs like rdar://problem/5315926
Instead, make a new version that uses WTF::URL to canonicalize an NSURL.

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKitLegacy/mac/URLCanonicalization.mm: Added.

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/Misc/WebNSURLExtras.h (modified) (1 diff)
• Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/URLCanonicalization.mm (added)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-04-01  Alex Christensen  <achristensen@webkit.org>
+
+        Add SPI to canonicalize NSURLs with WTF::URL
+        https://bugs.webkit.org/show_bug.cgi?id=196415
+        <rdar://problem/44980271>
+
+        Reviewed by Darin Adler.
+
+        * Misc/WebNSURLExtras.h:
+        * Misc/WebNSURLExtras.mm:
+        (-[NSURL _webkit_canonicalize_with_wtf]):
+        _webkit_canonicalize is old and changing it causes strange bugs like rdar://problem/5315926
+        Instead, make a new version that uses WTF::URL to canonicalize an NSURL.
+
 2019-03-31  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.h

@@ -61 +61 @@
 
 - (NSURL *)_webkit_canonicalize;
+- (NSURL *)_webkit_canonicalize_with_wtf;
 - (NSURL *)_webkit_URLByRemovingFragment;
 - (NSURL *)_web_URLByRemovingUserInfo;

trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm

@@ -134 +134 @@
 }
 
+- (NSURL *)_webkit_canonicalize_with_wtf
+{
+    auto url = WTF::URL(self);
+    return url.isValid() ? (NSURL *)url : nil;
+}
+
 - (NSURL *)_webkit_URLByRemovingFragment 
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-01  Alex Christensen  <achristensen@webkit.org>
+
+        Add SPI to canonicalize NSURLs with WTF::URL
+        https://bugs.webkit.org/show_bug.cgi?id=196415
+        <rdar://problem/44980271>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKitLegacy/mac/URLCanonicalization.mm: Added.
+        (TestWebKitAPI::TEST):
+
 2019-04-01  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -313 +313 @@
                 5C4A84951F7EEFFC00ACFC54 /* Configuration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C4A84941F7EEFD400ACFC54 /* Configuration.mm */; };
                 5C69BDD51F82A7EF000F4F4B /* JavaScriptDuringNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C69BDD41F82A7EB000F4F4B /* JavaScriptDuringNavigation.mm */; };
+                5C6E27A7224EEBEA00128736 /* URLCanonicalization.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E27A6224EEBEA00128736 /* URLCanonicalization.mm */; };
                 5C7148952123A40A00FDE3C5 /* WKWebsiteDatastore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7148942123A40700FDE3C5 /* WKWebsiteDatastore.mm */; };
                 5C75716122124C5200B9E5AC /* BundleRetainPagePlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C75715F221249BD00B9E5AC /* BundleRetainPagePlugIn.mm */; };
@@ -1719 +1720 @@
                 5C5E633D1D0B67940085A025 /* UniqueRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueRef.cpp; sourceTree = "<group>"; };
                 5C69BDD41F82A7EB000F4F4B /* JavaScriptDuringNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JavaScriptDuringNavigation.mm; sourceTree = "<group>"; };
+                5C6E27A6224EEBEA00128736 /* URLCanonicalization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = URLCanonicalization.mm; sourceTree = "<group>"; };
                 5C7148942123A40700FDE3C5 /* WKWebsiteDatastore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebsiteDatastore.mm; sourceTree = "<group>"; };
                 5C75715F221249BD00B9E5AC /* BundleRetainPagePlugIn.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BundleRetainPagePlugIn.mm; sourceTree = "<group>"; };
@@ -2851 +2853 @@
                                 9BD5111B1FE8E11600D2B630 /* AccessingPastedImage.mm */,
                                 6B306105218A372900F5A802 /* ClosingWebView.mm */,
+                                5C6E27A6224EEBEA00128736 /* URLCanonicalization.mm */,
                         );
                         path = mac;
@@ -4341 +4344 @@
                                 5CB40B4E1F4B98D3007DC7B9 /* UIDelegate.mm in Sources */,
                                 F46849BE1EEF58E400B937FE /* UIPasteboardTests.mm in Sources */,
+                                5C6E27A7224EEBEA00128736 /* URLCanonicalization.mm in Sources */,
                                 E3A1E77F21B25B39008C6007 /* URLParserTextEncoding.cpp in Sources */,
                                 7CCE7F271A411AF600447C4C /* UserContentController.mm in Sources */,