Implement STYLE_LOWERCASE style for Aura NativeTextfield.

ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
+#include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_locale_settings.h"
 #include "grit/ui_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/metrics.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
+#include "unicode/uchar.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 namespace {
 
 // Text color for read only.
 const SkColor kReadonlyTextColor = SK_ColorDKGRAY;
 
@@ skipping 20 matching lines @@
       skip_input_method_cancel_composition_(false),
       initiating_drag_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(cursor_timer_(this)),
       aggregated_clicks_(0),
       last_click_time_(),
       last_click_location_(),
       ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
           TouchSelectionController::create(this))) {
   set_border(text_border_);
 
-  // Lowercase is not supported.
-  DCHECK_NE(parent->style(), Textfield::STYLE_LOWERCASE);
-
 #if defined(OS_CHROMEOS)
   GetRenderText()->SetFontList(gfx::FontList(l10n_util::GetStringUTF8(
       IDS_UI_FONT_FAMILY_CROS)));
 #else
   GetRenderText()->SetFontList(gfx::FontList(textfield_->font()));
 #endif
   // Set the default text style.
   gfx::StyleRange default_style;
   default_style.foreground = textfield_->text_color();
   GetRenderText()->set_default_style(default_style);
@@ skipping 98 matching lines @@
   DCHECK(CanDrop(event.data()));
   DCHECK(!initiating_drag_ ||
          !GetRenderText()->IsPointInSelection(event.location()));
   OnBeforeUserAction();
   skip_input_method_cancel_composition_ = true;
 
   gfx::SelectionModel drop_destination_model =
       GetRenderText()->FindCursorPosition(event.location());
   string16 text;
   event.data().GetString(&text);
+  text = GetTextForDisplay(text);
 
   // We'll delete the current selection for a drag and drop within this view.
   bool move = initiating_drag_ && !event.IsControlDown() &&
               event.source_operations() & ui::DragDropTypes::DRAG_MOVE;
   if (move) {
     gfx::SelectionModel selected;
     model_->GetSelectionModel(&selected);
     // Adjust the drop destination if it is on or after the current selection.
     size_t drop_destination = drop_destination_model.caret_pos();
     drop_destination -=
@@ skipping 103 matching lines @@
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, NativeTextifieldWrapper overrides:
 
 string16 NativeTextfieldViews::GetText() const {
   return model_->GetText();
 }
 
 void NativeTextfieldViews::UpdateText() {
-  model_->SetText(textfield_->text());
+  string16 text = textfield_->text();
+  model_->SetText(GetTextForDisplay(text));

[msw, 2012/04/13 18:13:25]

nit: model_->SetText(GetTextForDisplay(textfield_->text()));

[kochi, 2012/04/16 04:54:18]

Done.

   OnCaretBoundsChanged();
   SchedulePaint();
   textfield_->GetWidget()->NotifyAccessibilityEvent(
       textfield_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
 }
 
 void NativeTextfieldViews::AppendText(const string16& text) {
   if (text.empty())
     return;
-  model_->Append(text);
+  model_->Append(GetTextForDisplay(text));
   OnCaretBoundsChanged();
   SchedulePaint();
 }
 
 string16 NativeTextfieldViews::GetSelectedText() const {
   return model_->GetSelectedText();
 }
 
 void NativeTextfieldViews::SelectAll() {
   OnBeforeUserAction();
@@ skipping 316 matching lines @@
   OnAfterUserAction();
 }
 
 void NativeTextfieldViews::InsertText(const string16& text) {
   // TODO(suzhe): Filter invalid characters.
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE || text.empty())
     return;
 
   OnBeforeUserAction();
   skip_input_method_cancel_composition_ = true;
+
   if (GetRenderText()->insert_mode())
-    model_->InsertText(text);
+    model_->InsertText(GetTextForDisplay(text));
   else
-    model_->ReplaceText(text);
+    model_->ReplaceText(GetTextForDisplay(text));
   skip_input_method_cancel_composition_ = false;
   UpdateAfterChange(true, true);
   OnAfterUserAction();
 }
 
 void NativeTextfieldViews::InsertChar(char16 ch, int flags) {
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE ||
       !ShouldInsertChar(ch, flags)) {
     return;
   }
 
   OnBeforeUserAction();
   skip_input_method_cancel_composition_ = true;
   if (GetRenderText()->insert_mode())
     model_->InsertChar(ch);
   else
     model_->ReplaceChar(ch);
   skip_input_method_cancel_composition_ = false;
+
+  if (textfield_->style() & Textfield::STYLE_LOWERCASE)
+    model_->SetText(base::i18n::ToLower(GetText()));

[msw, 2012/04/13 18:13:25]

Should this be an unconditional model_->SetText(GetTextForDisplay(GetText())?

[kochi, 2012/04/16 04:54:18]

Done.

+
   UpdateAfterChange(true, true);
   OnAfterUserAction();
 }
 
 ui::TextInputType NativeTextfieldViews::GetTextInputType() const {
   return textfield_->GetTextInputType();
 }
 
 bool NativeTextfieldViews::CanComposeInline() const {
   return true;
@@ skipping 82 matching lines @@
   if (skip_input_method_cancel_composition_)
     return;
   DCHECK(textfield_->GetInputMethod());
   textfield_->GetInputMethod()->CancelComposition(textfield_);
 }
 
 gfx::RenderText* NativeTextfieldViews::GetRenderText() const {
   return model_->render_text();
 }
 
+string16 NativeTextfieldViews::GetTextForDisplay(const string16& text) {
+  return textfield_->style() & Textfield::STYLE_LOWERCASE ?
+      base::i18n::ToLower(text) : text;
+}
+
 void NativeTextfieldViews::UpdateCursor() {
   is_cursor_visible_ = !is_cursor_visible_;
   RepaintCursor();
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&NativeTextfieldViews::UpdateCursor,
                  cursor_timer_.GetWeakPtr()),
       is_cursor_visible_ ? kCursorVisibleTimeMs : kCursorInvisibleTimeMs);
 }
 
@@ skipping 234 matching lines @@
 bool NativeTextfieldViews::Copy() {
   if (model_->Copy()) {
     TextfieldController* controller = textfield_->GetController();
     if (controller)
       controller->OnAfterCutOrCopy();
     return true;
   }
   return false;
 }
 
 bool NativeTextfieldViews::Paste() {

[msw, 2012/04/13 18:13:25]

Gah, I think textfield_->text() versus GetText() (from the model) is confusing.
I think this whole function should be:

bool NativeTextfieldViews::Paste() {
  string16 original_text = GetText();
  const bool success = model_->Paste();
  if (success) {
    // <YOUR COMMENT ABOUT NEEDING TO LOWERCASE (ENFORCE STYLE) HERE>
    string16 new_text = GetTextForDisplay(GetText());
    if (new_text != original_text) {
      model_->SetText(new_text);
    } else {
      <THE COMMENT AND [UNCONDITIONAL] CODE TO TRIGGER ContentChanged>
    }
  }
  return success;
}

Please make that change if you don't mind (and if I'm correct).

[kochi, 2012/04/16 04:54:18]

I mostly applied your comment.
I felt that calling model_->SetText(new_text) only when new_text !=
original_text is correct but a bit hard to understand at first.  Instead, what
we do elsewhere, unconditionally SetText(), which is suboptimal but is easier
to understand.  And this also addresses asymmetry of if- and
else-clauses.

On 2012/04/13 18:13:25, msw wrote:

   const bool success = model_->Paste();
 
-  // Calls TextfieldController::ContentsChanged() explicitly if the paste action
-  // did not change the content at all. See http://crbug.com/79002
-  if (success && GetText() == textfield_->text()) {
-    TextfieldController* controller = textfield_->GetController();
-    if (controller)
-      controller->ContentsChanged(textfield_, textfield_->text());
+  if (success) {
+    string16 textfield_text = textfield_->text();
+    // As Paste is handled in model_->Paste(), the RenderText may contain
+    // upper case characters. This is not consistent with other places
+    // which keeps RenderText only containing lower case characters.
+    if (textfield_->style() & Textfield::STYLE_LOWERCASE) {
+      model_->SetText(base::i18n::ToLower(GetText()));
+      textfield_text = base::i18n::ToLower(textfield_text);
+    }
+    // Calls TextfieldController::ContentsChanged() explicitly if the paste
+    // action did not change the content at all. See http://crbug.com/79002
+    if (GetText() == textfield_text) {
+      TextfieldController* controller = textfield_->GetController();
+      if (controller)
+        controller->ContentsChanged(textfield_, textfield_->text());
+    }
   }
   return success;
 }
 
 void NativeTextfieldViews::TrackMouseClicks(const MouseEvent& event) {
   if (event.IsOnlyLeftMouseButton()) {
     base::TimeDelta time_delta = event.time_stamp() - last_click_time_;
     if (time_delta.InMilliseconds() <= GetDoubleClickInterval() &&
         !ExceededDragThresholdFromLastClickLocation(event)) {
       aggregated_clicks_ = (aggregated_clicks_ + 1) % 3;
@@ skipping 54 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views