Title: [222604] trunk/Source/WebCore
- Revision
- 222604
- Author
- [email protected]
- Date
- 2017-09-27 23:18:21 -0700 (Wed, 27 Sep 2017)
Log Message
[Cairo] Remove unnecessary cairo.h includes
https://bugs.webkit.org/show_bug.cgi?id=177540
Reviewed by Carlos Garcia Campos.
Drop unnecessary includes of the cairo.h header from the Font.h,
FontPlatformData.h and Pattern.h headers. For the former two the
header isn't required, while in the last one we can use a forward
declaration for the cairo_pattern_t type instead of including
the whole Cairo headers to have that available.
* platform/graphics/Font.h:
* platform/graphics/FontPlatformData.h:
* platform/graphics/Pattern.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222603 => 222604)
--- trunk/Source/WebCore/ChangeLog 2017-09-28 06:16:52 UTC (rev 222603)
+++ trunk/Source/WebCore/ChangeLog 2017-09-28 06:18:21 UTC (rev 222604)
@@ -1,5 +1,22 @@
2017-09-27 Zan Dobersek <[email protected]>
+ [Cairo] Remove unnecessary cairo.h includes
+ https://bugs.webkit.org/show_bug.cgi?id=177540
+
+ Reviewed by Carlos Garcia Campos.
+
+ Drop unnecessary includes of the cairo.h header from the Font.h,
+ FontPlatformData.h and Pattern.h headers. For the former two the
+ header isn't required, while in the last one we can use a forward
+ declaration for the cairo_pattern_t type instead of including
+ the whole Cairo headers to have that available.
+
+ * platform/graphics/Font.h:
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/Pattern.h:
+
+2017-09-27 Zan Dobersek <[email protected]>
+
[Cairo] Drop cairo_matrix_t conversion operators for AffineTransform, TransformationMatrix
https://bugs.webkit.org/show_bug.cgi?id=177539
Modified: trunk/Source/WebCore/platform/graphics/Font.h (222603 => 222604)
--- trunk/Source/WebCore/platform/graphics/Font.h 2017-09-28 06:16:52 UTC (rev 222603)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2017-09-28 06:18:21 UTC (rev 222604)
@@ -47,10 +47,6 @@
#include <usp10.h>
#endif
-#if USE(CAIRO)
-#include <cairo.h>
-#endif
-
#if USE(CG)
#include <pal/spi/cg/CoreGraphicsSPI.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (222603 => 222604)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2017-09-28 06:16:52 UTC (rev 222603)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2017-09-28 06:18:21 UTC (rev 222604)
@@ -36,7 +36,6 @@
#if USE(CAIRO)
#include "RefPtrCairo.h"
-#include <cairo.h>
#endif
#if USE(FREETYPE)
Modified: trunk/Source/WebCore/platform/graphics/Pattern.h (222603 => 222604)
--- trunk/Source/WebCore/platform/graphics/Pattern.h 2017-09-28 06:16:52 UTC (rev 222603)
+++ trunk/Source/WebCore/platform/graphics/Pattern.h 2017-09-28 06:18:21 UTC (rev 222604)
@@ -40,7 +40,7 @@
interface ID2D1BitmapBrush;
typedef ID2D1BitmapBrush* PlatformPatternPtr;
#elif USE(CAIRO)
-#include <cairo.h>
+typedef struct _cairo_pattern cairo_pattern_t;
typedef cairo_pattern_t* PlatformPatternPtr;
#elif USE(WINGDI)
typedef void* PlatformPatternPtr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
