d7a4c1bd91
- System harfbuzz disable as we need git variant :( - Up 70.0.3538.45 - Up 70.0.3538.35 - Bump the nodejs dependency to 10/8 - Up to 70.0.3538.22 - Up to 70.0.3528.4 - Up to chromium-70.0.3521.2 - Add patch trying to build with system icu: - Up to chromium-70.0.3510.0 - Up to 69.0.3497.23 - Up to chromium-69.0.3497.12 - Add patch to fix aarch64 build: * chromium-vpx-aarch64.patch - Up to 69.0.3493.3 - Up to 69.0.3486.0 - Up to 69.0.3472.3 - Up to 69.0.3452.0 - Up to 68.0.3440.17 - Up to 68.0.3438.3 - Up to 68.0.3432.3 - Fix AArch64 build with chromium-crashpad-aarch64-fix.patch - Up to 68.0.3423.2 - Refresh patch chromium-master-prefs-path.patch - Fix AArch64 build with chromium-skia-aarch64-buildfix.patch - Add patch chromium-skia-system-fontconfig.patch bsc#1092272 - Up to 67.0.3393.30 - Up to chromium-67.0.3396.18 - Up to 67.0.3393.4 - Refresh patch exclude_ymp.patch OBS-URL: https://build.opensuse.org/request/show/642560 OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=1178
128 lines
5.9 KiB
Diff
128 lines
5.9 KiB
Diff
From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001
|
|
From: Wang Qing <wangqing-hf@loongson.cn>
|
|
Date: Mon, 3 Sep 2018 02:41:08 +0000
|
|
Subject: [PATCH] Fix build error for blink.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This CLs fixed the error of constexpr function call to non-constexpr function.
|
|
|
|
Bug: 878202
|
|
Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9
|
|
Reviewed-on: https://chromium-review.googlesource.com/1192467
|
|
Commit-Queue: 汪 清 <wangqing-hf@loongson.cn>
|
|
Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
|
|
Cr-Commit-Position: refs/heads/master@{#588316}
|
|
---
|
|
.../core/animation/animation_time_delta.cc | 22 ++++++++++++++
|
|
.../core/animation/animation_time_delta.h | 30 +++++++------------
|
|
2 files changed, 32 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc
|
|
index 1b25469c7f2f5..2e30a18890dab 100644
|
|
--- a/third_party/blink/renderer/core/animation/animation_time_delta.cc
|
|
+++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc
|
|
@@ -7,6 +7,28 @@
|
|
namespace blink {
|
|
|
|
#if !defined(BLINK_ANIMATION_USE_TIME_DELTA)
|
|
+// Comparison operators on AnimationTimeDelta.
|
|
+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs) {
|
|
+ return lhs.InSecondsF() == rhs.InSecondsF();
|
|
+}
|
|
+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs) {
|
|
+ return lhs.InSecondsF() != rhs.InSecondsF();
|
|
+}
|
|
+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs) {
|
|
+ return lhs.InSecondsF() > rhs.InSecondsF();
|
|
+}
|
|
+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs) {
|
|
+ return lhs.InSecondsF() >= rhs.InSecondsF();
|
|
+}
|
|
+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs) {
|
|
+ return lhs.InSecondsF() <= rhs.InSecondsF();
|
|
+}
|
|
+
|
|
std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) {
|
|
return os << time.InSecondsF() << " s";
|
|
}
|
|
diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h
|
|
index 1903c1150d3ec..95d218466d90a 100644
|
|
--- a/third_party/blink/renderer/core/animation/animation_time_delta.h
|
|
+++ b/third_party/blink/renderer/core/animation/animation_time_delta.h
|
|
@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) {
|
|
}
|
|
|
|
// Comparison operators on AnimationTimeDelta.
|
|
-constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
|
|
- const AnimationTimeDelta& rhs) {
|
|
- return lhs.InSecondsF() == rhs.InSecondsF();
|
|
-}
|
|
-constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
|
|
- const AnimationTimeDelta& rhs) {
|
|
- return lhs.InSecondsF() != rhs.InSecondsF();
|
|
-}
|
|
-constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
|
|
- const AnimationTimeDelta& rhs) {
|
|
- return lhs.InSecondsF() > rhs.InSecondsF();
|
|
-}
|
|
-constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
|
|
- const AnimationTimeDelta& rhs) {
|
|
- return lhs.InSecondsF() >= rhs.InSecondsF();
|
|
-}
|
|
-constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
|
|
- const AnimationTimeDelta& rhs) {
|
|
- return lhs.InSecondsF() <= rhs.InSecondsF();
|
|
-}
|
|
+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs);
|
|
+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs);
|
|
+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs);
|
|
+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs);
|
|
+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
|
|
+ const AnimationTimeDelta& rhs);
|
|
|
|
// Defined to allow DCHECK_EQ/etc to work with the class.
|
|
CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time);
|
|
commit cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4
|
|
Author: Maksim Sisov <msisov@igalia.com>
|
|
Date: Fri Sep 7 18:57:42 2018 +0000
|
|
|
|
OmniboxTextView: fix gcc error for structure initialization
|
|
|
|
It looks like there is bug in GCC 6, which cannot go through
|
|
structure initialization normally.
|
|
|
|
Thus, instead of a default initialization of one of the members,
|
|
explicitly initialize it to a default value.
|
|
|
|
Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c
|
|
Reviewed-on: https://chromium-review.googlesource.com/1213181
|
|
Reviewed-by: Scott Violet <sky@chromium.org>
|
|
Commit-Queue: Maksim Sisov <msisov@igalia.com>
|
|
Cr-Commit-Position: refs/heads/master@{#589614}
|
|
|
|
diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
index f0a8083dc930..9021284f166d 100644
|
|
--- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
|
|
@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style,
|
|
style = {part_color, .baseline = gfx::SUPERIOR};
|
|
break;
|
|
case SuggestionAnswer::TextStyle::BOLD:
|
|
- style = {part_color, .weight = gfx::Font::Weight::BOLD};
|
|
+ style = {part_color, .baseline = gfx::NORMAL_BASELINE,
|
|
+ .weight = gfx::Font::Weight::BOLD};
|
|
break;
|
|
case SuggestionAnswer::TextStyle::NORMAL:
|
|
case SuggestionAnswer::TextStyle::NORMAL_DIM:
|