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

Side by Side Diff: third_party/harfbuzz-ng/src/hb-face-private.hh

Issue 469573004: Roll harfbuzz to pick up this/NULL comparison fix. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright © 2009 Red Hat, Inc. 2 * Copyright © 2009 Red Hat, Inc.
3 * Copyright © 2011 Google, Inc. 3 * Copyright © 2011 Google, Inc.
4 * 4 *
5 * This is part of HarfBuzz, a text shaping library. 5 * This is part of HarfBuzz, a text shaping library.
6 * 6 *
7 * Permission is hereby granted, without written agreement and without 7 * Permission is hereby granted, without written agreement and without
8 * license or royalty fees, to use, copy, modify, and distribute this 8 * license or royalty fees, to use, copy, modify, and distribute this
9 * software and its documentation for any purpose, provided that the 9 * software and its documentation for any purpose, provided that the
10 * above copyright notice and the following two paragraphs appear in 10 * above copyright notice and the following two paragraphs appear in
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 struct plan_node_t { 59 struct plan_node_t {
60 hb_shape_plan_t *shape_plan; 60 hb_shape_plan_t *shape_plan;
61 plan_node_t *next; 61 plan_node_t *next;
62 } *shape_plans; 62 } *shape_plans;
63 63
64 64
65 inline hb_blob_t *reference_table (hb_tag_t tag) const 65 inline hb_blob_t *reference_table (hb_tag_t tag) const
66 { 66 {
67 hb_blob_t *blob; 67 hb_blob_t *blob;
68 68
69 if (unlikely (!this || !reference_table_func)) 69 if (unlikely (!reference_table_func))
70 return hb_blob_get_empty (); 70 return hb_blob_get_empty ();
71 71
72 blob = reference_table_func (/*XXX*/const_cast<hb_face_t *> (this), tag, use r_data); 72 blob = reference_table_func (/*XXX*/const_cast<hb_face_t *> (this), tag, use r_data);
73 if (unlikely (!blob)) 73 if (unlikely (!blob))
74 return hb_blob_get_empty (); 74 return hb_blob_get_empty ();
75 75
76 return blob; 76 return blob;
77 } 77 }
78 78
79 inline HB_PURE_FUNC unsigned int get_upem (void) const 79 inline HB_PURE_FUNC unsigned int get_upem (void) const
(...skipping 18 matching lines...) Expand all
98 extern HB_INTERNAL const hb_face_t _hb_face_nil; 98 extern HB_INTERNAL const hb_face_t _hb_face_nil;
99 99
100 #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS 100 #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
101 #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, face); 101 #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, face);
102 #include "hb-shaper-list.hh" 102 #include "hb-shaper-list.hh"
103 #undef HB_SHAPER_IMPLEMENT 103 #undef HB_SHAPER_IMPLEMENT
104 #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS 104 #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
105 105
106 106
107 #endif /* HB_FACE_PRIVATE_HH */ 107 #endif /* HB_FACE_PRIVATE_HH */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698