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

Unified Diff: third_party/harfbuzz-ng/src/hb-ot-maxp-table.hh

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
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-ot-map-private.hh ('k') | third_party/harfbuzz-ng/src/hb-ot-name-table.hh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/src/hb-ot-maxp-table.hh
diff --git a/third_party/harfbuzz-ng/src/hb-unicode-private.h b/third_party/harfbuzz-ng/src/hb-ot-maxp-table.hh
similarity index 53%
rename from third_party/harfbuzz-ng/src/hb-unicode-private.h
rename to third_party/harfbuzz-ng/src/hb-ot-maxp-table.hh
index 419404b8799b4d7746fda385e98ce11fdb27306d..c3ac1c25c2163c0146ce8c2660edd432e5fc3bfb 100644
--- a/third_party/harfbuzz-ng/src/hb-unicode-private.h
+++ b/third_party/harfbuzz-ng/src/hb-ot-maxp-table.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright © 2011 Google, Inc.
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -21,44 +21,46 @@
* 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
*/
-#ifndef HB_UNICODE_PRIVATE_H
-#define HB_UNICODE_PRIVATE_H
+#ifndef HB_OT_MAXP_TABLE_HH
+#define HB_OT_MAXP_TABLE_HH
-#include "hb-private.h"
+#include "hb-open-type-private.hh"
-#include "hb-unicode.h"
-
-HB_BEGIN_DECLS
/*
- * hb_unicode_funcs_t
+ * maxp -- The Maximum Profile Table
*/
-struct _hb_unicode_funcs_t {
- hb_reference_count_t ref_count;
-
- hb_bool_t immutable;
+#define HB_OT_TAG_maxp HB_TAG('m','a','x','p')
- struct {
- hb_unicode_get_general_category_func_t get_general_category;
- hb_unicode_get_combining_class_func_t get_combining_class;
- hb_unicode_get_mirroring_func_t get_mirroring;
- hb_unicode_get_script_func_t get_script;
- hb_unicode_get_eastasian_width_func_t get_eastasian_width;
- } v;
-};
+struct maxp
+{
+ static const hb_tag_t Tag = HB_OT_TAG_maxp;
-extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_nil;
+ inline unsigned int get_num_glyphs (void) const {
+ return numGlyphs;
+ }
+ inline bool sanitize (hb_sanitize_context_t *c) {
+ TRACE_SANITIZE ();
+ return c->check_struct (this) &&
+ likely (version.major == 1 ||
+ (version.major == 0 && version.minor == 0x5000));
+ }
-HB_INTERNAL hb_direction_t
-_hb_script_get_horizontal_direction (hb_script_t script);
+ /* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */
+ private:
+ FixedVersion version; /* Version of the maxp table (0.5 or 1.0),
+ * 0x00005000 or 0x00010000. */
+ USHORT numGlyphs; /* The number of glyphs in the font. */
+ public:
+ DEFINE_SIZE_STATIC (6);
+};
-HB_END_DECLS
-#endif /* HB_UNICODE_PRIVATE_H */
+#endif /* HB_OT_MAXP_TABLE_HH */
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-ot-map-private.hh ('k') | third_party/harfbuzz-ng/src/hb-ot-name-table.hh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698