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

Side by Side Diff: ui/gfx/render_text_harfbuzz.h

Issue 484883003: Re-land: RenderTextHarfBuzz: Set font render parameters in font data functions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment fixed Created 6 years, 3 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
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/gfx/render_text_harfbuzz.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_ 5 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_
6 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_ 6 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "third_party/harfbuzz-ng/src/hb.h" 10 #include "third_party/harfbuzz-ng/src/hb.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 bool is_rtl; 54 bool is_rtl;
55 UBiDiLevel level; 55 UBiDiLevel level;
56 UScriptCode script; 56 UScriptCode script;
57 57
58 scoped_ptr<uint16[]> glyphs; 58 scoped_ptr<uint16[]> glyphs;
59 scoped_ptr<SkPoint[]> positions; 59 scoped_ptr<SkPoint[]> positions;
60 std::vector<uint32> glyph_to_char; 60 std::vector<uint32> glyph_to_char;
61 size_t glyph_count; 61 size_t glyph_count;
62 62
63 skia::RefPtr<SkTypeface> skia_face; 63 skia::RefPtr<SkTypeface> skia_face;
64 FontRenderParams render_params;
64 int font_size; 65 int font_size;
65 int font_style; 66 int font_style;
66 bool strike; 67 bool strike;
67 bool diagonal_strike; 68 bool diagonal_strike;
68 bool underline; 69 bool underline;
69 70
70 private: 71 private:
71 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz); 72 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz);
72 }; 73 };
73 74
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // ICU grapheme iterator for the layout text. Valid when |!needs_layout_|. Can 144 // ICU grapheme iterator for the layout text. Valid when |!needs_layout_|. Can
144 // be NULL in case of an error. 145 // be NULL in case of an error.
145 scoped_ptr<base::i18n::BreakIterator> grapheme_iterator_; 146 scoped_ptr<base::i18n::BreakIterator> grapheme_iterator_;
146 147
147 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz); 148 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz);
148 }; 149 };
149 150
150 } // namespace gfx 151 } // namespace gfx
151 152
152 #endif // UI_GFX_RENDER_TEXT_HARFBUZZ_H_ 153 #endif // UI_GFX_RENDER_TEXT_HARFBUZZ_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/gfx/render_text_harfbuzz.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698