RenderText API Outline.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 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"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/render_text.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/focusable_border.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/textfield/text_style.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/events/event.h"
@@ skipping 783 matching lines @@
   OnCaretBoundsChanged();
 }
 
 void NativeTextfieldViews::PaintTextAndCursor(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
   canvas->ClipRectInt(insets.left(), insets.top(),
                       width() - insets.width(), height() - insets.height());
 
+  // TODO(msw): Fix... integrate, etc...
+  int x = text_offset_ + insets.left();
+  int y = insets.top();
+  int w = GetFont().GetStringWidth(model_->text());
+  int h = height() - insets.height();
+  gfx::Rect display_bounds = gfx::Rect(x, y, w, h);
+  gfx::RenderText* render_text = gfx::RenderText::CreateRenderText(
+    model_->text(), GetFont(), GetTextColor(), display_bounds, 0);
+
+  canvas->DrawStringInt(*render_text);
+
+/* TODO(msw): Fix... integrate, etc...
   // 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 =
       textfield_->HasFocus() ?
       kFocusedSelectionColor : kUnfocusedSelectionColor;
@@ skipping 24 matching lines @@
   canvas->Restore();
 
   // Paint cursor. Replace cursor is drawn as rectangle for now.
   if (textfield_->IsEnabled() && (is_drop_cursor_visible_ ||
       (is_cursor_visible_ && !model_->HasSelection())))
     canvas->DrawRectInt(kCursorColor,
                         cursor_bounds_.x(),
                         cursor_bounds_.y(),
                         cursor_bounds_.width(),
                         cursor_bounds_.height());
+*/
 }
 
 bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {
   // TODO(oshima): Refactor and consolidate with ExecuteCommand.
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = key_event.key_code();
     // TODO(oshima): shift-tab does not work. Figure out why and fix.
     if (key_code == ui::VKEY_TAB)
       return false;
 
@@ skipping 233 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views