Changeset 236013 in webkit

Timestamp:

Sep 14, 2018, 11:33:44 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Bug 189541 - Build error in FontDescriptionKey::computeHash when compiling FontTaggedSettings and FontCascadeFonts together
​https://bugs.webkit.org/show_bug.cgi?id=189541

Patch by Frederic Wang <​fwang@igalia.com> on 2018-09-14
Reviewed by Alex Christensen.

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().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.h (modified) (1 diff)
• platform/graphics/FontTaggedSettings.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Alex Christensen.
+
+        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-14  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCache.h

@@ -32 +32 @@
 #include "FontDescription.h"
 #include "FontPlatformData.h"
+#include "FontTaggedSettings.h"
 #include "Timer.h"
 #include <array>

trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h

@@ -140 +140 @@
 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