Attachment 349758 Details for Bug 189541 – Patch (declare fully specialized functions in FontTaggedSetting.h)

[patch] Patch (declare fully specialized functions in FontTaggedSetting.h)

189541.patch (text/plain), 2.51 KB, created by Frédéric Wang (:fredw) on 2018-09-14 07:36:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-09-14 07:36:07 PDT

Size: 2.51 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 11cfad13cfc..3b831445309 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-14  Frederic Wang  <fwang@igalia.com>
>+
>+        Bug 189541 - Build error in FontDescriptionKey::computeHash when compiling FontTaggedSettings and FontCascadeFonts together
>+        https://bugs.webkit.org/show_bug.cgi?id=189541
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        FontDescriptionKey::computeHash() from In FontCache.h requires implicit instantiation of the
>+        FontTaggedSettings::hash() template function. This instantiation may happen before
>+        FontTaggedSettings::hash() is actually fully specialized in FontTaggedSettings.cpp. To avoid
>+        compiler errors when FontCache.h and FontTaggedSettings.cpp are in the same translation unit,
>+        we declare full specialization of the hash() functions in FontTaggedSettings.h.
>+
>+        No new tests, behavior unchanged.
>+
>+        * platform/graphics/FontCache.h: Explicitly include FontTaggedSettings to avoid possible future breakage.
>+        * platform/graphics/FontTaggedSettings.h: Declare full specialization of FontTaggedSettings::hash().
>+
> 2018-09-13  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Capturing event listeners are called during bubbling phase for shadow hosts
>diff --git a/Source/WebCore/platform/graphics/FontCache.h b/Source/WebCore/platform/graphics/FontCache.h
>index 8564db9c1e0..e95d2daeaab 100644
>--- a/Source/WebCore/platform/graphics/FontCache.h
>+++ b/Source/WebCore/platform/graphics/FontCache.h
>@@ -31,6 +31,7 @@
> 
> #include "FontDescription.h"
> #include "FontPlatformData.h"
>+#include "FontTaggedSettings.h"
> #include "Timer.h"
> #include <array>
> #include <limits.h>
>diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.h b/Source/WebCore/platform/graphics/FontTaggedSettings.h
>index 23ca2eec038..b57457e3fd1 100644
>--- a/Source/WebCore/platform/graphics/FontTaggedSettings.h
>+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.h
>@@ -139,11 +139,15 @@ void FontTaggedSettings<T>::insert(FontTaggedSetting<T>&& feature)
> typedef FontTaggedSetting<int> FontFeature;
> typedef FontTaggedSettings<int> FontFeatureSettings;
> 
>+template <> unsigned FontFeatureSettings::hash() const;
>+
> #if ENABLE(VARIATION_FONTS)
> 
> typedef FontTaggedSettings<float> FontVariationSettings;
> WTF::TextStream& operator<<(WTF::TextStream&, const FontVariationSettings&);
> 
>+template <> unsigned FontVariationSettings::hash() const;
>+
> #else
> 
> struct FontVariationSettings {

Actions: View | Formatted Diff | Diff

Attachments on bug 189541: 349537 | 349566 | 349651 | 349755 | 349758