Changeset 243230 in webkit

Timestamp:

Mar 20, 2019, 12:58:06 PM (7 years ago)

Author:

Keith Rollin

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:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/mac/AuxiliaryProcessMac.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-03-20  Keith Rollin  <krollin@apple.com>
+
+        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  <mcatanzaro@igalia.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -733 +733 @@
 /* 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>

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-20  Keith Rollin  <krollin@apple.com>
+
+        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  <pvollan@apple.com>
 

trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm

@@ -720 +720 @@
 {
     static bool isSystemWebKit = [] {
+#if HAVE(ALTERNATE_SYSTEM_LAYOUT)
+        if ([[webKit2Bundle() bundlePath] hasPrefix:@"/Library/Apple/System/"])
+            return true;
+#endif
         return [[webKit2Bundle() bundlePath] hasPrefix:@"/System/"];
     }();