Title: [207102] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207102
- Author
- [email protected]
- Date
- 2016-10-11 05:11:49 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r206373 - [GTK] Unnecessary extern functions in FontPlatformDataFreeType.cpp
https://bugs.webkit.org/show_bug.cgi?id=162555
Reviewed by Carlos Garcia Campos.
These functions should be file-static.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
(WebCore::convertFontConfigSubpixelOrder):
(WebCore::convertFontConfigHintStyle):
(WebCore::setCairoFontOptionsFromFontConfigPattern):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207101 => 207102)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 12:08:13 UTC (rev 207101)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 12:11:49 UTC (rev 207102)
@@ -1,3 +1,17 @@
+2016-09-26 Michael Catanzaro <[email protected]>
+
+ [GTK] Unnecessary extern functions in FontPlatformDataFreeType.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=162555
+
+ Reviewed by Carlos Garcia Campos.
+
+ These functions should be file-static.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ (WebCore::convertFontConfigSubpixelOrder):
+ (WebCore::convertFontConfigHintStyle):
+ (WebCore::setCairoFontOptionsFromFontConfigPattern):
+
2016-09-23 Zalan Bujtas <[email protected]>
ASSERTION FAILED: !newRelayoutRoot.container() || is<RenderView>(newRelayoutRoot.container()) || !newRelayoutRoot.container()->needsLayout() while loading sohu.com
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (207101 => 207102)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2016-10-11 12:08:13 UTC (rev 207101)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2016-10-11 12:11:49 UTC (rev 207102)
@@ -42,7 +42,7 @@
namespace WebCore {
-cairo_subpixel_order_t convertFontConfigSubpixelOrder(int fontConfigOrder)
+static cairo_subpixel_order_t convertFontConfigSubpixelOrder(int fontConfigOrder)
{
switch (fontConfigOrder) {
case FC_RGBA_RGB:
@@ -60,7 +60,7 @@
return CAIRO_SUBPIXEL_ORDER_DEFAULT;
}
-cairo_hint_style_t convertFontConfigHintStyle(int fontConfigStyle)
+static cairo_hint_style_t convertFontConfigHintStyle(int fontConfigStyle)
{
switch (fontConfigStyle) {
case FC_HINT_NONE:
@@ -75,7 +75,7 @@
return CAIRO_HINT_STYLE_NONE;
}
-void setCairoFontOptionsFromFontConfigPattern(cairo_font_options_t* options, FcPattern* pattern)
+static void setCairoFontOptionsFromFontConfigPattern(cairo_font_options_t* options, FcPattern* pattern)
{
FcBool booleanResult;
int integerResult;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
