Title: [159939] trunk/Source/WebCore
- Revision
- 159939
- Author
- [email protected]
- Date
- 2013-12-02 09:49:08 -0800 (Mon, 02 Dec 2013)
Log Message
[GTK] Fails to build with freetype 2.5.1
https://bugs.webkit.org/show_bug.cgi?id=125074
Patch by Andres Gomez <[email protected]> on 2013-12-02
Reviewed by Carlos Garcia Campos.
FreeType specifies a canonical way of including their own
headers. Now, we are following this recommendation so the
compilation won't be broken again due to an upgrade in FeeType's
including paths.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
* platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159938 => 159939)
--- trunk/Source/WebCore/ChangeLog 2013-12-02 17:20:52 UTC (rev 159938)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 17:49:08 UTC (rev 159939)
@@ -1,3 +1,19 @@
+2013-12-02 Andres Gomez <[email protected]>
+
+ [GTK] Fails to build with freetype 2.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=125074
+
+ Reviewed by Carlos Garcia Campos.
+
+ FreeType specifies a canonical way of including their own
+ headers. Now, we are following this recommendation so the
+ compilation won't be broken again due to an upgrade in FeeType's
+ including paths.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+ * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
+
2013-12-02 Chris Fleizach <[email protected]>
AX: Crash at WebCore::commonTreeScope
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (159938 => 159939)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2013-12-02 17:20:52 UTC (rev 159938)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2013-12-02 17:49:08 UTC (rev 159939)
@@ -29,7 +29,8 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include <wtf/text/WTFString.h>
#if !PLATFORM(EFL) && !PLATFORM(NIX)
Modified: trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp (159938 => 159939)
--- trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2013-12-02 17:20:52 UTC (rev 159938)
+++ trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2013-12-02 17:49:08 UTC (rev 159939)
@@ -44,8 +44,9 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
-#include <freetype/tttables.h>
-#include <freetype/tttags.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_TAGS_H
#include <unicode/normlzr.h>
#include <wtf/MathExtras.h>
#include <wtf/unicode/Unicode.h>
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp (159938 => 159939)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-12-02 17:20:52 UTC (rev 159938)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-12-02 17:49:08 UTC (rev 159939)
@@ -39,8 +39,9 @@
#include "TextEncoding.h"
#include <cairo-ft.h>
#include <cairo.h>
-#include <freetype/freetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
#include <hb.h>
#include <wtf/text/CString.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
