Title: [193586] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193586
- Author
- ddkil...@apple.com
- Date
- 2015-12-06 13:21:01 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r190402. rdar://problem/23769689
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193585 => 193586)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 21:20:58 UTC (rev 193585)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 21:21:01 UTC (rev 193586)
@@ -1,5 +1,19 @@
2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190402. rdar://problem/23769689
+
+ 2015-10-01 Csaba Osztrogonác <o...@webkit.org>
+
+ Fix the ARM build after r190192
+ https://bugs.webkit.org/show_bug.cgi?id=149620
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/FontFeatureSettings.h:
+ (WebCore::fontFeatureTag):
+
+2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r193575. rdar://problem/23769689
2015-09-23 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h (193585 => 193586)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-12-06 21:20:58 UTC (rev 193585)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-12-06 21:21:01 UTC (rev 193586)
@@ -45,11 +45,13 @@
static const bool safeToCompareToEmptyOrDeleted = true;
};
+#define _0xFF static_cast<char>(0xFF)
struct FontFeatureTagHashTraits : WTF::GenericHashTraits<FontFeatureTag> {
static const bool emptyValueIsZero = true;
- static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ -1, -1, -1, -1 }}); }
- static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ -1, -1, -1, -1 }}); }
+ static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
+ static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
};
+#undef _0xFF
class FontFeature {
public:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
