commit 4541c7a780fb0e3c3088859b31f06e9820fddc0f
author Jose Dapena Paz <jdapena@igalia.com> Tue May 30 16:11:24 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 30 16:11:24 2023
tree 0e99f228b658a5e568a76d560a6f8ada0381fd2c
parent cca6dda715f7e17895bf287bc68c579c794286d6

GCC: avoid clash between getter and type FontPalette in blink::ComputedStyle

Add namespace to return type of blink::ComputedStyle::FontPalette to
avoid a clash between type declaration and getter.

Bug: 819294
Change-Id: Ib316232a45728a1e69d69a474245c514c98e2b29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4573688
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: José Dapena Paz <jdapena@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1150618}

third_party/blink/renderer/core/style/computed_style.h

diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h
index 07d900c..abe3832 100644
--- a/third_party/blink/renderer/core/style/computed_style.h
+++ b/third_party/blink/renderer/core/style/computed_style.h
@@ -881,7 +881,7 @@
   }
 
   // font-palette
-  FontPalette* FontPalette() const {
+  blink::FontPalette* FontPalette() const {
     return GetFontDescription().GetFontPalette();
   }