Title: [274510] branches/safari-611.1.21.1-branch/Source/WebCore/PAL
- Revision
- 274510
- Author
- alanc...@apple.com
- Date
- 2021-03-16 13:39:32 -0700 (Tue, 16 Mar 2021)
Log Message
Cherry-pick r274023. rdar://problem/75052309
[Win] Fix compile error
https://bugs.webkit.org/show_bug.cgi?id=222802
<rdar://problem/75052309>
Reviewed by Dean Jackson.
Declare CTFontTransformOptions if associated header file has not been included.
* pal/spi/win/CoreTextSPIWin.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611.1.21.1-branch/Source/WebCore/PAL/ChangeLog (274509 => 274510)
--- branches/safari-611.1.21.1-branch/Source/WebCore/PAL/ChangeLog 2021-03-16 20:05:17 UTC (rev 274509)
+++ branches/safari-611.1.21.1-branch/Source/WebCore/PAL/ChangeLog 2021-03-16 20:39:32 UTC (rev 274510)
@@ -1,3 +1,32 @@
+2021-03-16 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r274023. rdar://problem/75052309
+
+ [Win] Fix compile error
+ https://bugs.webkit.org/show_bug.cgi?id=222802
+ <rdar://problem/75052309>
+
+ Reviewed by Dean Jackson.
+
+ Declare CTFontTransformOptions if associated header file has not been included.
+
+ * pal/spi/win/CoreTextSPIWin.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-05 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix compile error
+ https://bugs.webkit.org/show_bug.cgi?id=222802
+ <rdar://problem/75052309>
+
+ Reviewed by Dean Jackson.
+
+ Declare CTFontTransformOptions if associated header file has not been included.
+
+ * pal/spi/win/CoreTextSPIWin.h:
+
2021-02-08 Russell Epstein <repst...@apple.com>
Cherry-pick r272188. rdar://problem/74032553
Modified: branches/safari-611.1.21.1-branch/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h (274509 => 274510)
--- branches/safari-611.1.21.1-branch/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h 2021-03-16 20:05:17 UTC (rev 274509)
+++ branches/safari-611.1.21.1-branch/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h 2021-03-16 20:39:32 UTC (rev 274510)
@@ -54,6 +54,13 @@
CT_EXPORT const CFStringRef kCTFontURLAttribute;
CT_EXPORT const CFStringRef kCTFontReferenceURLAttribute;
+#ifndef __CTFONTPRIV__
+typedef CF_OPTIONS(uint32_t, CTFontTransformOptions) {
+ kCTFontTransformApplyShaping = (1 << 0),
+ kCTFontTransformApplyPositioning = (1 << 1)
+};
+#endif
+
// These enums are defined in CTFont.h. To avoid redefinition, only define them here if CTFont.h has not been included.
#ifndef __CTFONT__
typedef CF_OPTIONS(uint32_t, CTFontSymbolicTraits) {
@@ -81,11 +88,6 @@
kCTFontTableVhea = 'vhea',
};
-typedef CF_OPTIONS(uint32_t, CTFontTransformOptions) {
- kCTFontTransformApplyShaping = (1 << 0),
- kCTFontTransformApplyPositioning = (1 << 1)
-};
-
enum {
kLowerCaseType = 37,
kUpperCaseType = 38,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
