Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: third_party/harfbuzz-ng/src/hb-ot-shape-complex-misc.cc

Issue 9223010: Update harfbuzz-ng to 1a5a91dc0d8bf4b72a2f22dc6300b06ad7000b79. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't use -M option for 'git diff' to patch correctly Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/harfbuzz-ng/src/hb-ot-shape-complex-misc.cc
diff --git a/third_party/harfbuzz-ng/src/hb-common.c b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-misc.cc
similarity index 58%
rename from third_party/harfbuzz-ng/src/hb-common.c
rename to third_party/harfbuzz-ng/src/hb-ot-shape-complex-misc.cc
index 74f8933e9ab869b8333fa46f5a101b6becbc0326..230704fe4b95acad47348752e61e08481b14083b 100644
--- a/third_party/harfbuzz-ng/src/hb-common.c
+++ b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-misc.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright © 2010 Google, Inc.
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -21,27 +21,35 @@
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*
- * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
*/
-#include "hb-private.h"
+#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
+/* TODO Add kana, hangul, and other small sahpers here */
-hb_tag_t
-hb_tag_from_string (const char *s)
+/* When adding trivial shapers, eg. kana, hangul, etc, we can either
+ * add a full shaper enum value for them, or switch on the script in
+ * the default complex shaper. The former is faster, so I think that's
+ * what we would do, and hence the default complex shaper shall remain
+ * empty.
+ */
+
+void
+_hb_ot_shape_complex_collect_features_default (hb_ot_map_builder_t *map, const hb_segment_properties_t *props)
{
- char tag[4];
- unsigned int i;
+}
- for (i = 0; i < 4 && s[i]; i++)
- tag[i] = s[i];
- for (; i < 4; i++)
- tag[i] = ' ';
+bool
+_hb_ot_shape_complex_prefer_decomposed_default (void)
+{
+ return FALSE;
+}
- return HB_TAG_STR (tag);
+void
+_hb_ot_shape_complex_setup_masks_default (hb_ot_map_t *map, hb_buffer_t *buffer)
+{
}
-HB_END_DECLS

Powered by Google App Engine
This is Rietveld 408576698