[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:


Canonical link: https://commits.webkit.org/193889@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@222604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,20 @@
+2017-09-27  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <zdobersek@igalia.com>
 
         [Cairo] Drop cairo_matrix_t conversion operators for AffineTransform, TransformationMatrix

Source/WebCore/platform/graphics/Font.h

@@ -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

Source/WebCore/platform/graphics/FontPlatformData.h

@@ -36,7 +36,6 @@
 
 #if USE(CAIRO)
 #include "RefPtrCairo.h"
-#include <cairo.h>
 #endif
 
 #if USE(FREETYPE)

Source/WebCore/platform/graphics/Pattern.h

@@ -40,7 +40,7 @@ typedef CGPatternRef PlatformPatternPtr;
 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;