Attachment 361440 Details for Bug 194411 – Patch

[patch] Patch

bug-194411-20190207140545.patch (text/plain), 17.91 KB, created by BJ Burg on 2019-02-07 14:05:46 PST

(hide)

Description:

Filename:

MIME Type:

Creator: BJ Burg

Created: 2019-02-07 14:05:46 PST

Size: 17.91 KB

patch

obsolete

>Subversion Revision: 241125
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 65684330426e758849b51e259223d37e3270e59e..cf9d6c51f4ca328623a954b39013e9c9e4aebc55 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-07  Brian Burg  <bburg@apple.com>
>+
>+        [Mac] WebInspectorUI.framework does not need to be soft-linked anymore
>+        https://bugs.webkit.org/show_bug.cgi?id=194411
>+        <rdar://problem/47787614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/cocoa/SoftLinking.h:
>+        Remove macro that now has no uses.
>+
> 2019-02-05  Keith Rollin  <krollin@apple.com>
> 
>         Enable the automatic checking and regenerations of .xcfilelists during builds
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1ba08f092cc3185bc189ffe526c1ae9542a5945d..7591b0b27e269ed99b63af4facca190b3499b431 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-02-07  Brian Burg  <bburg@apple.com>
>+
>+        [Mac] WebInspectorUI.framework does not need to be soft-linked anymore
>+        https://bugs.webkit.org/show_bug.cgi?id=194411
>+        <rdar://problem/47787614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebKit.xcconfig:
>+        Conditionalize linking to WebInspectorUI.framework for Mac only.
>+
>+        * UIProcess/mac/WebInspectorProxyMac.mm:
>+        (WebKit::WebInspectorProxy::inspectorPageURL):
>+        (WebKit::WebInspectorProxy::inspectorTestPageURL):
>+        (WebKit::WebInspectorProxy::inspectorBaseURL):
>+        * WebProcess/WebPage/mac/WebInspectorUIMac.mm:
>+        (WebKit::webInspectorUILocalizedStringsURL):
>+
> 2019-02-07  Alex Christensen  <achristensen@webkit.org>
> 
>         Digital crown should scroll safe browsing warning on watchOS
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 9a36586501c2dd39f6780b66302a81163da64397..89c7ede709166570911c1aa0ee0cb8a3f41dc4de 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-02-07  Brian Burg  <bburg@apple.com>
>+
>+        [Mac] WebInspectorUI.framework does not need to be soft-linked anymore
>+        https://bugs.webkit.org/show_bug.cgi?id=194411
>+        <rdar://problem/47787614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebKitLegacy.xcconfig:
>+        Conditionalize linking to WebInspectorUI.framework for Mac only.
>+
>+        * WebCoreSupport/WebInspectorClient.mm:
>+        (WebInspectorFrontendClient::localizedStringsURL):
>+        (-[WebInspectorWindowController inspectorPagePath]):
>+        (-[WebInspectorWindowController inspectorTestPagePath]):
>+
> 2019-02-06  Andy Estes  <aestes@apple.com>
> 
>         [Payment Request] It should be possible to require a phonetic name for shipping contacts
>diff --git a/Source/WTF/wtf/cocoa/SoftLinking.h b/Source/WTF/wtf/cocoa/SoftLinking.h
>index c028cd3f665ec655ce5ca7861ddb575a8b8f9e14..1160829b075664e2583402d9ef06d9d91a5530fe 100644
>--- a/Source/WTF/wtf/cocoa/SoftLinking.h
>+++ b/Source/WTF/wtf/cocoa/SoftLinking.h
>@@ -84,19 +84,6 @@
>         return frameworkLibrary; \
>     }
> 
>-#define SOFT_LINK_STAGED_FRAMEWORK(framework, unstagedLocation, version) \
>-    static void* framework##Library() \
>-    { \
>-        static void* frameworkLibrary = ^{ \
>-            void* result = dlopen("/System/Library/" #unstagedLocation "/" #framework ".framework/Versions/" #version "/" #framework, RTLD_LAZY); \
>-            if (!result) \
>-                result = dlopen("/System/Library/StagedFrameworks/Safari/" #framework ".framework/Versions/" #version "/" #framework, RTLD_LAZY); \
>-            RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
>-            return result; \
>-        }(); \
>-        return frameworkLibrary; \
>-    }
>-
> #define SOFT_LINK_FRAMEWORK_IN_UMBRELLA(umbrella, framework) \
>     static void* framework##Library() \
>     { \
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index d9296a30be86a3c869237cf65a8623c9862a412e..cee1f042467cdc4047590414e7cd837edc3c04f1 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -127,7 +127,10 @@ WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit;
> 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_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_PROXIMITY_NETWORKING_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
>+WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
>+WK_WEBINSPECTORUI_LDFLAGS_macosx = -framework WebInspectorUI;
>+
>+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_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_PROXIMITY_NETWORKING_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
> 
> // Prevent C++ standard library basic_stringstream, 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 -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE;
>diff --git a/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm b/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>index 580c3f5822e03c925ae910d89cbb52d7b19c52a4..3ee4019eeec69a513ab32d0564b4d3935728d954 100644
>--- a/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>@@ -42,11 +42,8 @@
> #import <WebCore/CertificateInfo.h>
> #import <WebCore/InspectorFrontendClientLocal.h>
> #import <WebCore/LocalizedStrings.h>
>-#import <wtf/SoftLinking.h>
> #import <wtf/text/Base64.h>
> 
>-SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
>-
> static const NSUInteger windowStyleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable | NSWindowStyleMaskFullSizeContentView;
> 
> // The time we keep our WebView alive before closing it and its process.
>@@ -724,9 +721,6 @@ void WebInspectorProxy::platformStartWindowDrag()
> 
> String WebInspectorProxy::inspectorPageURL()
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"];
>     ASSERT([path length]);
> 
>@@ -735,9 +729,6 @@ String WebInspectorProxy::inspectorPageURL()
> 
> String WebInspectorProxy::inspectorTestPageURL()
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Test" ofType:@"html"];
> 
>     // We might not have a Test.html in Production builds.
>@@ -749,9 +740,6 @@ String WebInspectorProxy::inspectorTestPageURL()
> 
> String WebInspectorProxy::inspectorBaseURL()
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] resourcePath];
>     ASSERT([path length]);
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebInspectorUIMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebInspectorUIMac.mm
>index 9ab4b40d09566ba1e13bc5d4eaa16434179c8937..52adeffdca730a36979478859b9e83e16b82ebfb 100644
>--- a/Source/WebKit/WebProcess/WebPage/mac/WebInspectorUIMac.mm
>+++ b/Source/WebKit/WebProcess/WebPage/mac/WebInspectorUIMac.mm
>@@ -27,10 +27,6 @@
> #import "WebInspectorUI.h"
> #import "RemoteWebInspectorUI.h"
> 
>-#import <wtf/SoftLinking.h>
>-
>-SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
>-
> namespace WebKit {
> 
> bool WebInspectorUI::canSave()
>@@ -40,9 +36,6 @@ bool WebInspectorUI::canSave()
> 
> static String webInspectorUILocalizedStringsURL()
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"localizedStrings" ofType:@"js"];
>     if (path.length)
>         return [[NSURL fileURLWithPath:path isDirectory:NO] absoluteString];
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index ea1e1ddbc7150f7c5afa059333a2bce5fc81b7e1..745363849c5ae6fbf251a3c76a1d1e28abe25cb7 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -92,7 +92,10 @@ WK_MOBILE_GESTALT_LDFLAGS_cocoatouch = -lMobileGestalt;
> WK_SECURITY_INTERFACE_LDFLAGS = $(WK_SECURITY_INTERFACE_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_SECURITY_INTERFACE_LDFLAGS_macosx = -framework SecurityInterface;
> 
>-OTHER_LDFLAGS = -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS);
>+WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
>+WK_WEBINSPECTORUI_LDFLAGS_macosx = -framework WebInspectorUI;
>+
>+OTHER_LDFLAGS = -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
> 
> SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>index 28951a48c7dc472301210aa6625e58e164697c55..740fd6416794cefdaf7dc0346747b9553854ee0d 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>@@ -53,11 +53,8 @@
> #import <WebCore/ScriptController.h>
> #import <WebKitLegacy/DOMExtensions.h>
> #import <algorithm>
>-#import <wtf/SoftLinking.h>
> #import <wtf/text/Base64.h>
> 
>-SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
>-
> using namespace WebCore;
> using namespace Inspector;
> 
>@@ -224,9 +221,6 @@ void WebInspectorFrontendClient::startWindowDrag()
> 
> String WebInspectorFrontendClient::localizedStringsURL()
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"localizedStrings" ofType:@"js"];
>     if ([path length])
>         return [[NSURL fileURLWithPath:path] absoluteString];
>@@ -463,9 +457,6 @@ - (void)dealloc
> 
> - (NSString *)inspectorPagePath
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"];
>     ASSERT([path length]);
>     return path;
>@@ -473,9 +464,6 @@ - (NSString *)inspectorPagePath
> 
> - (NSString *)inspectorTestPagePath
> {
>-    // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
>-    WebInspectorUILibrary();
>-
>     NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Test" ofType:@"html"];
> 
>     // We might not have a Test.html in Production builds.
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 91d324d5b8500dc423ec982d87f58261b99d7152..055af0eec989c90e0f09e1a96dc782e0dd5ed50f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-07  Brian Burg  <bburg@apple.com>
>+
>+        [Mac] WebInspectorUI.framework does not need to be soft-linked anymore
>+        https://bugs.webkit.org/show_bug.cgi?id=194411
>+        <rdar://problem/47787614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/mac/TestRunnerMac.mm:
>+        (TestRunner::inspectorTestStubURL):
>+        (SOFT_LINK_STAGED_FRAMEWORK): Deleted.
>+        * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
>+        (WTR::TestRunner::inspectorTestStubURL):
>+
> 2019-02-07  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Out-of-flow] Use the containing block's padding width when computing min/max width.
>diff --git a/Tools/DumpRenderTree/mac/TestRunnerMac.mm b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>index c1378d9e3c57c7f73e1284fb686514d743dbfd76..742517cff710520bdaaa17af22ea7b9984a9de33 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -77,10 +77,6 @@
> #import <wtf/RetainPtr.h>
> #import <wtf/WallTime.h>
> 
>-#if !PLATFORM(IOS_FAMILY)
>-#import <wtf/SoftLinking.h>
>-#endif
>-
> #if PLATFORM(IOS_FAMILY)
> #import "UIKitSPI.h"
> #import <WebKit/WebCoreThread.h>
>@@ -89,7 +85,6 @@
> #endif
> 
> #if !PLATFORM(IOS_FAMILY)
>-SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
> 
> @interface CommandValidationTarget : NSObject <NSValidatedUserInterfaceItem>
> {
>@@ -834,9 +829,6 @@ JSRetainPtr<JSStringRef> TestRunner::inspectorTestStubURL()
> #if PLATFORM(IOS_FAMILY)
>     return nullptr;
> #else
>-    // Call the soft link framework function to dlopen it, then CFBundleGetBundleWithIdentifier will work.
>-    WebInspectorUILibrary();
>-
>     CFBundleRef inspectorBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebInspectorUI"));
>     if (!inspectorBundle)
>         return nullptr;
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm
>index 54331330739feaa640578a041378e1ede9353150..a3be678a520df32a22b59ecba70209556e25d4c2 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm
>@@ -30,12 +30,6 @@
> #import "InjectedBundle.h"
> #import <JavaScriptCore/JSStringRefCF.h>
> 
>-#if !PLATFORM(IOS_FAMILY)
>-#import <wtf/SoftLinking.h>
>-
>-SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
>-#endif
>-
> namespace WTR {
> 
> void TestRunner::platformInitialize()
>@@ -76,9 +70,6 @@ JSRetainPtr<JSStringRef> TestRunner::inspectorTestStubURL()
> #if PLATFORM(IOS_FAMILY)
>     return nullptr;
> #else
>-    // Call the soft link framework function to dlopen it, then CFBundleGetBundleWithIdentifier will work.
>-    WebInspectorUILibrary();
>-
>     CFBundleRef inspectorBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebInspectorUI"));
>     if (!inspectorBundle)
>         return nullptr;

Actions: View | Formatted Diff | Diff

Attachments on bug 194411: 361440 | 362046 | 362056 | 362126