Title: [190955] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 190955
- Author
- [email protected]
- Date
- 2015-10-13 03:45:40 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190557 - Make gdk.h inclusion in FontPlatformDataFreeType.cpp properly GTK-specific
https://bugs.webkit.org/show_bug.cgi?id=149793
Reviewed by Carlos Garcia Campos.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
Instead of including <gdk/gdk.h> header for all platforms but EFL, only
include it for the GTK platform, since no other platform depends on the
GDK library.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190954 => 190955)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:41:01 UTC (rev 190954)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:45:40 UTC (rev 190955)
@@ -1,3 +1,15 @@
+2015-10-05 Zan Dobersek <[email protected]>
+
+ Make gdk.h inclusion in FontPlatformDataFreeType.cpp properly GTK-specific
+ https://bugs.webkit.org/show_bug.cgi?id=149793
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ Instead of including <gdk/gdk.h> header for all platforms but EFL, only
+ include it for the GTK platform, since no other platform depends on the
+ GDK library.
+
2015-10-02 Antoine Quint <[email protected]>
popstate is fired at the wrong time on load
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (190954 => 190955)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-10-13 10:41:01 UTC (rev 190954)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-10-13 10:45:40 UTC (rev 190955)
@@ -35,7 +35,7 @@
#include <wtf/MathExtras.h>
#include <wtf/text/WTFString.h>
-#if !PLATFORM(EFL)
+#if PLATFORM(GTK)
#include <gdk/gdk.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
