focus reverse traversal was not working for TextfieldViews.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2010 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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 39 matching lines @@
     "views/NativeTextfieldViews";
 
 NativeTextfieldViews::NativeTextfieldViews(Textfield* parent)
     : textfield_(parent),
       model_(new TextfieldViewsModel()),
       text_border_(new TextfieldBorder()),
       text_offset_(0),
       insert_(true),
       is_cursor_visible_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(cursor_timer_(this)) {
-  SetFocusable(true);
   set_border(text_border_);
 
   // Multiline is not supported.
   DCHECK_NE(parent->style(), Textfield::STYLE_MULTILINE);
   // Lowercase is not supported.
   DCHECK_NE(parent->style(), Textfield::STYLE_LOWERCASE);
 }
 
 NativeTextfieldViews::~NativeTextfieldViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, View overrides:
 
 bool NativeTextfieldViews::OnMousePressed(const views::MouseEvent& e) {
-  RequestFocus();
+  textfield_->RequestFocus();
   size_t pos = FindCursorPosition(e.location());
   if (model_->MoveCursorTo(pos, false)) {
     UpdateCursorBoundsAndTextOffset();
     SchedulePaint();
   }
   return true;
 }
 
 bool NativeTextfieldViews::OnMouseDragged(const views::MouseEvent& e) {
   size_t pos = FindCursorPosition(e.location());
   if (model_->MoveCursorTo(pos, true)) {
     UpdateCursorBoundsAndTextOffset();
     SchedulePaint();
   }
   return true;
 }
 
 void NativeTextfieldViews::OnMouseReleased(const views::MouseEvent& e,
                                           bool canceled) {
 }
 
 bool NativeTextfieldViews::OnKeyPressed(const views::KeyEvent& e) {
-  Textfield::Controller* controller = textfield_->GetController();
-  bool handled = false;
-  if (controller) {
-    Textfield::Keystroke ks(&e);
-    handled = controller->HandleKeystroke(textfield_, ks);
-  }
-  return handled || HandleKeyEvent(e);
+  // OnKeyPressed/OnKeyReleased/WillGainFocus/DidGainFocus/WillLoseFocus
+  // will never be invoked on NativeTextfieldViews as it will never
+  // gain a focus.

[Jay Civelli, 2011/01/06 00:55:54]

Nit: gain a focus -> gain focus.

[oshima, 2011/01/06 01:31:22]

Done. fixed other places as well.

+  NOTREACHED();
+  return false;
 }
 
 bool NativeTextfieldViews::OnKeyReleased(const views::KeyEvent& e) {
-  return true;
+  NOTREACHED();
+  return false;
 }
 
 void NativeTextfieldViews::Paint(gfx::Canvas* canvas) {
-  text_border_->set_has_focus(HasFocus());
+  text_border_->set_has_focus(textfield_->HasFocus());
   PaintBackground(canvas);
   PaintTextAndCursor(canvas);
   if (textfield_->draw_border())
     PaintBorder(canvas);
 }
 
+void NativeTextfieldViews::DidChangeBounds(const gfx::Rect& previous,
+                                           const gfx::Rect& current) {
+  UpdateCursorBoundsAndTextOffset();
+}
+
 void NativeTextfieldViews::WillGainFocus() {
+  NOTREACHED();
 }
 
 void NativeTextfieldViews::DidGainFocus() {
-  is_cursor_visible_ = true;
-  SchedulePaint();
-  // Start blinking cursor.
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      cursor_timer_.NewRunnableMethod(&NativeTextfieldViews::UpdateCursor),
-      kCursorVisibleTimeMs);
+  NOTREACHED();
 }
 
 void NativeTextfieldViews::WillLoseFocus() {
-  // Stop blinking cursor.
-  cursor_timer_.RevokeAll();
-  if (is_cursor_visible_) {
-    is_cursor_visible_ = false;
-    RepaintCursor();
-  }
-}
-
-void NativeTextfieldViews::DidChangeBounds(const gfx::Rect& previous,
-                                          const gfx::Rect& current) {
-  UpdateCursorBoundsAndTextOffset();
+  NOTREACHED();
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, NativeTextifieldWrapper overrides:
 
 string16 NativeTextfieldViews::GetText() const {
   return model_->text();
 }
 
 void NativeTextfieldViews::UpdateText() {
@@ skipping 63 matching lines @@
   UpdateCursorBoundsAndTextOffset();
 }
 
 void NativeTextfieldViews::UpdateIsPassword() {
   model_->set_is_password(textfield_->IsPassword());
   UpdateCursorBoundsAndTextOffset();
   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateEnabled() {
+  SetEnabled(textfield_->IsEnabled());
   SchedulePaint();
 }
 
-bool NativeTextfieldViews::IsPassword() {
-  // looks unnecessary. should we remove?
-  NOTREACHED();
-  return false;
-}
-
 gfx::Insets NativeTextfieldViews::CalculateInsets() {
   return GetInsets();
 }
 
 void NativeTextfieldViews::UpdateHorizontalMargins() {
   int left, right;
   if (!textfield_->GetHorizontalMargins(&left, &right))
     return;
   gfx::Insets inset = GetInsets();
 
   text_border_->SetInsets(inset.top(), left, inset.bottom(), right);
   UpdateCursorBoundsAndTextOffset();
 }
 
 void NativeTextfieldViews::UpdateVerticalMargins() {
   int top, bottom;
   if (!textfield_->GetVerticalMargins(&top, &bottom))
     return;
   gfx::Insets inset = GetInsets();
 
   text_border_->SetInsets(top, inset.left(), bottom, inset.right());
   UpdateCursorBoundsAndTextOffset();
 }
 
-void NativeTextfieldViews::SetFocus() {
-  RequestFocus();
+bool NativeTextfieldViews::SetFocus() {
+  return false;
 }
 
 View* NativeTextfieldViews::GetView() {
   return this;
 }
 
 gfx::NativeView NativeTextfieldViews::GetTestingHandle() const {
   NOTREACHED();
   return NULL;
 }
 
 bool NativeTextfieldViews::IsIMEComposing() const {
   return false;
 }
 
+bool NativeTextfieldViews::HandleKeyPressed(const views::KeyEvent& e) {
+  Textfield::Controller* controller = textfield_->GetController();
+  bool handled = false;
+  if (controller) {
+    Textfield::Keystroke ks(&e);
+    handled = controller->HandleKeystroke(textfield_, ks);
+  }
+  return handled || HandleKeyEvent(e);
+}
+
+bool NativeTextfieldViews::HandleKeyReleased(const views::KeyEvent& e) {
+  return true;
+}
+
+void NativeTextfieldViews::HandleWillGainFocus() {
+}
+
+void NativeTextfieldViews::HandleDidGainFocus() {
+  is_cursor_visible_ = true;
+  SchedulePaint();
+  // Start blinking cursor.
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      cursor_timer_.NewRunnableMethod(&NativeTextfieldViews::UpdateCursor),
+      kCursorVisibleTimeMs);
+}
+
+void NativeTextfieldViews::HandleWillLoseFocus() {
+  // Stop blinking cursor.
+  cursor_timer_.RevokeAll();
+  if (is_cursor_visible_) {
+    is_cursor_visible_ = false;
+    RepaintCursor();
+  }
+}
+
 // static
 bool NativeTextfieldViews::IsTextfieldViewsEnabled() {
 #if defined(TOUCH_UI)
   return true;
 #else
   return textfield_view_enabled ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           kEnableViewsBasedTextfieldSwitch);
 #endif
 }
@@ skipping 75 matching lines @@
                       width() - insets.width(), height() - insets.height());
 
   // TODO(oshima): bidi support
   // TODO(varunjain): re-implement this so only that dirty text is painted.
   TextfieldViewsModel::TextFragments fragments;
   model_->GetFragments(&fragments);
   int x_offset = text_offset_ + insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor selection_color =
-      HasFocus() ? kFocusedSelectionColor : kUnfocusedSelectionColor;
+      textfield_->HasFocus() ?
+      kFocusedSelectionColor : kUnfocusedSelectionColor;
   SkColor text_color =
       textfield_->read_only() ? kReadonlyTextColor : GetTextColor();
 
   for (TextfieldViewsModel::TextFragments::const_iterator iter =
            fragments.begin();
        iter != fragments.end();
        iter++) {
     string16 text = model_->GetVisibleText((*iter).begin, (*iter).end);
     // TODO(oshima): This does not give the accurate position due to
     // kerning. Figure out how webkit does this with skia.
@@ skipping 311 matching lines @@
 }
 
 void NativeTextfieldViews::TextfieldBorder::SetInsets(int top,
                                                       int left,
                                                       int bottom,
                                                       int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 }  // namespace views