| OLD | NEW |
| 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_MAC_H_ | 5 #ifndef UI_GFX_RENDER_TEXT_MAC_H_ |
| 6 #define UI_GFX_RENDER_TEXT_MAC_H_ | 6 #define UI_GFX_RENDER_TEXT_MAC_H_ |
| 7 | 7 |
| 8 #include <ApplicationServices/ApplicationServices.h> | 8 #include <ApplicationServices/ApplicationServices.h> |
| 9 #include <stddef.h> | 9 #include <stddef.h> |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 private: | 62 private: |
| 63 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText); | 63 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText); |
| 64 | 64 |
| 65 struct TextRun { | 65 struct TextRun { |
| 66 CTRunRef ct_run; | 66 CTRunRef ct_run; |
| 67 SkPoint origin; | 67 SkPoint origin; |
| 68 std::vector<uint16_t> glyphs; | 68 std::vector<uint16_t> glyphs; |
| 69 std::vector<SkPoint> glyph_positions; | 69 std::vector<SkPoint> glyph_positions; |
| 70 SkScalar width; | 70 SkScalar width; |
| 71 Font font; | 71 Font font; |
| 72 sk_sp<SkTypeface> typeface; |
| 72 SkColor foreground; | 73 SkColor foreground; |
| 73 bool underline; | 74 bool underline; |
| 74 bool strike; | 75 bool strike; |
| 75 bool diagonal_strike; | 76 bool diagonal_strike; |
| 76 | 77 |
| 77 TextRun(); | 78 TextRun(); |
| 78 TextRun(const TextRun& other); | 79 TextRun(const TextRun& other); |
| 79 ~TextRun(); | 80 ~TextRun(); |
| 80 }; | 81 }; |
| 81 | 82 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 127 |
| 127 // Indicates that |runs_| are valid, set by |ComputeRuns()|. | 128 // Indicates that |runs_| are valid, set by |ComputeRuns()|. |
| 128 bool runs_valid_; | 129 bool runs_valid_; |
| 129 | 130 |
| 130 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); | 131 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); |
| 131 }; | 132 }; |
| 132 | 133 |
| 133 } // namespace gfx | 134 } // namespace gfx |
| 134 | 135 |
| 135 #endif // UI_GFX_RENDER_TEXT_MAC_H_ | 136 #endif // UI_GFX_RENDER_TEXT_MAC_H_ |
| OLD | NEW |