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

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

Issue 527103003: Further cleanup of RenderText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | ui/gfx/render_text.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 (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 <algorithm> 8 #include <algorithm>
9 #include <cstring> 9 #include <cstring>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
18 #include "skia/ext/refptr.h" 18 #include "skia/ext/refptr.h"
19 #include "third_party/skia/include/core/SkColor.h" 19 #include "third_party/skia/include/core/SkColor.h"
20 #include "third_party/skia/include/core/SkPaint.h" 20 #include "third_party/skia/include/core/SkPaint.h"
21 #include "third_party/skia/include/core/SkRect.h"
22 #include "ui/gfx/break_list.h" 21 #include "ui/gfx/break_list.h"
23 #include "ui/gfx/font_list.h" 22 #include "ui/gfx/font_list.h"
24 #include "ui/gfx/font_render_params.h" 23 #include "ui/gfx/font_render_params.h"
25 #include "ui/gfx/point.h" 24 #include "ui/gfx/point.h"
26 #include "ui/gfx/range/range.h" 25 #include "ui/gfx/range/range.h"
27 #include "ui/gfx/rect.h" 26 #include "ui/gfx/rect.h"
28 #include "ui/gfx/selection_model.h" 27 #include "ui/gfx/selection_model.h"
29 #include "ui/gfx/shadow_value.h" 28 #include "ui/gfx/shadow_value.h"
30 #include "ui/gfx/size_f.h" 29 #include "ui/gfx/size_f.h"
31 #include "ui/gfx/text_constants.h" 30 #include "ui/gfx/text_constants.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 const Point start_; 94 const Point start_;
96 SkPaint paint_; 95 SkPaint paint_;
97 int total_length_; 96 int total_length_;
98 std::vector<Piece> pieces_; 97 std::vector<Piece> pieces_;
99 98
100 DISALLOW_COPY_AND_ASSIGN(DiagonalStrike); 99 DISALLOW_COPY_AND_ASSIGN(DiagonalStrike);
101 }; 100 };
102 101
103 Canvas* canvas_; 102 Canvas* canvas_;
104 SkCanvas* canvas_skia_; 103 SkCanvas* canvas_skia_;
105 bool started_drawing_;
106 SkPaint paint_; 104 SkPaint paint_;
107 SkScalar underline_thickness_; 105 SkScalar underline_thickness_;
108 SkScalar underline_position_; 106 SkScalar underline_position_;
109 scoped_ptr<DiagonalStrike> diagonal_; 107 scoped_ptr<DiagonalStrike> diagonal_;
110 108
111 DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer); 109 DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer);
112 }; 110 };
113 111
114 // Internal helper class used by derived classes to iterate colors and styles. 112 // Internal helper class used by derived classes to iterate colors and styles.
115 class StyleIterator { 113 class StyleIterator {
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 // Lines computed by EnsureLayout. These should be invalidated with 722 // Lines computed by EnsureLayout. These should be invalidated with
725 // ResetLayout and on |display_rect_| changes. 723 // ResetLayout and on |display_rect_| changes.
726 std::vector<internal::Line> lines_; 724 std::vector<internal::Line> lines_;
727 725
728 DISALLOW_COPY_AND_ASSIGN(RenderText); 726 DISALLOW_COPY_AND_ASSIGN(RenderText);
729 }; 727 };
730 728
731 } // namespace gfx 729 } // namespace gfx
732 730
733 #endif // UI_GFX_RENDER_TEXT_H_ 731 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698