diff options
| author | derat <derat@chromium.org> | 2014-10-20 15:08:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 22:08:59 +0000 |
| commit | 7dc97b1cb620f2aba3be293af5019832d9bc00b7 (patch) | |
| tree | ec57a6e5187270ed59ed8326bd95cc3a6c0c84c1 | |
| parent | a30ca3cd77a8a33b839c59973c414692b19f872b (diff) | |
| download | chromium_src-7dc97b1cb620f2aba3be293af5019832d9bc00b7.zip chromium_src-7dc97b1cb620f2aba3be293af5019832d9bc00b7.tar.gz chromium_src-7dc97b1cb620f2aba3be293af5019832d9bc00b7.tar.bz2 | |
chromeos: Enable RenderTextHarfBuzz.
Enable RenderTextHarfBuzz on Chrome OS.
BUG=321868,376077,423791
Review URL: https://codereview.chromium.org/634983002
Cr-Commit-Position: refs/heads/master@{#300348}
| -rw-r--r-- | chrome/browser/autofill/form_structure_browsertest.cc | 5 | ||||
| -rw-r--r-- | ui/gfx/render_text.cc | 18 |
2 files changed, 6 insertions, 17 deletions
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index c18df57..a2d335e 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -101,8 +101,9 @@ std::string FormStructureBrowserTest::FormStructuresToString( return forms_string; } -// Heuristics tests timeout on Windows. See http://crbug.com/85276 -#if defined(OS_WIN) +// Heuristics tests time out on Windows (http://crbug.com/85276) and Chrome OS +// (http://crbug.com/423791). +#if defined(OS_WIN) || defined(OS_CHROMEOS) #define MAYBE_DataDrivenHeuristics(n) DISABLED_DataDrivenHeuristics##n #else #define MAYBE_DataDrivenHeuristics(n) DataDrivenHeuristics##n diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 8c516c1..d7a6a55 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -393,21 +393,9 @@ RenderText::~RenderText() { } RenderText* RenderText::CreateInstance() { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableHarfBuzzRenderText)) { - return new RenderTextHarfBuzz; - } - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableHarfBuzzRenderText)) { - return CreateNativeInstance(); - } - -// Disable on Chrome OS. Blocked on http://crbug.com/423791 -#if defined(OS_CHROMEOS) - return CreateNativeInstance(); -#else - return new RenderTextHarfBuzz; -#endif + return CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableHarfBuzzRenderText) ? CreateNativeInstance() : + new RenderTextHarfBuzz; } void RenderText::SetText(const base::string16& text) { |