From b0b223cbe9740a6b2de8df03c80b44775228400e Mon Sep 17 00:00:00 2001 From: "3su6n15k.default@developer.gserviceaccount.com" <3su6n15k.default@developer.gserviceaccount.com> Date: Sun, 15 Mar 2020 08:17:37 +0000 Subject: [PATCH 1/2] Automated Commit: LKGM 12976.0.0 for chromeos. CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-betty-pi-arc-chrome CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-eve-compile-chrome CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-kevin-compile-chrome BUG=762641 TBR=chrome-os-gardeners@google.com Change-Id: Ibeab6f65af9e3a216ddd5eed7cba18b2b1c1bff5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2104097 Reviewed-by: ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Commit-Queue: ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#750425} --- chromeos/CHROMEOS_LKGM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 6870544dad5804..fc244d97914080 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM @@ -1 +1 @@ -12975.0.0 \ No newline at end of file +12976.0.0 \ No newline at end of file From 8465a21309d7285c317bdecb744cd148390af9b1 Mon Sep 17 00:00:00 2001 From: Koji Ishii Date: Sun, 15 Mar 2020 09:55:47 +0000 Subject: [PATCH 2/2] Add missing `const` to |TextPaintStyle| This patch has no behavior changes. TBR=wangxianzhu@chromium.org, yosin@chromium.org Bug: 1025341 Change-Id: I254f3dbe4624b9f6bc7f0c5af870e7e4f60d754c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103828 Reviewed-by: Koji Ishii Commit-Queue: Koji Ishii Cr-Commit-Position: refs/heads/master@{#750426} --- third_party/blink/renderer/core/paint/text_paint_style.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/third_party/blink/renderer/core/paint/text_paint_style.h b/third_party/blink/renderer/core/paint/text_paint_style.h index e5411fdebd5c5b..e184e7338cead2 100644 --- a/third_party/blink/renderer/core/paint/text_paint_style.h +++ b/third_party/blink/renderer/core/paint/text_paint_style.h @@ -24,14 +24,16 @@ struct CORE_EXPORT TextPaintStyle { float stroke_width; const ShadowList* shadow; - bool operator==(const TextPaintStyle& other) { + bool operator==(const TextPaintStyle& other) const { return current_color == other.current_color && fill_color == other.fill_color && stroke_color == other.stroke_color && emphasis_mark_color == other.emphasis_mark_color && stroke_width == other.stroke_width && shadow == other.shadow; } - bool operator!=(const TextPaintStyle& other) { return !(*this == other); } + bool operator!=(const TextPaintStyle& other) const { + return !(*this == other); + } }; } // namespace blink