Title: [271784] trunk/Source/WebCore
- Revision
- 271784
- Author
- [email protected]
- Date
- 2021-01-24 13:58:52 -0800 (Sun, 24 Jan 2021)
Log Message
Make FontCascade::CodePath an enum class
https://bugs.webkit.org/show_bug.cgi?id=219947
Patch by Rob Buis <[email protected]> on 2021-01-24
Reviewed by Darin Adler.
Revert part of r270932 change, Complex from X.h
will clash with the enum class too.
* platform/graphics/FontCascade.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (271783 => 271784)
--- trunk/Source/WebCore/ChangeLog 2021-01-24 19:04:53 UTC (rev 271783)
+++ trunk/Source/WebCore/ChangeLog 2021-01-24 21:58:52 UTC (rev 271784)
@@ -1,3 +1,15 @@
+2021-01-24 Rob Buis <[email protected]>
+
+ Make FontCascade::CodePath an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=219947
+
+ Reviewed by Darin Adler.
+
+ Revert part of r270932 change, Complex from X.h
+ will clash with the enum class too.
+
+ * platform/graphics/FontCascade.h:
+
2021-01-24 Zalan Bujtas <[email protected]>
[LFC][IFC] Remove unused function Line::isRunConsideredEmpty
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (271783 => 271784)
--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2021-01-24 19:04:53 UTC (rev 271783)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2021-01-24 21:58:52 UTC (rev 271784)
@@ -34,6 +34,12 @@
#include <wtf/WeakPtr.h>
#include <wtf/unicode/CharacterNames.h>
+// "X11/X.h" defines Complex to 0 and conflicts
+// with Complex value in CodePath enum.
+#ifdef Complex
+#undef Complex
+#endif
+
namespace WebCore {
class GraphicsContext;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
