RenderText API Outline.

chrome/browser/ui/views/omnibox/omnibox_view_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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/render_text.h"
 #include "views/border.h"
-#include "views/controls/textfield/text_style.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/layout/fill_layout.h"
 
 namespace {
 
 // Textfield for autocomplete that intercepts events that are necessary
 // for OmniboxViewViews.
 class AutocompleteTextfield : public views::Textfield {
  public:
   explicit AutocompleteTextfield(OmniboxViewViews* omnibox_view)
@@ skipping 86 matching lines @@
                                    bool popup_window_mode,
                                    const views::View* location_bar)
     : model_(new AutocompleteEditModel(this, controller, profile)),
       popup_view_(CreatePopupView(profile, location_bar)),
       controller_(controller),
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       popup_window_mode_(popup_window_mode),
       security_level_(ToolbarModel::NONE),
       ime_composing_before_change_(false),
-      delete_at_end_pressed_(false),
-      faded_text_style_(NULL),
-      normal_text_style_(NULL),
-      security_error_scheme_style_(NULL),
-      secure_scheme_style_(NULL) {
+      delete_at_end_pressed_(false) {
   set_border(views::Border::CreateEmptyBorder(kAutocompleteVerticalMargin, 0,
                                               kAutocompleteVerticalMargin, 0));
 }
 
 OmniboxViewViews::~OmniboxViewViews() {
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_OMNIBOX_DESTROYED, Source<OmniboxViewViews>(this),
       NotificationService::NoDetails());
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
@@ skipping 463 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxViewViews, private:
 
 size_t OmniboxViewViews::GetTextLength() const {
   // TODO(oshima): Support instant, IME.
   return textfield_->text().length();
 }
 
 void OmniboxViewViews::EmphasizeURLComponents() {
-  InitTextStyles();
   // See whether the contents are a URL with a non-empty host portion, which we
   // should emphasize.  To check for a URL, rather than using the type returned
   // by Parse(), ask the model, which will check the desired page transition for
   // this input.  This can tell us whether an UNKNOWN input string is going to
   // be treated as a search or a navigation, and is the same method the Paste
   // And Go system uses.
   string16 text = GetText();
   url_parse::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(
       text, model_->GetDesiredTLD(), &scheme, &host);
   const bool emphasize = model_->CurrentTextIsURL() && (host.len > 0);
-
-  textfield_->ClearAllTextStyles();
+  gfx::StyleRange base_style;
+  base_style.foreground = emphasize ? kFadedTextColor : kNormalTextColor;
+  base_style.range = ui::Range(0, text.length());
+  textfield_->ApplyStyleRange(base_style);
   if (emphasize) {

[oshima, 2011/07/23 09:51:12]

While I understand what it's doing, it is now a bit harder to follow, probably
because this is now more procedural while it was more declarative.
 Could you try to come up with better way?

[msw, 2011/07/25 05:09:54]

Done.

-    textfield_->ApplyTextStyle(faded_text_style_, ui::Range(0, text.length()));
-    textfield_->ApplyTextStyle(normal_text_style_,
-                               ui::Range(host.begin, host.end()));
-  } else {
-    textfield_->ApplyTextStyle(normal_text_style_, ui::Range(0, text.length()));
+    gfx::StyleRange host_style;
+    host_style.foreground = kNormalTextColor;
+    host_style.range = ui::Range(host.begin, host.end());
+    textfield_->ApplyStyleRange(host_style);
   }
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model_->user_input_in_progress() && scheme.is_nonempty() &&
       (security_level_ != ToolbarModel::NONE)) {
-    ui::Range scheme_range(scheme.begin, scheme.end());
+    gfx::StyleRange scheme_style;
+    scheme_style.range = ui::Range(scheme.begin, scheme.end());
     switch (security_level_) {
       case ToolbarModel::SECURITY_ERROR:
-        textfield_->ApplyTextStyle(security_error_scheme_style_, scheme_range);
+        scheme_style.foreground = kSecurityErrorSchemeColor;
+        scheme_style.strike = true;
         break;
       case ToolbarModel::SECURITY_WARNING:
-        textfield_->ApplyTextStyle(faded_text_style_, scheme_range);
+        scheme_style.foreground = kFadedTextColor;
         break;
       case ToolbarModel::EV_SECURE:
       case ToolbarModel::SECURE:
-        textfield_->ApplyTextStyle(secure_scheme_style_, scheme_range);
+        scheme_style.foreground = kSecureSchemeColor;
         break;
       default:
         NOTREACHED() << "Unknown SecurityLevel:" << security_level_;
     }
+    textfield_->ApplyStyleRange(scheme_style);
   }
 }
 
 void OmniboxViewViews::TextChanged() {
   EmphasizeURLComponents();
   model_->OnChanged();
 }
 
 void OmniboxViewViews::SetTextAndSelectedRange(const string16& text,
                                                const ui::Range& range) {
@@ skipping 16 matching lines @@
     Profile* profile,
     const View* location_bar) {
 #if defined(TOUCH_UI)
   typedef TouchAutocompletePopupContentsView AutocompleteContentsView;
 #else
   typedef AutocompletePopupContentsView AutocompleteContentsView;
 #endif
   return new AutocompleteContentsView(
       gfx::Font(), this, model_.get(), profile, location_bar);
 }
-
-void OmniboxViewViews::InitTextStyles() {
-  if (faded_text_style_)
-    return;
-  faded_text_style_ = textfield_->CreateTextStyle();
-  normal_text_style_ = textfield_->CreateTextStyle();
-  security_error_scheme_style_ = textfield_->CreateTextStyle();
-  secure_scheme_style_ = textfield_->CreateTextStyle();
-
-  faded_text_style_->set_foreground(kFadedTextColor);
-  normal_text_style_->set_foreground(kNormalTextColor);
-  secure_scheme_style_->set_foreground(kSecureSchemeColor);
-  security_error_scheme_style_->set_foreground(kSecurityErrorSchemeColor);
-  security_error_scheme_style_->set_strike(true);
-}