Remove gfx::Canvas::DrawStringRectWithHalo.

ui/gfx/render_text.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/gfx/render_text.h"
 
 #include <limits.h>
 
 #include <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "third_party/icu/source/common/unicode/rbbi.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkFontStyle.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkMorphologyImageFilter.h"

[msw, 2017/01/25 18:09:07]

nit: remove

[Evan Stade, 2017/01/26 00:43:10]

Done.

 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/platform_font.h"
 #include "ui/gfx/render_text_harfbuzz.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
@@ skipping 208 matching lines @@
 }
 
 void SkiaTextRenderer::SetForegroundColor(SkColor foreground) {
   paint_.setColor(foreground);
 }
 
 void SkiaTextRenderer::SetShader(sk_sp<SkShader> shader) {
   paint_.setShader(std::move(shader));
 }
 
-void SkiaTextRenderer::SetHaloEffect() {
-  paint_.setImageFilter(SkDilateImageFilter::Make(1, 1, nullptr));
-}
-
 void SkiaTextRenderer::SetUnderlineMetrics(SkScalar thickness,
                                            SkScalar position) {
   underline_thickness_ = thickness;
   underline_position_ = position;
 }
 
 void SkiaTextRenderer::DrawPosText(const SkPoint* pos,
                                    const uint16_t* glyphs,
                                    size_t glyph_count) {
   const size_t byte_length = glyph_count * sizeof(glyphs[0]);
@@ skipping 588 matching lines @@
     canvas->ClipRect(clip_rect);
   }
 
   if (!text().empty() && focused())
     DrawSelection(canvas);
 
   if (cursor_enabled() && cursor_visible() && focused())
     DrawCursor(canvas, selection_model_);
 
   if (!text().empty()) {
     internal::SkiaTextRenderer renderer(canvas);

[msw, 2017/01/25 18:09:07]

nit: inline |renderer| and remove curlies

[Evan Stade, 2017/01/26 00:43:10]

I don't think I can do that --- how does one take the address of a temporary
without breaking the compile?

[msw, 2017/01/26 00:52:09]

Ah, I missed that; disregard my comment.

-    if (halo_effect())
-      renderer.SetHaloEffect();
     DrawVisualText(&renderer);
   }
 
   if (clip_to_display_rect())
     canvas->Restore();
 }
 
 void RenderText::DrawCursor(Canvas* canvas, const SelectionModel& position) {
   // Paint cursor. Replace cursor is drawn as rectangle for now.
   // TODO(msw): Draw a better cursor with a better indication of association.
@@ skipping 830 matching lines @@
 
   for (; range_max < length; ++range_max)
     if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max))
       break;
 
   return range.is_reversed() ? Range(range_max, range_min)
                              : Range(range_min, range_max);
 }
 
 }  // namespace gfx