Enable HarfBuzz by default everywhere except CrOS

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"
 #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 "third_party/icu/source/common/unicode/rbbi.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.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"
 #include "ui/gfx/utf16_indexing.h"
 
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
 namespace gfx {
 
 namespace {
 
 // All chars are replaced by this char when the password style is set.
 // TODO(benrg): GTK uses the first of U+25CF, U+2022, U+2731, U+273A, '*'
 // that's available in the font (find_invisible_char() in gtkentry.c).
 const base::char16 kPasswordReplacementChar = '*';
 
 // Default color used for the text and cursor.
@@ skipping 346 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)
-  // Use the more complete HarfBuzz implementation for Views controls on Mac.
+#if defined(OS_WIN)
+  bool default_is_harfbuzz = base::win::OSInfo::GetInstance()->version() <=
+      base::win::Version::VERSION_WIN8;

[msw, 2014/10/05 17:58:21]

Are you sure the sizing problem only affects windows 8.1 and not 8? Add a
comment referencing the blocking bug.

[ckocagil, 2014/10/15 19:50:44]

This should be fixed on both as of
https://crrev.com/ec562a798a1835e0383e83bae7dc71dffcfc5fb0

+#elif defined(OS_CHROMEOS)
+  bool default_is_harfbuzz = false;

[msw, 2014/10/05 17:58:21]

What is the chrome os blocker(s)? Add a comment referencing the bug(s).

[ckocagil, 2014/10/15 19:50:44]

Done.

+#else
+  bool default_is_harfbuzz = true;
+#endif
+
+  if (!default_is_harfbuzz || CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableHarfBuzzRenderText)) {
+    return CreateNativeInstance();
+  }
   return new RenderTextHarfBuzz;
-#else
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableHarfBuzzRenderText)) {
-    return new RenderTextHarfBuzz;
-  }
-  return CreateNativeInstance();
-#endif
 }
 
 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
@@ skipping 962 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