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

Side by Side Diff: views/view_text_utils.cc

Issue 7008005: base/i18n: Pass |str| as const reference in BreakIterator::Init(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: const reference Created 9 years, 7 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 | « views/controls/textfield/textfield_views_model.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "views/view_text_utils.h" 5 #include "views/view_text_utils.h"
6 6
7 #include "base/i18n/bidi_line_iterator.h" 7 #include "base/i18n/bidi_line_iterator.h"
8 #include "base/i18n/break_iterator.h" 8 #include "base/i18n/break_iterator.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #if defined(OS_WIN) 91 #if defined(OS_WIN)
92 const SkColor text_color = color_utils::GetSysSkColor(COLOR_WINDOWTEXT); 92 const SkColor text_color = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
93 #else 93 #else
94 // TODO(beng): source from theme provider. 94 // TODO(beng): source from theme provider.
95 const SkColor text_color = SK_ColorBLACK; 95 const SkColor text_color = SK_ColorBLACK;
96 #endif 96 #endif
97 97
98 // Iterate through line breaking opportunities (which in English would be 98 // Iterate through line breaking opportunities (which in English would be
99 // spaces and such). This tells us where to wrap. 99 // spaces and such). This tells us where to wrap.
100 string16 text16(WideToUTF16(text)); 100 string16 text16(WideToUTF16(text));
101 base::i18n::BreakIterator iter(&text16, 101 base::i18n::BreakIterator iter(text16,
102 base::i18n::BreakIterator::BREAK_SPACE); 102 base::i18n::BreakIterator::BREAK_SPACE);
103 if (!iter.Init()) 103 if (!iter.Init())
104 return; 104 return;
105 105
106 int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT : 106 int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT :
107 gfx::Canvas::TEXT_ALIGN_LEFT); 107 gfx::Canvas::TEXT_ALIGN_LEFT);
108 flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX; 108 flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX;
109 109
110 // Iterate over each word in the text, or put in a more locale-neutral way: 110 // Iterate over each word in the text, or put in a more locale-neutral way:
111 // iterate to the next line breaking opportunity. 111 // iterate to the next line breaking opportunity.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 int font_height, 161 int font_height,
162 gfx::Size* position, 162 gfx::Size* position,
163 const gfx::Rect& bounds) { 163 const gfx::Rect& bounds) {
164 if (position->width() + word_width > bounds.right()) { 164 if (position->width() + word_width > bounds.right()) {
165 position->set_width(0); 165 position->set_width(0);
166 position->Enlarge(0, font_height); 166 position->Enlarge(0, font_height);
167 } 167 }
168 } 168 }
169 169
170 } // namespace view_text_utils 170 } // namespace view_text_utils
OLDNEW
« no previous file with comments | « views/controls/textfield/textfield_views_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698