Title: [280372] branches/safari-612.1.24.11-branch/Source/WebKit
- Revision
- 280372
- Author
- [email protected]
- Date
- 2021-07-27 20:01:10 -0700 (Tue, 27 Jul 2021)
Log Message
Cherry-pick r280351. rdar://problem/81196087
The bundle path of downlevel Safari is wrong
https://bugs.webkit.org/show_bug.cgi?id=228339
Reviewed by Jer Noble.
Fix the bundle path. The correct path is "/Library/Apple/System/Library/StagedFrameworks/Safari".
* Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
(WebKit::isFeatureFlagEnabled):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.24.11-branch/Source/WebKit/ChangeLog (280371 => 280372)
--- branches/safari-612.1.24.11-branch/Source/WebKit/ChangeLog 2021-07-28 02:58:57 UTC (rev 280371)
+++ branches/safari-612.1.24.11-branch/Source/WebKit/ChangeLog 2021-07-28 03:01:10 UTC (rev 280372)
@@ -1,3 +1,32 @@
+2021-07-27 Alan Coon <[email protected]>
+
+ Cherry-pick r280351. rdar://problem/81196087
+
+ The bundle path of downlevel Safari is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=228339
+
+ Reviewed by Jer Noble.
+
+ Fix the bundle path. The correct path is "/Library/Apple/System/Library/StagedFrameworks/Safari".
+
+ * Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
+ (WebKit::isFeatureFlagEnabled):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-07-27 Peng Liu <[email protected]>
+
+ The bundle path of downlevel Safari is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=228339
+
+ Reviewed by Jer Noble.
+
+ Fix the bundle path. The correct path is "/Library/Apple/System/Library/StagedFrameworks/Safari".
+
+ * Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
+ (WebKit::isFeatureFlagEnabled):
+
2021-07-23 Alan Coon <[email protected]>
Cherry-pick r280274. rdar://problem/81044139
Modified: branches/safari-612.1.24.11-branch/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm (280371 => 280372)
--- branches/safari-612.1.24.11-branch/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm 2021-07-28 02:58:57 UTC (rev 280371)
+++ branches/safari-612.1.24.11-branch/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm 2021-07-28 03:01:10 UTC (rev 280372)
@@ -40,7 +40,7 @@
// Because of <rdar://problem/60608008>, WebKit has to parse the feature flags plist file
bool isFeatureFlagEnabled(const String& featureName)
{
- BOOL isWebKitBundleFromStagedFramework = [[[NSBundle mainBundle] bundlePath] hasPrefix:@"/Library/Apple/System/Library/StagedFrameworks/WebKit"];
+ BOOL isWebKitBundleFromStagedFramework = [[[NSBundle mainBundle] bundlePath] hasPrefix:@"/Library/Apple/System/Library/StagedFrameworks/Safari"];
if (!isWebKitBundleFromStagedFramework)
return _os_feature_enabled_impl("WebKit", (const char*)featureName.utf8().data());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
