1 files changed, 3 insertions, 43 deletions
diff --git a/third_party/harfbuzz/README.google b/third_party/harfbuzz/README.google
index b958bde..0fd8980 100644
--- a/third_party/harfbuzz/README.google
+++ b/third_party/harfbuzz/README.google
@@ -2,48 +2,8 @@ Harfbuzz
 
 http://freedesktop.org/wiki/Software/HarfBuzz
 
-This code was taken from cb83c38045a7dd098f8edd4530d328e999a7bbaf
+This code was taken from 4db7e36f46b735f8801d393b356f9c8ed41c409c
 (git://anongit.freedesktop.org/harfbuzz)
 
-The contrib/ directory was written by us and is in the process of getting upstreamed. Additionally, these patches were applied:
-
-
-diff --git a/src/harfbuzz-shaper.h b/src/harfbuzz-shaper.h
-index e8f5513..1577b59 100644
---- a/src/harfbuzz-shaper.h
-+++ b/src/harfbuzz-shaper.h
-@@ -242,7 +242,9 @@ typedef struct HB_Font_ {
-     void *userData;
- } HB_FontRec;
- 
--typedef struct {
-+typedef struct HB_ShaperItem_ HB_ShaperItem;
-+
-+struct HB_ShaperItem_ {
-     const HB_UChar16 *string;
-     hb_uint32 stringLength;
-     HB_ScriptItem item;
-@@ -262,7 +264,7 @@ typedef struct {
- 
-     /* internal */
-     HB_Bool kerning_applied; /* out: kerning applied by shaper */
--} HB_ShaperItem;
-+};
- 
- HB_Bool HB_ShapeItem(HB_ShaperItem *item);
-
-
-http://bugs.freedesktop.org/show_bug.cgi?id=24540:
-diff --git a/third_party/harfbuzz/src/harfbuzz-arabic.c b/third_party/harfbuzz/src/harfbuzz-arabic.c
-index 0609232..de3c1f4 100644
---- a/third_party/harfbuzz/src/harfbuzz-arabic.c
-+++ b/third_party/harfbuzz/src/harfbuzz-arabic.c
-@@ -1009,7 +1009,7 @@ static HB_Bool arabicSyriacOpenTypeShape(HB_ShaperItem *item, HB_Bool *ot_ok)
-         ++l;
-         ++properties;
-     }
--    if (f + l < item->stringLength) {
-+    if (f + l + item->item.pos < item->stringLength) {
-         ++l;
-     }
-     getArabicProperties(uc+f, l, props);
+The patch in chromium.patch was applied on top of this; I will talk with
+upstream about it.