Title: [243230] trunk/Source
- Revision
- 243230
- Author
- [email protected]
- Date
- 2019-03-20 12:58:06 -0700 (Wed, 20 Mar 2019)
Log Message
Update checks that determine if WebKit is system WebKit
https://bugs.webkit.org/show_bug.cgi?id=195756
Reviewed by Alexey Proskuryakov.
The system WebKit can be installed in additional locations, so check
for and allow those, too.
Source/WebKit:
* Shared/mac/AuxiliaryProcessMac.mm:
(WebKit::AuxiliaryProcess::isSystemWebKit):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (243229 => 243230)
--- trunk/Source/WTF/ChangeLog 2019-03-20 19:57:24 UTC (rev 243229)
+++ trunk/Source/WTF/ChangeLog 2019-03-20 19:58:06 UTC (rev 243230)
@@ -1,3 +1,15 @@
+2019-03-20 Keith Rollin <[email protected]>
+
+ Update checks that determine if WebKit is system WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=195756
+
+ Reviewed by Alexey Proskuryakov.
+
+ The system WebKit can be installed in additional locations, so check
+ for and allow those, too.
+
+ * wtf/Platform.h:
+
2019-03-20 Michael Catanzaro <[email protected]>
Unreviewed, further attempt to fix clang 3.8 build
Modified: trunk/Source/WTF/wtf/Platform.h (243229 => 243230)
--- trunk/Source/WTF/wtf/Platform.h 2019-03-20 19:57:24 UTC (rev 243229)
+++ trunk/Source/WTF/wtf/Platform.h 2019-03-20 19:58:06 UTC (rev 243230)
@@ -732,6 +732,10 @@
/* FIXME: move out all ENABLE() defines from here to FeatureDefines.h */
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalPlatform.h>)
+#include <WebKitAdditions/AdditionalPlatform.h>
+#endif
+
#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
#include <WebKitAdditions/AdditionalFeatureDefines.h>
#endif
Modified: trunk/Source/WebKit/ChangeLog (243229 => 243230)
--- trunk/Source/WebKit/ChangeLog 2019-03-20 19:57:24 UTC (rev 243229)
+++ trunk/Source/WebKit/ChangeLog 2019-03-20 19:58:06 UTC (rev 243230)
@@ -1,3 +1,16 @@
+2019-03-20 Keith Rollin <[email protected]>
+
+ Update checks that determine if WebKit is system WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=195756
+
+ Reviewed by Alexey Proskuryakov.
+
+ The system WebKit can be installed in additional locations, so check
+ for and allow those, too.
+
+ * Shared/mac/AuxiliaryProcessMac.mm:
+ (WebKit::AuxiliaryProcess::isSystemWebKit):
+
2019-03-20 Per Arne Vollan <[email protected]>
[iOS] Unable to PiP web videos in Safari due to sandbox violation
Modified: trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (243229 => 243230)
--- trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2019-03-20 19:57:24 UTC (rev 243229)
+++ trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2019-03-20 19:58:06 UTC (rev 243230)
@@ -719,6 +719,10 @@
bool AuxiliaryProcess::isSystemWebKit()
{
static bool isSystemWebKit = [] {
+#if HAVE(ALTERNATE_SYSTEM_LAYOUT)
+ if ([[webKit2Bundle() bundlePath] hasPrefix:@"/Library/Apple/System/"])
+ return true;
+#endif
return [[webKit2Bundle() bundlePath] hasPrefix:@"/System/"];
}();
return isSystemWebKit;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
