WebKit Bugzilla
Attachment 339612 Details for
Bug 185334
: Shift to a lower-level framework for simplifying URLs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185334-20180504163847.patch (text/plain), 22.06 KB, created by
Tim Horton
on 2018-05-04 16:38:48 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Tim Horton
Created:
2018-05-04 16:38:48 PDT
Size:
22.06 KB
patch
obsolete
>Subversion Revision: 231373 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index d7509ebfe1d0eb420b739bd75269bca8d93636cb..3c9a2f120c09d7d35396c538e166a7bb2c28acc1 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,12 @@ >+2018-05-04 Tim Horton <timothy_horton@apple.com> >+ >+ Shift to a lower-level framework for simplifying URLs >+ https://bugs.webkit.org/show_bug.cgi?id=185334 >+ >+ Reviewed by Dan Bernstein. >+ >+ * wtf/Platform.h: >+ > 2018-05-04 Antti Koivisto <antti@apple.com> > > OptionsSet initializer list constructor should be constexpr >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 0ba10b34f9106c347d262918c00eac5d257f085d..4117f1c6ba495e045febf79f92c4142583890c97 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,14 @@ >+2018-05-04 Tim Horton <timothy_horton@apple.com> >+ >+ Shift to a lower-level framework for simplifying URLs >+ https://bugs.webkit.org/show_bug.cgi?id=185334 >+ >+ Reviewed by Dan Bernstein. >+ >+ * Configurations/WebCore.xcconfig: >+ * platform/mac/DragImageMac.mm: >+ (WebCore::LinkImageLayout::LinkImageLayout): >+ > 2018-05-04 Chris Dumez <cdumez@apple.com> > > Unreviewed, rolling out r231331. >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 145174da006a436338374fff5f4e498266456a24..351a72f957b760550a1b9ea6deee3ff27bc9a4f8 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,14 @@ >+2018-05-04 Tim Horton <timothy_horton@apple.com> >+ >+ Shift to a lower-level framework for simplifying URLs >+ https://bugs.webkit.org/show_bug.cgi?id=185334 >+ >+ Reviewed by Dan Bernstein. >+ >+ * PAL.xcodeproj/project.pbxproj: >+ * pal/PlatformMac.cmake: >+ * pal/spi/cocoa/URLFormattingSPI.h: Renamed from Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h. >+ > 2018-05-03 Eric Carlson <eric.carlson@apple.com> > > [iOS] Provide audio route information when invoking AirPlay picker >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 9bb2d41fd28332b07ea6e49f1020ca1b451f4b39..f422be80e5c21209dc839c8276ce5a06b36a9ffa 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,14 @@ >+2018-05-04 Tim Horton <timothy_horton@apple.com> >+ >+ Shift to a lower-level framework for simplifying URLs >+ https://bugs.webkit.org/show_bug.cgi?id=185334 >+ >+ Reviewed by Dan Bernstein. >+ >+ * Configurations/WebKit.xcconfig: >+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm: >+ (-[WKFullScreenWindowController _updateLocationInfo]): >+ > 2018-05-04 Tim Horton <timothy_horton@apple.com> > > Wasted time dlopening Lookup when tearing down a WKWebView >diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h >index d89341675f2dcc5a7247fa8db7d083423362815e..52279ffda39563981c3f3167ee2b0c18a0989bfb 100644 >--- a/Source/WTF/wtf/Platform.h >+++ b/Source/WTF/wtf/Platform.h >@@ -1324,6 +1324,10 @@ > #define HAVE_RSA_PSS 1 > #endif > >+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) >+#define HAVE_URL_FORMATTING 1 >+#endif >+ > #if !OS(WINDOWS) > #define HAVE_STACK_BOUNDS_FOR_NEW_THREAD 1 > #endif >diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig >index e1afedf7990740f11e5c651d66e9de23957d2c07..fb2d99db4a9b5133ee0c1ebbf0dd59b39810634a 100644 >--- a/Source/WebCore/Configurations/WebCore.xcconfig >+++ b/Source/WebCore/Configurations/WebCore.xcconfig >@@ -121,8 +121,11 @@ WK_SYSTEM_PREVIEW_LDFLAGS = $(WK_SYSTEM_PREVIEW_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_SYSTEM_PREVIEW_LDFLAGS_iphoneos = -framework CoreImage; > WK_SYSTEM_PREVIEW_LDFLAGS_iphonesimulator = -framework CoreImage; > >+WK_URL_FORMATTING_LDFLAGS = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING)); >+WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting; >+ > // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969> >-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS); >+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); > > OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI; > OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit; >@@ -183,3 +186,9 @@ TEXT_BASED_API_FILE = WebCore.tbd > > WK_HAVE_DEVICE_IDENTITY = $(WK_HAVE_DEVICE_IDENTITY_$(PLATFORM_NAME)); > WK_HAVE_DEVICE_IDENTITY_iphoneos = YES; >+ >+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)); >+WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12)); >+WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014)); >+WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES; >+WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES; >diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >index b4030b588d0a061b01b189c380cdb41b74f6c6a7..94849ceaf2bfd383dac976bac5390aaceec0325b 100644 >--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >@@ -40,7 +40,7 @@ > 0C2DA1441F3BEB4900DBC317 /* IOReturnSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1281F3BEB4900DBC317 /* IOReturnSPI.h */; }; > 0C2DA1451F3BEB4900DBC317 /* IOSurfaceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */; }; > 0C2DA1461F3BEB4900DBC317 /* IOTypesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */; }; >- 0C2DA1471F3BEB4900DBC317 /* LinkPresentationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */; }; >+ 0C2DA1471F3BEB4900DBC317 /* URLFormattingSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12B1F3BEB4900DBC317 /* URLFormattingSPI.h */; }; > 0C2DA1481F3BEB4900DBC317 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */; }; > 0C2DA1491F3BEB4900DBC317 /* NEFilterSourceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */; }; > 0C2DA14A1F3BEB4900DBC317 /* NSAttributedStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */; }; >@@ -179,7 +179,7 @@ > 0C2DA1281F3BEB4900DBC317 /* IOReturnSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOReturnSPI.h; sourceTree = "<group>"; }; > 0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSurfaceSPI.h; sourceTree = "<group>"; }; > 0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOTypesSPI.h; sourceTree = "<group>"; }; >- 0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkPresentationSPI.h; sourceTree = "<group>"; }; >+ 0C2DA12B1F3BEB4900DBC317 /* URLFormattingSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFormattingSPI.h; sourceTree = "<group>"; }; > 0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; }; > 0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NEFilterSourceSPI.h; sourceTree = "<group>"; }; > 0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAttributedStringSPI.h; sourceTree = "<group>"; }; >@@ -366,7 +366,6 @@ > 0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */, > 0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */, > 0C5AF9121F43A4C7002EAC02 /* LaunchServicesSPI.h */, >- 0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */, > 0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */, > 0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */, > 0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */, >@@ -386,6 +385,7 @@ > 0C2DA13A1F3BEB4900DBC317 /* pthreadSPI.h */, > 0C2DA13B1F3BEB4900DBC317 /* QuartzCoreSPI.h */, > 0C2DA13C1F3BEB4900DBC317 /* ServersSPI.h */, >+ 0C2DA12B1F3BEB4900DBC317 /* URLFormattingSPI.h */, > 0C2DA13D1F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h */, > ); > path = cocoa; >@@ -645,7 +645,6 @@ > 0C2DA1461F3BEB4900DBC317 /* IOTypesSPI.h in Headers */, > A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */, > 0C5AF91C1F43A4C7002EAC02 /* LaunchServicesSPI.h in Headers */, >- 0C2DA1471F3BEB4900DBC317 /* LinkPresentationSPI.h in Headers */, > 1C4876D91F8D7F4E00CCEEBD /* Logging.h in Headers */, > 0C77858B1F45130F00F4EBB6 /* LookupSPI.h in Headers */, > 0C2DA1481F3BEB4900DBC317 /* MachVMSPI.h in Headers */, >@@ -710,6 +709,7 @@ > A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */, > 0C7785A11F45130F00F4EBB6 /* TUCallSPI.h in Headers */, > 0C5AF9221F43A4C7002EAC02 /* UIKitSPI.h in Headers */, >+ 0C2DA1471F3BEB4900DBC317 /* URLFormattingSPI.h in Headers */, > 0C2DA1591F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h in Headers */, > A10826F91F576292004772AC /* WebPanel.h in Headers */, > ); >diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake >index 3900574f941538ebf5fdbda19a4d5cf3526d8f94..7e382d88e241eec690c5c5e92da3982446578192 100644 >--- a/Source/WebCore/PAL/pal/PlatformMac.cmake >+++ b/Source/WebCore/PAL/pal/PlatformMac.cmake >@@ -24,7 +24,6 @@ list(APPEND PAL_PUBLIC_HEADERS > spi/cocoa/IOSurfaceSPI.h > spi/cocoa/IOTypesSPI.h > spi/cocoa/LaunchServicesSPI.h >- spi/cocoa/LinkPresentationSPI.h > spi/cocoa/MachVMSPI.h > spi/cocoa/NEFilterSourceSPI.h > spi/cocoa/NSAttributedStringSPI.h >@@ -43,6 +42,7 @@ list(APPEND PAL_PUBLIC_HEADERS > spi/cocoa/PassKitSPI.h > spi/cocoa/QuartzCoreSPI.h > spi/cocoa/ServersSPI.h >+ spi/cocoa/URLFormattingSPI.h > spi/cocoa/WebFilterEvaluatorSPI.h > spi/cocoa/pthreadSPI.h > >diff --git a/Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h >deleted file mode 100644 >index 6d90afab8ff29174e079cad567f94246d7ef4f8f..0000000000000000000000000000000000000000 >--- a/Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h >+++ /dev/null >@@ -1,40 +0,0 @@ >-/* >- * Copyright (C) 2017 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) >- >-#if USE(APPLE_INTERNAL_SDK) >- >-#import <LinkPresentation/LPNSURLExtras.h> >- >-#else >- >-@interface NSURL () >-- (NSString *)_lp_simplifiedDisplayString; >-@end >- >-#endif >- >-#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS) >diff --git a/Source/WebCore/PAL/pal/spi/cocoa/URLFormattingSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/URLFormattingSPI.h >new file mode 100644 >index 0000000000000000000000000000000000000000..e483e2255a6ce7e88c8a1272a2c3e88d997f2fbd >--- /dev/null >+++ b/Source/WebCore/PAL/pal/spi/cocoa/URLFormattingSPI.h >@@ -0,0 +1,40 @@ >+/* >+ * Copyright (C) 2017 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#if USE(APPLE_INTERNAL_SDK) >+ >+#if HAVE(URL_FORMATTING) >+#import <URLFormatting/LPNSURLExtras.h> >+#else >+#import <LinkPresentation/LPNSURLExtras.h> >+#endif >+ >+#else >+ >+@interface NSURL () >+- (NSString *)_lp_simplifiedDisplayString; >+@end >+ >+#endif >diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm >index 20799bd6a4ca82edd3898834e98888f07659e6dd..4aaadac4057b8743bb8205dcb333c88fa0deb118 100644 >--- a/Source/WebCore/platform/mac/DragImageMac.mm >+++ b/Source/WebCore/platform/mac/DragImageMac.mm >@@ -41,10 +41,10 @@ > #import "URL.h" > #import <pal/spi/cg/CoreGraphicsSPI.h> > #import <pal/spi/cocoa/CoreTextSPI.h> >-#import <pal/spi/cocoa/LinkPresentationSPI.h> >+#import <pal/spi/cocoa/URLFormattingSPI.h> > #import <wtf/SoftLinking.h> > >-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 >+#if !HAVE(URL_FORMATTING) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 > SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(LinkPresentation) > #endif > >@@ -199,7 +199,9 @@ LinkImageLayout::LinkImageLayout(URL& url, const String& titleString) > NSString *absoluteURLString = [cocoaURL absoluteString]; > > NSString *domain = absoluteURLString; >-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 >+#if HAVE(URL_FORMATTING) >+ domain = [cocoaURL _lp_simplifiedDisplayString]; >+#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 > if (LinkPresentationLibrary()) > domain = [cocoaURL _lp_simplifiedDisplayString]; > #endif >diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig >index 5d7ae926f315cc225efa57512d247887bb748506..871f04717136826d496d181f3ecf96c8fb5c1396 100644 >--- a/Source/WebKit/Configurations/WebKit.xcconfig >+++ b/Source/WebKit/Configurations/WebKit.xcconfig >@@ -109,7 +109,10 @@ WK_SAFE_BROWSING_LDFLAGS_MACOS_SINCE_1013 = -weak_framework SafariSafeBrowsing; > WK_UIKIT_LDFLAGS = $(WK_UIKIT_LDFLAGS_$(WK_COCOA_TOUCH)); > WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit; > >-FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PDF_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_UIKIT_LDFLAGS); >+WK_URL_FORMATTING_LDFLAGS = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING)); >+WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting; >+ >+FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PDF_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); > > // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols. > UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE; >@@ -144,3 +147,9 @@ WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*11.*] = YES; > > WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)); > WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache; >+ >+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)); >+WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12)); >+WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014)); >+WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES; >+WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES; >diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm >index b3de4ddd94a9caa321b68f8103130c0622d55e64..48884cf7790c063a1b3a5b885f957a9fdf933291 100644 >--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm >+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm >@@ -46,16 +46,18 @@ > #import <WebCore/LocalizedStrings.h> > #import <WebCore/WebCoreNSURLExtras.h> > #import <pal/spi/cf/CFNetworkSPI.h> >-#import <pal/spi/cocoa/LinkPresentationSPI.h> > #import <pal/spi/cocoa/NSStringSPI.h> > #import <pal/spi/cocoa/QuartzCoreSPI.h> >+#import <pal/spi/cocoa/URLFormattingSPI.h> > #import <wtf/SoftLinking.h> > #import <wtf/spi/cocoa/SecuritySPI.h> > > using namespace WebKit; > using namespace WebCore; > >+#if !HAVE(URL_FORMATTING) > SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(LinkPresentation) >+#endif > > namespace WebKit { > >@@ -800,10 +802,14 @@ - (void)_updateLocationInfo > > NSString *domain = nil; > >+#if HAVE(URL_FORMATTING) >+ domain = [url _lp_simplifiedDisplayString]; >+#else > if (LinkPresentationLibrary()) > domain = [url _lp_simplifiedDisplayString]; > else > domain = userVisibleString(url); >+#endif > > NSString *text = nil; > if ([[url scheme] caseInsensitiveCompare:@"data"] == NSOrderedSame)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=339612">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185334
:
339606
| 339612