|
 |
5266162 |
From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001
|
|
|
5266162 |
From: Maksim Sisov <msisov@igalia.com>
|
|
|
5266162 |
Date: Fri, 7 Sep 2018 18:57:42 +0000
|
|
|
5266162 |
Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization
|
|
|
5266162 |
|
|
|
5266162 |
It looks like there is bug in GCC 6, which cannot go through
|
|
|
5266162 |
structure initialization normally.
|
|
|
5266162 |
|
|
|
5266162 |
Thus, instead of a default initialization of one of the members,
|
|
|
5266162 |
explicitly initialize it to a default value.
|
|
|
5266162 |
|
|
|
5266162 |
Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c
|
|
|
5266162 |
Reviewed-on: https://chromium-review.googlesource.com/1213181
|
|
|
5266162 |
Reviewed-by: Scott Violet <sky@chromium.org>
|
|
|
5266162 |
Commit-Queue: Maksim Sisov <msisov@igalia.com>
|
|
|
5266162 |
Cr-Commit-Position: refs/heads/master@{#589614}
|
|
|
5266162 |
---
|
|
|
5266162 |
chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++-
|
|
|
5266162 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
5266162 |
|
|
|
5266162 |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
|
5266162 |
index f0a8083dc930..9021284f166d 100644
|
|
|
5266162 |
--- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
|
5266162 |
+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
|
5266162 |
@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style,
|
|
|
5266162 |
style = {part_color, .baseline = gfx::SUPERIOR};
|
|
|
5266162 |
break;
|
|
|
5266162 |
case SuggestionAnswer::TextStyle::BOLD:
|
|
|
5266162 |
- style = {part_color, .weight = gfx::Font::Weight::BOLD};
|
|
|
5266162 |
+ style = {part_color, .baseline = gfx::NORMAL_BASELINE,
|
|
|
5266162 |
+ .weight = gfx::Font::Weight::BOLD};
|
|
|
5266162 |
break;
|
|
|
5266162 |
case SuggestionAnswer::TextStyle::NORMAL:
|
|
|
5266162 |
case SuggestionAnswer::TextStyle::NORMAL_DIM:
|
|
|
5266162 |
--
|
|
|
5266162 |
2.17.2
|
|
|
5266162 |
|