Title: [286575] branches/safari-612-branch
- Revision
- 286575
- Author
- [email protected]
- Date
- 2021-12-06 16:06:10 -0800 (Mon, 06 Dec 2021)
Log Message
Unreviewed, fix the debug build.
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (286574 => 286575)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-12-06 23:37:28 UTC (rev 286574)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-12-07 00:06:10 UTC (rev 286575)
@@ -1,3 +1,10 @@
+2021-12-06 Ryan Haddad <[email protected]>
+
+ Unreviewed, fix the debug build.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::variationAxes):
+
2021-12-02 Alan Coon <[email protected]>
Revert r286394. rdar://problem/83070565
Modified: branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (286574 => 286575)
--- branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-12-06 23:37:28 UTC (rev 286574)
+++ branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-12-07 00:06:10 UTC (rev 286575)
@@ -302,7 +302,10 @@
#if defined(HAVE_CTFontCopyVariationAxesInternal) // This macro is defined inside CoreText, not WebKit.
if (shouldLocalizeAxisNames == ShouldLocalizeAxisNames::Yes)
return adoptCF(CTFontCopyVariationAxes(font));
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
return adoptCF(CTFontCopyVariationAxesInternal(font));
+#pragma clang diagnostic pop
#else
UNUSED_PARAM(shouldLocalizeAxisNames);
return adoptCF(CTFontCopyVariationAxes(font));
Modified: branches/safari-612-branch/Tools/ChangeLog (286574 => 286575)
--- branches/safari-612-branch/Tools/ChangeLog 2021-12-06 23:37:28 UTC (rev 286574)
+++ branches/safari-612-branch/Tools/ChangeLog 2021-12-07 00:06:10 UTC (rev 286575)
@@ -1,3 +1,9 @@
+2021-12-06 Ryan Haddad <[email protected]>
+
+ Unreviewed, fix the debug build.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+
2021-12-03 Russell Epstein <[email protected]>
Cherry-pick r286505. rdar://problem/85918531
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm (286574 => 286575)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm 2021-12-06 23:37:28 UTC (rev 286574)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm 2021-12-07 00:06:10 UTC (rev 286575)
@@ -28,6 +28,7 @@
#if ENABLE(WEB_AUTHN)
+#import "HTTPServer.h"
#import "PlatformUtilities.h"
#import "TCPServer.h"
#import "TestWKWebView.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
