Title: [160077] releases/WebKitGTK/webkit-2.2/Source/WebCore
- Revision
- 160077
- Author
- [email protected]
- Date
- 2013-12-04 01:21:18 -0800 (Wed, 04 Dec 2013)
Log Message
Merge r159939 - [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/harfbuzz/HarfBuzzFaceCairo.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (160076 => 160077)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-04 09:14:41 UTC (rev 160076)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-04 09:21:18 UTC (rev 160077)
@@ -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-11-21 Carlos Garcia Campos <[email protected]>
[GTK] Cannot scroll in option menu when it larger than the screen
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp (160076 => 160077)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-12-04 09:14:41 UTC (rev 160076)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-12-04 09:21:18 UTC (rev 160077)
@@ -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
