Changeset 190402 in webkit


Ignore:
Timestamp:
Oct 1, 2015 5:35:38 AM (9 years ago)
Author:
Csaba Osztrogonác
Message:

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):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r190401 r190402  
     12015-10-01  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Fix the ARM build after r190192
     4        https://bugs.webkit.org/show_bug.cgi?id=149620
     5
     6        Reviewed by Darin Adler.
     7
     8        * platform/graphics/FontFeatureSettings.h:
     9        (WebCore::fontFeatureTag):
     10
    1112015-10-01  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    212

  • trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h

    r190192 r190402  
    4646};
    4747
     48#define _0xFF static_cast<char>(0xFF)
    4849struct FontFeatureTagHashTraits : WTF::GenericHashTraits<FontFeatureTag> {
    4950    static const bool emptyValueIsZero = true;
    50     static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ -1, -1, -1, -1 }}); }
    51     static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ -1, -1, -1, -1 }}); }
     51    static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
     52    static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
    5253};
     54#undef _0xFF
    5355
    5456class FontFeature {
Note: See TracChangeset for help on using the changeset viewer.