Remove gfx::Canvas::DrawStringRectWithHalo.

ui/views/examples/text_example.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/examples/text_example.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
@@ skipping 49 matching lines @@
 }
 
 }  // namespace
 
 // TextExample's content view, which draws stylized string.
 class TextExample::TextExampleView : public View {
  public:
   TextExampleView()
     : text_(base::ASCIIToUTF16(kShortText)),
       flags_(0),
-      halo_(false),
       elide_(gfx::NO_ELIDE) {
   }
 
   void OnPaint(gfx::Canvas* canvas) override {
     View::OnPaint(canvas);
     const gfx::Rect bounds = GetContentsBounds();
     const SkColor color = SK_ColorDKGRAY;
     if (elide_ == gfx::FADE_TAIL) {
       canvas->DrawFadedString(text_, font_list_, color, bounds, flags_);
-    } else if (halo_) {
-      canvas->DrawStringRectWithHalo(text_, font_list_, color, SK_ColorYELLOW,
-                                     bounds, flags_);
     } else {
       canvas->DrawStringRectWithFlags(text_, font_list_, color, bounds, flags_);
     }
   }
 
   int flags() const { return flags_; }
   void set_flags(int flags) { flags_ = flags; }
   void set_text(const base::string16& text) { text_ = text; }
-  void set_halo(bool halo) { halo_ = halo; }
   void set_elide(gfx::ElideBehavior elide) { elide_ = elide; }
 
   int GetStyle() const { return font_list_.GetFontStyle(); }
   void SetStyle(int style) { font_list_ = font_list_.DeriveWithStyle(style); }
 
   gfx::Font::Weight GetWeight() const { return font_list_.GetFontWeight(); }
   void SetWeight(gfx::Font::Weight weight) {
     font_list_ = font_list_.DeriveWithWeight(weight);
   }
 
  private:
   // The font used for drawing the text.
   gfx::FontList font_list_;
 
   // The text to draw.
   base::string16 text_;
 
   // Text flags for passing to |DrawStringRect()|.
   int flags_;
 
-  // A flag to draw a halo around the text.
-  bool halo_;
-
   // The eliding, fading, or truncating behavior.
   gfx::ElideBehavior elide_;
 
   DISALLOW_COPY_AND_ASSIGN(TextExampleView);
 };
 
 TextExample::TextExample() : ExampleBase("Text Styles") {}
 
 TextExample::~TextExample() {
   // Remove the views first as some reference combobox models.
@@ skipping 43 matching lines @@
   eliding_cb_ = AddCombobox(layout, "Eliding", kElideBehaviors,
                             arraysize(kElideBehaviors));
   prefix_cb_ = AddCombobox(layout, "Prefix", kPrefixOptions,
                            arraysize(kPrefixOptions));
   text_cb_ = AddCombobox(layout, "Example Text", kTextExamples,
                          arraysize(kTextExamples));
 
   layout->StartRow(0, 0);
   multiline_checkbox_ = AddCheckbox(layout, "Multiline");
   break_checkbox_ = AddCheckbox(layout, "Character Break");
-  halo_checkbox_ = AddCheckbox(layout, "Halo");
   bold_checkbox_ = AddCheckbox(layout, "Bold");
   italic_checkbox_ = AddCheckbox(layout, "Italic");
   underline_checkbox_ = AddCheckbox(layout, "Underline");
 
   layout->AddPaddingRow(0, 20);
   column_set = layout->AddColumnSet(1);
   column_set->AddPaddingColumn(0, 16);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
                         1, GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 16);
   layout->StartRow(1, 1);
   layout->AddView(text_view_);
   layout->AddPaddingRow(0, 8);
 }
 
 void TextExample::ButtonPressed(Button* button, const ui::Event& event) {
   int flags = text_view_->flags();
   int style = text_view_->GetStyle();
   SetFlagFromCheckbox(multiline_checkbox_, &flags, gfx::Canvas::MULTI_LINE);
   SetFlagFromCheckbox(break_checkbox_, &flags, gfx::Canvas::CHARACTER_BREAK);
   SetFlagFromCheckbox(italic_checkbox_, &style, gfx::Font::ITALIC);
   SetFlagFromCheckbox(underline_checkbox_, &style, gfx::Font::UNDERLINE);
-  text_view_->set_halo(halo_checkbox_->checked());
   text_view_->set_flags(flags);
   text_view_->SetStyle(style);
   text_view_->SetWeight(bold_checkbox_->checked() ? gfx::Font::Weight::BOLD
                                                   : gfx::Font::Weight::NORMAL);
   text_view_->SchedulePaint();
 }
 
 void TextExample::OnPerformAction(Combobox* combobox) {
   int flags = text_view_->flags();
   if (combobox == h_align_cb_) {
@@ skipping 52 matching lines @@
         flags |= gfx::Canvas::HIDE_PREFIX;
         break;
     }
   }
   text_view_->set_flags(flags);
   text_view_->SchedulePaint();
 }
 
 }  // namespace examples
 }  // namespace views