Changeset 191934 in webkit


Ignore:
Timestamp:
Nov 2, 2015 7:52:16 PM (8 years ago)
Author:
mmaxfield@apple.com
Message:

[Cocoa] Support WOFF2
https://bugs.webkit.org/show_bug.cgi?id=150830

Reviewed by Zalan Bujtas.

Source/WebCore:

On platforms which support it, WebKit only needs to recognize WOFF2.

Test: fast/text/woff2.html

  • platform/graphics/mac/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::supportsFormat):

LayoutTests:

  • platform/mac/TestExpectations: Disable the test on Operating Systems which don't support WOFF2.
  • fast/text/resources/ahem.woff2: Added.
  • fast/text/woff2-expected.html: Added.
  • fast/text/woff2.html: Added.
Location:
trunk
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r191931 r191934  
     12015-11-02  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [Cocoa] Support WOFF2
     4        https://bugs.webkit.org/show_bug.cgi?id=150830
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        * platform/mac/TestExpectations: Disable the test on Operating Systems which don't support WOFF2.
     9        * fast/text/resources/ahem.woff2: Added.
     10        * fast/text/woff2-expected.html: Added.
     11        * fast/text/woff2.html: Added.
     12
    1132015-11-02  Nan Wang  <n_wang@apple.com>
    214
  • trunk/LayoutTests/platform/mac/TestExpectations

    r191925 r191934  
    13561356webkit.org/b/150806 imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm [ Pass Failure ]
    13571357webkit.org/b/150823 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
     1358
     1359# WOFF2 is only supported on certain Operating Systems.
     1360webkit.org/b/150830 [ Mavericks Yosemite ElCapitan ] fast/text/woff2.html [ Failure ]
  • trunk/Source/WebCore/ChangeLog

    r191931 r191934  
     12015-11-02  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [Cocoa] Support WOFF2
     4        https://bugs.webkit.org/show_bug.cgi?id=150830
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        On platforms which support it, WebKit only needs to recognize WOFF2.
     9
     10        Test: fast/text/woff2.html
     11
     12        * platform/graphics/mac/FontCustomPlatformData.cpp:
     13        (WebCore::FontCustomPlatformData::supportsFormat):
     14
    1152015-11-02  Nan Wang  <n_wang@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp

    r190192 r191934  
    7474bool FontCustomPlatformData::supportsFormat(const String& format)
    7575{
    76     return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || equalIgnoringCase(format, "woff");
     76    return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype")
     77#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     78        || equalIgnoringCase(format, "woff2")
     79#endif
     80    || equalIgnoringCase(format, "woff");
    7781}
    7882
Note: See TracChangeset for help on using the changeset viewer.