Changeset 222604 in webkit

Timestamp:

Sep 27, 2017 11:18:21 PM (7 years ago)

Author:

zandobersek@gmail.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)
• platform/graphics/FontPlatformData.h (modified) (1 diff)
• platform/graphics/Pattern.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

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

trunk/Source/WebCore/platform/graphics/Font.h

@@ -46 +46 @@
 #if PLATFORM(WIN)
 #include <usp10.h>
-#endif
-
-#if USE(CAIRO)
-#include <cairo.h>
 #endif
 

trunk/Source/WebCore/platform/graphics/FontPlatformData.h

@@ -37 +37 @@
 #if USE(CAIRO)
 #include "RefPtrCairo.h"
-#include <cairo.h>
 #endif
 

trunk/Source/WebCore/platform/graphics/Pattern.h

@@ -41 +41 @@
 typedef ID2D1BitmapBrush* PlatformPatternPtr;
 #elif USE(CAIRO)
-#include <cairo.h>
+typedef struct _cairo_pattern cairo_pattern_t;
 typedef cairo_pattern_t* PlatformPatternPtr;
 #elif USE(WINGDI)