Title: [243227] trunk/Source/WebCore
Revision
243227
Author
[email protected]
Date
2019-03-20 12:52:40 -0700 (Wed, 20 Mar 2019)

Log Message

Update the location for XProtect.meta.plist file
https://bugs.webkit.org/show_bug.cgi?id=195764

Reviewed by Alexey Proskuryakov.

The location of this file is changing in the future, so adjust for
that.

No new tests since there should be no observable behavior difference.

* platform/mac/BlacklistUpdater.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (243226 => 243227)


--- trunk/Source/WebCore/ChangeLog	2019-03-20 19:50:21 UTC (rev 243226)
+++ trunk/Source/WebCore/ChangeLog	2019-03-20 19:52:40 UTC (rev 243227)
@@ -1,3 +1,17 @@
+2019-03-20  Keith Rollin  <[email protected]>
+
+        Update the location for XProtect.meta.plist file
+        https://bugs.webkit.org/show_bug.cgi?id=195764
+
+        Reviewed by Alexey Proskuryakov.
+
+        The location of this file is changing in the future, so adjust for
+        that.
+
+        No new tests since there should be no observable behavior difference.
+
+        * platform/mac/BlacklistUpdater.mm:
+
 2019-03-20  Devin Rousso  <[email protected]>
 
         Web Inspector: Database: lazily create the agent

Modified: trunk/Source/WebCore/platform/mac/BlacklistUpdater.mm (243226 => 243227)


--- trunk/Source/WebCore/platform/mac/BlacklistUpdater.mm	2019-03-20 19:50:21 UTC (rev 243226)
+++ trunk/Source/WebCore/platform/mac/BlacklistUpdater.mm	2019-03-20 19:52:40 UTC (rev 243227)
@@ -43,7 +43,11 @@
 // The time when we last re-parsed the blacklist file.
 static time_t blacklistUpdateTime;
 
+#if HAVE(ALTERNATE_SYSTEM_LAYOUT)
+NSString * const blacklistPath = @"/Library/Apple/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
+#else
 NSString * const blacklistPath = @"/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
+#endif
 
 namespace WebCore {
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to