summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 20:16:19 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 20:16:19 +0000
commit21c8b1cc71bf192ed458f740738db5e1d82188da (patch)
tree0c86a1b5d805e85e7d4a80ec8ad76ab9e7bfb166 /third_party
parent7668bfe1f7605715c9d72568fde4de5e66534915 (diff)
downloadchromium_src-21c8b1cc71bf192ed458f740738db5e1d82188da.zip
chromium_src-21c8b1cc71bf192ed458f740738db5e1d82188da.tar.gz
chromium_src-21c8b1cc71bf192ed458f740738db5e1d82188da.tar.bz2
linux: restore another harfbuzz patch I dropped.
Fixes LayoutTests/fast/text/drawBidiText.html on Linux. Review URL: http://codereview.chromium.org/308007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/harfbuzz/chromium.patch21
-rw-r--r--third_party/harfbuzz/src/harfbuzz-hebrew.c3
2 files changed, 23 insertions, 1 deletions
diff --git a/third_party/harfbuzz/chromium.patch b/third_party/harfbuzz/chromium.patch
index 3e26566..8e0c827 100644
--- a/third_party/harfbuzz/chromium.patch
+++ b/third_party/harfbuzz/chromium.patch
@@ -67,3 +67,24 @@ index 36b9282..3628c88 100644
// first char in a run is never (treated as) a mark
int cStart = 0;
+diff --git a/third_party/harfbuzz/src/harfbuzz-hebrew.c b/third_party/harfbuzz/src/harfbuzz-hebrew.c
+index 533a063..2bda386 100644
+--- a/third_party/harfbuzz/src/harfbuzz-hebrew.c
++++ b/third_party/harfbuzz/src/harfbuzz-hebrew.c
+@@ -56,6 +56,8 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
+
+ assert(shaper_item->item.script == HB_Script_Hebrew);
+
++ HB_HeuristicSetGlyphAttributes(shaper_item);
++
+ #ifndef NO_OPENTYPE
+ if (HB_SelectScript(shaper_item, hebrew_features)) {
+
+@@ -64,7 +66,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
+ return FALSE;
+
+
+- HB_HeuristicSetGlyphAttributes(shaper_item);
+ HB_OpenTypeShape(shaper_item, /*properties*/0);
+ return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
+ }
diff --git a/third_party/harfbuzz/src/harfbuzz-hebrew.c b/third_party/harfbuzz/src/harfbuzz-hebrew.c
index 533a063..2bda386 100644
--- a/third_party/harfbuzz/src/harfbuzz-hebrew.c
+++ b/third_party/harfbuzz/src/harfbuzz-hebrew.c
@@ -56,6 +56,8 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
assert(shaper_item->item.script == HB_Script_Hebrew);
+ HB_HeuristicSetGlyphAttributes(shaper_item);
+
#ifndef NO_OPENTYPE
if (HB_SelectScript(shaper_item, hebrew_features)) {
@@ -64,7 +66,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
return FALSE;
- HB_HeuristicSetGlyphAttributes(shaper_item);
HB_OpenTypeShape(shaper_item, /*properties*/0);
return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
}