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

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

Issue 985923002: Revert of adding baseline options for super/sub scripting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 scoped_ptr<uint16[]> glyphs; 64 scoped_ptr<uint16[]> glyphs;
65 scoped_ptr<SkPoint[]> positions; 65 scoped_ptr<SkPoint[]> positions;
66 std::vector<uint32> glyph_to_char; 66 std::vector<uint32> glyph_to_char;
67 size_t glyph_count; 67 size_t glyph_count;
68 68
69 std::string family; 69 std::string family;
70 skia::RefPtr<SkTypeface> skia_face; 70 skia::RefPtr<SkTypeface> skia_face;
71 FontRenderParams render_params; 71 FontRenderParams render_params;
72 int font_size; 72 int font_size;
73 int baseline_offset;
74 int baseline_type;
75 int font_style; 73 int font_style;
76 bool strike; 74 bool strike;
77 bool diagonal_strike; 75 bool diagonal_strike;
78 bool underline; 76 bool underline;
79 77
80 private: 78 private:
81 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz); 79 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz);
82 }; 80 };
83 81
84 // Manages the list of TextRunHarfBuzz and its logical <-> visual index mapping. 82 // Manages the list of TextRunHarfBuzz and its logical <-> visual index mapping.
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 264
267 // Fixed width of glyphs. This should only be set in test environments. 265 // Fixed width of glyphs. This should only be set in test environments.
268 float glyph_width_for_test_; 266 float glyph_width_for_test_;
269 267
270 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz); 268 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz);
271 }; 269 };
272 270
273 } // namespace gfx 271 } // namespace gfx
274 272
275 #endif // UI_GFX_RENDER_TEXT_HARFBUZZ_H_ 273 #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