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

Unified Diff: ui/gfx/render_text_win.cc

Issue 10807082: Add RenderText DirectionalityMode enum and support; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update and expand on unit tests. Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/render_text_win.cc
diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc
index 4322affdbca4491c5ea770ef08540a4a4e9b0d58..30b63986b876afb7d265943ebd317f7355865a16 100644
--- a/ui/gfx/render_text_win.cc
+++ b/ui/gfx/render_text_win.cc
@@ -305,12 +305,6 @@ RenderTextWin::RenderTextWin()
RenderTextWin::~RenderTextWin() {
}
-base::i18n::TextDirection RenderTextWin::GetTextDirection() {
- EnsureLayout();
- return (script_state_.uBidiLevel == 0) ?
- base::i18n::LEFT_TO_RIGHT : base::i18n::RIGHT_TO_LEFT;
-}
-
Size RenderTextWin::GetStringSize() {
EnsureLayout();
return string_size_;
@@ -600,11 +594,9 @@ void RenderTextWin::ItemizeLogicalText() {
string_size_ = Size(0, GetFont().GetHeight());
common_baseline_ = 0;
- // Use the first strong character direction as the base text direction.
- // TODO(msw): Use the application text direction instead of LTR by default?
+ // Set the base text direction yeilded by the directionality mode.
Alexei Svitkine (slow) 2012/07/30 22:29:16 Nit: yielded. Although, the comment isn't really c
msw 2012/07/31 03:03:06 Done ("Set Uniscribe's base text direction."), sim
script_state_.uBidiLevel =
- (base::i18n::GetFirstStrongCharacterDirection(text()) ==
- base::i18n::RIGHT_TO_LEFT) ? 1 : 0;
+ (GetTextDirection() == base::i18n::RIGHT_TO_LEFT) ? 1 : 0;
if (text().empty())
return;

Powered by Google App Engine
This is Rietveld 408576698