Title: [152411] trunk
- Revision
- 152411
- Author
- commit-qu...@webkit.org
- Date
- 2013-07-05 01:52:35 -0700 (Fri, 05 Jul 2013)
Log Message
[GTK] fast/text/font-kerning.html fails
https://bugs.webkit.org/show_bug.cgi?id=76048
Patch by Denis Nomiyama <d.nomiy...@samsung.com> on 2013-07-05
Reviewed by Martin Robinson.
Added kerning to the list of features for hb_shade() according to FontDescription::kerning().
Removed font-kerning.html from gtk/TestExpectations, which was failing before this fix.
Source/WebCore:
* platform/graphics/harfbuzz/HarfBuzzFace.cpp:
(WebCore):
* platform/graphics/harfbuzz/HarfBuzzFace.h:
(HarfBuzzFace):
* platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
(WebCore::HarfBuzzShaper::setFontFeatures):
LayoutTests:
* platform/gtk/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (152410 => 152411)
--- trunk/LayoutTests/ChangeLog 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/LayoutTests/ChangeLog 2013-07-05 08:52:35 UTC (rev 152411)
@@ -1,3 +1,15 @@
+2013-07-05 Denis Nomiyama <d.nomiy...@samsung.com>
+
+ [GTK] fast/text/font-kerning.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=76048
+
+ Reviewed by Martin Robinson.
+
+ Added kerning to the list of features for hb_shade() according to FontDescription::kerning().
+ Removed font-kerning.html from gtk/TestExpectations, which was failing before this fix.
+
+ * platform/gtk/TestExpectations:
+
2013-07-04 Christophe Dumez <ch.du...@sisa.samsung.com>
Have SVGTextContentElement inherit SVGGraphicsElement
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (152410 => 152411)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-07-05 08:52:35 UTC (rev 152411)
@@ -1108,8 +1108,6 @@
webkit.org/b/74282 editing/pasteboard/emacs-ctrl-k-with-move.html [ Failure ]
-webkit.org/b/76048 fast/text/font-kerning.html [ ImageOnlyFailure ]
-
# Needs custom policy delegate enhancement to log downloads
Bug(GTK) http/tests/download [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (152410 => 152411)
--- trunk/Source/WebCore/ChangeLog 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/Source/WebCore/ChangeLog 2013-07-05 08:52:35 UTC (rev 152411)
@@ -1,3 +1,20 @@
+2013-07-05 Denis Nomiyama <d.nomiy...@samsung.com>
+
+ [GTK] fast/text/font-kerning.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=76048
+
+ Reviewed by Martin Robinson.
+
+ Added kerning to the list of features for hb_shade() according to FontDescription::kerning().
+ Removed font-kerning.html from gtk/TestExpectations, which was failing before this fix.
+
+ * platform/graphics/harfbuzz/HarfBuzzFace.cpp:
+ (WebCore):
+ * platform/graphics/harfbuzz/HarfBuzzFace.h:
+ (HarfBuzzFace):
+ * platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
+ (WebCore::HarfBuzzShaper::setFontFeatures):
+
2013-07-05 Gwang Yoon Hwang <ryum...@company100.net>
Build fix GTK after r152404.
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp (152410 => 152411)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp 2013-07-05 08:52:35 UTC (rev 152411)
@@ -39,6 +39,7 @@
const hb_tag_t HarfBuzzFace::vertTag = HB_TAG('v', 'e', 'r', 't');
const hb_tag_t HarfBuzzFace::vrt2Tag = HB_TAG('v', 'r', 't', '2');
+const hb_tag_t HarfBuzzFace::kernTag = HB_TAG('k', 'e', 'r', 'n');
// Though we have FontCache class, which provides the cache mechanism for
// WebKit's font objects, we also need additional caching layer for HarfBuzz
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h (152410 => 152411)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h 2013-07-05 08:52:35 UTC (rev 152411)
@@ -46,6 +46,7 @@
public:
static const hb_tag_t vertTag;
static const hb_tag_t vrt2Tag;
+ static const hb_tag_t kernTag;
static PassRefPtr<HarfBuzzFace> create(FontPlatformData* platformData, uint64_t uniqueID)
{
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (152410 => 152411)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2013-07-05 08:41:34 UTC (rev 152410)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2013-07-05 08:52:35 UTC (rev 152411)
@@ -347,6 +347,22 @@
m_features.append(vrt2);
}
+ hb_feature_t kerning = { HarfBuzzFace::kernTag, 0, 0, static_cast<unsigned>(-1) };
+ switch (description.kerning()) {
+ case FontDescription::NormalKerning:
+ kerning.value = 1;
+ m_features.append(kerning);
+ break;
+ case FontDescription::NoneKerning:
+ kerning.value = 0;
+ m_features.append(kerning);
+ break;
+ case FontDescription::AutoKerning:
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
FontFeatureSettings* settings = description.featureSettings();
if (!settings)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
