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

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

Issue 2734333005: RenderTextMac: Fix crash when passed an invalid font. (Closed)
Patch Set: Nits. Created 3 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 | « no previous file | ui/gfx/render_text_mac.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_H_ 5 #ifndef UI_GFX_RENDER_TEXT_H_
6 #define UI_GFX_RENDER_TEXT_H_ 6 #define UI_GFX_RENDER_TEXT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 const base::string16& text() const { return text_; } 238 const base::string16& text() const { return text_; }
239 void SetText(const base::string16& text); 239 void SetText(const base::string16& text);
240 void AppendText(const base::string16& text); 240 void AppendText(const base::string16& text);
241 241
242 HorizontalAlignment horizontal_alignment() const { 242 HorizontalAlignment horizontal_alignment() const {
243 return horizontal_alignment_; 243 return horizontal_alignment_;
244 } 244 }
245 void SetHorizontalAlignment(HorizontalAlignment alignment); 245 void SetHorizontalAlignment(HorizontalAlignment alignment);
246 246
247 const FontList& font_list() const { return font_list_; } 247 const FontList& font_list() const { return font_list_; }
248 void SetFontList(const FontList& font_list); 248 virtual void SetFontList(const FontList& font_list);
249 249
250 bool cursor_enabled() const { return cursor_enabled_; } 250 bool cursor_enabled() const { return cursor_enabled_; }
251 void SetCursorEnabled(bool cursor_enabled); 251 void SetCursorEnabled(bool cursor_enabled);
252 252
253 SkColor selection_color() const { return selection_color_; } 253 SkColor selection_color() const { return selection_color_; }
254 void set_selection_color(SkColor color) { selection_color_ = color; } 254 void set_selection_color(SkColor color) { selection_color_ = color; }
255 255
256 SkColor selection_background_focused_color() const { 256 SkColor selection_background_focused_color() const {
257 return selection_background_focused_color_; 257 return selection_background_focused_color_;
258 } 258 }
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 // Lines computed by EnsureLayout. These should be invalidated upon 860 // Lines computed by EnsureLayout. These should be invalidated upon
861 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls. 861 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
862 std::vector<internal::Line> lines_; 862 std::vector<internal::Line> lines_;
863 863
864 DISALLOW_COPY_AND_ASSIGN(RenderText); 864 DISALLOW_COPY_AND_ASSIGN(RenderText);
865 }; 865 };
866 866
867 } // namespace gfx 867 } // namespace gfx
868 868
869 #endif // UI_GFX_RENDER_TEXT_H_ 869 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698