Title: [255293] branches/safari-610.1.1-branch/Source/WebKit
- Revision
- 255293
- Author
- [email protected]
- Date
- 2020-01-28 13:49:32 -0800 (Tue, 28 Jan 2020)
Log Message
Cherry-pick r254938. rdar://problem/58581906
Fix SDK availability macros
https://bugs.webkit.org/show_bug.cgi?id=206463
<rdar://problem/58581906>
Reviewed by Timothy Hatcher.
Bug 197841 updated WebKit.xcconfig with regards to when it runs a
header post-processing script. This post-processing script grovels
over our exported headers, changing macros like WK_API_AVAILABLE to
the standard API_AVAILABLE. Because of the change in Bug 197841, the
script was no longer being run when preparing macOS 10.15 SDKs, which
was breaking those SDKs. Fix this by reverting the change, allowing
the macros to be replaced for macOS 10.15.
We also need to touch WKFoundation.h in order to support incremental
builds. If we don't, then the version of WKFoundation.h that was
exported in the previous build and that was incorrectly post-processed
would remain incorrectly post-processed. Touch the file so that it
will get re-exported and re-post-processed.
No new tests - no added or changed functionality.
* Configurations/WebKit.xcconfig:
* Shared/API/Cocoa/WKFoundation.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.1-branch/Source/WebKit/ChangeLog (255292 => 255293)
--- branches/safari-610.1.1-branch/Source/WebKit/ChangeLog 2020-01-28 21:49:29 UTC (rev 255292)
+++ branches/safari-610.1.1-branch/Source/WebKit/ChangeLog 2020-01-28 21:49:32 UTC (rev 255293)
@@ -1,5 +1,64 @@
2020-01-28 Russell Epstein <[email protected]>
+ Cherry-pick r254938. rdar://problem/58581906
+
+ Fix SDK availability macros
+ https://bugs.webkit.org/show_bug.cgi?id=206463
+ <rdar://problem/58581906>
+
+ Reviewed by Timothy Hatcher.
+
+ Bug 197841 updated WebKit.xcconfig with regards to when it runs a
+ header post-processing script. This post-processing script grovels
+ over our exported headers, changing macros like WK_API_AVAILABLE to
+ the standard API_AVAILABLE. Because of the change in Bug 197841, the
+ script was no longer being run when preparing macOS 10.15 SDKs, which
+ was breaking those SDKs. Fix this by reverting the change, allowing
+ the macros to be replaced for macOS 10.15.
+
+ We also need to touch WKFoundation.h in order to support incremental
+ builds. If we don't, then the version of WKFoundation.h that was
+ exported in the previous build and that was incorrectly post-processed
+ would remain incorrectly post-processed. Touch the file so that it
+ will get re-exported and re-post-processed.
+
+ No new tests - no added or changed functionality.
+
+ * Configurations/WebKit.xcconfig:
+ * Shared/API/Cocoa/WKFoundation.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-22 Keith Rollin <[email protected]>
+
+ Fix SDK availability macros
+ https://bugs.webkit.org/show_bug.cgi?id=206463
+ <rdar://problem/58581906>
+
+ Reviewed by Timothy Hatcher.
+
+ Bug 197841 updated WebKit.xcconfig with regards to when it runs a
+ header post-processing script. This post-processing script grovels
+ over our exported headers, changing macros like WK_API_AVAILABLE to
+ the standard API_AVAILABLE. Because of the change in Bug 197841, the
+ script was no longer being run when preparing macOS 10.15 SDKs, which
+ was breaking those SDKs. Fix this by reverting the change, allowing
+ the macros to be replaced for macOS 10.15.
+
+ We also need to touch WKFoundation.h in order to support incremental
+ builds. If we don't, then the version of WKFoundation.h that was
+ exported in the previous build and that was incorrectly post-processed
+ would remain incorrectly post-processed. Touch the file so that it
+ will get re-exported and re-post-processed.
+
+ No new tests - no added or changed functionality.
+
+ * Configurations/WebKit.xcconfig:
+ * Shared/API/Cocoa/WKFoundation.h:
+
+2020-01-28 Russell Epstein <[email protected]>
+
Cherry-pick r254880. rdar://problem/58644447
[macOS] Add managed preference to allow synchronous XHR during page dismissal
Modified: branches/safari-610.1.1-branch/Source/WebKit/Configurations/WebKit.xcconfig (255292 => 255293)
--- branches/safari-610.1.1-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-28 21:49:29 UTC (rev 255292)
+++ branches/safari-610.1.1-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-28 21:49:32 UTC (rev 255293)
@@ -160,8 +160,8 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1016));
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1016 = YES;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015));
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES;
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_1013));
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_1300 = YES;
Modified: branches/safari-610.1.1-branch/Source/WebKit/Shared/API/Cocoa/WKFoundation.h (255292 => 255293)
--- branches/safari-610.1.1-branch/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-01-28 21:49:29 UTC (rev 255292)
+++ branches/safari-610.1.1-branch/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-01-28 21:49:32 UTC (rev 255293)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,7 +34,7 @@
#ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
-#define WK_API_AVAILABLE(...)
+#define WK_API_AVAILABLE(...)
#define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default"))) WK_API_AVAILABLE(__VA_ARGS__)
#define WK_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
#define WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
