Modified: branches/safari-609-branch/Source/WTF/ChangeLog (261521 => 261522)
--- branches/safari-609-branch/Source/WTF/ChangeLog 2020-05-12 00:22:00 UTC (rev 261521)
+++ branches/safari-609-branch/Source/WTF/ChangeLog 2020-05-12 00:22:03 UTC (rev 261522)
@@ -1,5 +1,34 @@
2020-05-07 Russell Epstein <[email protected]>
+ Cherry-pick r260907. rdar://problem/62978877
+
+ [Mac] Adopt kMTSupportNotification_ShouldPlayHDRVideoChanged notification
+ https://bugs.webkit.org/show_bug.cgi?id=211028
+ <rdar://problem/61173289>
+
+ Reviewed by Aakash Jain.
+
+ Follow-up test failure fix; correct the debug/non-debug variants of SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT.
+
+ * wtf/win/SoftLinking.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260907 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-29 Jer Noble <[email protected]>
+
+ [Mac] Adopt kMTSupportNotification_ShouldPlayHDRVideoChanged notification
+ https://bugs.webkit.org/show_bug.cgi?id=211028
+ <rdar://problem/61173289>
+
+ Reviewed by Aakash Jain.
+
+ Follow-up test failure fix; correct the debug/non-debug variants of SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT.
+
+ * wtf/win/SoftLinking.h:
+
+2020-05-07 Russell Epstein <[email protected]>
+
Cherry-pick r260682. rdar://problem/62978266
[WTF] allThreads registration is racy with allThreads unregistration
Modified: branches/safari-609-branch/Source/WTF/wtf/win/SoftLinking.h (261521 => 261522)
--- branches/safari-609-branch/Source/WTF/wtf/win/SoftLinking.h 2020-05-12 00:22:00 UTC (rev 261521)
+++ branches/safari-609-branch/Source/WTF/wtf/win/SoftLinking.h 2020-05-12 00:22:03 UTC (rev 261522)
@@ -183,10 +183,10 @@
#ifdef DEBUG_ALL
#define SOFT_LINK_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) SOFT_LINK_DEBUG_FRAMEWORK(functionNamespace, framework)
-#define SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, export) SOFT_LINK_DEBUG_FRAMEWORK_HELPER(functionNamespace, framework, L".dll", export)
+#define SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, export) SOFT_LINK_FRAMEWORK_HELPER(functionNamespace, framework, L"_debug.dll", export)
#else
#define SOFT_LINK_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) SOFT_LINK_FRAMEWORK(functionNamespace, framework)
-#define SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, export) SOFT_LINK_FRAMEWORK_HELPER(functionNamespace, framework, L"_debug.dll", export)
+#define SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, export) SOFT_LINK_FRAMEWORK_HELPER(functionNamespace, framework, L".dll", export)
#endif