MacViews: Use RenderTextHarfBuzz only for Textfields

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 <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
@@ skipping 380 matching lines @@
   paint->setAutohinted(params.autohinter);
   paint->setHinting(FontRenderParamsHintingToSkPaintHinting(params.hinting));
 }
 
 }  // namespace internal
 
 RenderText::~RenderText() {
 }
 
 RenderText* RenderText::CreateInstance() {
-#if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)

[Alexei Svitkine (slow), 2014/12/08 15:53:10]

Is this change needed anymore?

[Andre, 2014/12/08 18:33:45]

I think so.
TOOLKIT_VIEWS will be turned on soon for Mac, and we don't want that change to
affect the Cocoa
browser.

+#if defined(OS_MACOSX)
   static const bool use_harfbuzz = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableHarfBuzzRenderText);
 #else
   static const bool use_harfbuzz = !CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableHarfBuzzRenderText);
 #endif
   return use_harfbuzz ? new RenderTextHarfBuzz : CreateNativeInstance();
 }
 
+RenderText* RenderText::CreateInstanceForEditing() {
+  return new RenderTextHarfBuzz;

[msw, 2014/12/08 19:27:50]

Shouldn't this respect kDisableHarfBuzzRenderText?

[Andre, 2014/12/08 19:51:32]

Done.

+}
+
 void RenderText::SetText(const base::string16& text) {
   DCHECK(!composition_range_.IsValid());
   if (text_ == text)
     return;
   text_ = text;
 
   // Adjust ranged styles and colors to accommodate a new text length.
   // Clear style ranges as they might break new text graphemes and apply
   // the first style to the whole text instead.
   const size_t text_length = text_.length();
@@ skipping 805 matching lines @@
 
 base::string16 RenderText::Elide(const base::string16& text,
                                  float available_width,
                                  ElideBehavior behavior) {
   if (available_width <= 0 || text.empty())
     return base::string16();
   if (behavior == ELIDE_EMAIL)
     return ElideEmail(text, available_width);
 
   // Create a RenderText copy with attributes that affect the rendering width.
-  scoped_ptr<RenderText> render_text(CreateInstance());
+  scoped_ptr<RenderText> render_text = NewInstance();
   render_text->SetFontList(font_list_);
   render_text->SetDirectionalityMode(directionality_mode_);
   render_text->SetCursorEnabled(cursor_enabled_);
   render_text->set_truncate_length(truncate_length_);
   render_text->styles_ = styles_;
   render_text->colors_ = colors_;
   render_text->SetText(text);
   if (render_text->GetContentWidth() <= available_width)
     return text;
 
@@ skipping 158 matching lines @@
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx