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

Side by Side Diff: third_party/harfbuzz-ng/src/hb-fallback-shape.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, 10 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 (C) 2009 Red Hat, Inc. 2 * Copyright © 2011 Google, Inc.
3 * 3 *
4 * This is part of HarfBuzz, a text shaping library. 4 * This is part of HarfBuzz, a text shaping library.
5 * 5 *
6 * Permission is hereby granted, without written agreement and without 6 * Permission is hereby granted, without written agreement and without
7 * license or royalty fees, to use, copy, modify, and distribute this 7 * license or royalty fees, to use, copy, modify, and distribute this
8 * software and its documentation for any purpose, provided that the 8 * software and its documentation for any purpose, provided that the
9 * above copyright notice and the following two paragraphs appear in 9 * above copyright notice and the following two paragraphs appear in
10 * all copies of this software. 10 * all copies of this software.
11 * 11 *
12 * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR 12 * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
13 * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES 13 * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
14 * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN 14 * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
15 * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 15 * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
16 * DAMAGE. 16 * DAMAGE.
17 * 17 *
18 * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, 18 * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
19 * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 19 * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
20 * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS 20 * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
21 * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO 21 * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
22 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 22 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
23 * 23 *
24 * Red Hat Author(s): Behdad Esfahbod 24 * Google Author(s): Behdad Esfahbod
25 */ 25 */
26 26
27 #include "hb-private.h" 27 #include "hb-fallback-shape-private.hh"
28
29 #include "hb-shape.h"
30 28
31 #include "hb-buffer-private.hh" 29 #include "hb-buffer-private.hh"
32 30
33 #include "hb-ot-shape.h" 31 hb_bool_t
32 hb_fallback_shape (hb_font_t *font,
33 » » hb_buffer_t *buffer,
34 » » const hb_feature_t *features,
35 » » unsigned int num_features,
36 » » const char * const *shaper_options)
37 {
38 buffer->guess_properties ();
34 39
35 #ifdef HAVE_GRAPHITE 40 unsigned int count = buffer->len;
36 #include "hb-graphite.h"
37 #endif
38 41
39 HB_BEGIN_DECLS 42 for (unsigned int i = 0; i < count; i++)
43 hb_font_get_glyph (font, buffer->info[i].codepoint, 0, &buffer->info[i].code point);
40 44
45 buffer->clear_positions ();
41 46
42 void 47 for (unsigned int i = 0; i < count; i++) {
43 hb_shape (hb_font_t *font, 48 hb_font_get_glyph_advance_for_direction (font, buffer->info[i].codepoint,
44 » hb_face_t *face, 49 » » » » » buffer->props.direction,
45 » hb_buffer_t *buffer, 50 » » » » » &buffer->pos[i].x_advance,
46 » hb_feature_t *features, 51 » » » » » &buffer->pos[i].y_advance);
47 » unsigned int num_features) 52 hb_font_subtract_glyph_origin_for_direction (font, buffer->info[i].codepoint ,
48 { 53 » » » » » » buffer->props.direction,
49 #if 0 && defined(HAVE_GRAPHITE) 54 » » » » » » &buffer->pos[i].x_offset,
50 hb_blob_t *silf_blob; 55 » » » » » » &buffer->pos[i].y_offset);
51 silf_blob = hb_face_get_table (face, HB_GRAPHITE_TAG_Silf);
52 if (hb_blob_get_length(silf_blob))
53 {
54 hb_graphite_shape(font, face, buffer, features, num_features);
55 hb_blob_destroy(silf_blob);
56 return;
57 } 56 }
58 hb_blob_destroy(silf_blob);
59 #endif
60 57
61 hb_ot_shape (font, face, buffer, features, num_features); 58 if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
59 hb_buffer_reverse (buffer);
60
61 return TRUE;
62 } 62 }
63
64
65 HB_END_DECLS
OLDNEW
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-common.cc ('k') | third_party/harfbuzz-ng/src/hb-fallback-shape-private.hh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698