Changeset 247014 in webkit


Ignore:
Timestamp:
Jul 1, 2019 12:32:31 PM (5 years ago)
Author:
Brent Fulgham
Message:

[FTW] Build WebCore
​https://bugs.webkit.org/show_bug.cgi?id=199199

Reviewed by Don Olmstead.

.:

Establish a set of build options for the FTW port, based on the current WinCairo
feature set. I also note which features should be turned on, but aren't yet, as
well as which features are disabled due to lack of WebGL and Media support in
the current build.

  • Source/cmake/OptionsFTW.cmake:

Source/WebCore:

Make some minor corrections needed to get FTW WebCore to build and link.

  • PlatformFTW.cmake: Added.
  • platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp:

(WebCore::GlyphPage::fill):

  • platform/graphics/win/GraphicsContextDirect2D.cpp:

(WebCore::GraphicsContext::setURLForRect):

  • platform/graphics/win/PatternDirect2D.cpp:
  • platform/graphics/win/SimpleFontDataDirect2D.cpp:
  • platform/image-decoders/ScalableImageDecoder.cpp:

(WebCore::ScalableImageDecoder::setTargetContext): Added stub.

  • platform/image-decoders/ScalableImageDecoder.h:
  • platform/network/curl/CookieJarDB.cpp:

(WebCore::CookieJarDB::hasCookies):
(WebCore::CookieJarDB::canAcceptCookie):

Source/WebCore/PAL:

  • pal/PlatformFTW.cmake: Added.
Location:
trunk
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r246925 r247014  
     12019-06-28  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Build WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=199199
     5
     6        Reviewed by Don Olmstead.
     7
     8        Establish a set of build options for the FTW port, based on the current WinCairo
     9        feature set. I also note which features should be turned on, but aren't yet, as
     10        well as which features are disabled due to lack of WebGL and Media support in
     11        the current build.
     12
     13        * Source/cmake/OptionsFTW.cmake:
     14
    1152019-06-28  Konstantin Tokarev  <annulen@yandex.ru>
    216

  • trunk/Source/WebCore/ChangeLog

    r247013 r247014  
     12019-06-28  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Build WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=199199
     5
     6        Reviewed by Don Olmstead.
     7
     8        Make some minor corrections needed to get FTW WebCore to build and link.
     9
     10        * PlatformFTW.cmake: Added.
     11        * platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp:
     12        (WebCore::GlyphPage::fill):
     13        * platform/graphics/win/GraphicsContextDirect2D.cpp:
     14        (WebCore::GraphicsContext::setURLForRect):
     15        * platform/graphics/win/PatternDirect2D.cpp:
     16        * platform/graphics/win/SimpleFontDataDirect2D.cpp:
     17        * platform/image-decoders/ScalableImageDecoder.cpp:
     18        (WebCore::ScalableImageDecoder::setTargetContext): Added stub.
     19        * platform/image-decoders/ScalableImageDecoder.h:
     20        * platform/network/curl/CookieJarDB.cpp:
     21        (WebCore::CookieJarDB::hasCookies):
     22        (WebCore::CookieJarDB::canAcceptCookie):
     23
    1242019-07-01  Wenson Hsieh  <wenson_hsieh@apple.com>
    225

  • trunk/Source/WebCore/PAL/ChangeLog

    r246925 r247014  
     12019-06-28  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Build WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=199199
     5
     6        Reviewed by Don Olmstead.
     7
     8        * pal/PlatformFTW.cmake: Added.
     9
    1102019-06-28  Konstantin Tokarev  <annulen@yandex.ru>
    211

  • trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp

    r233851 r247014  
    5454    localeName[localeLength] = '\0';
    5555
    56     TextAnalyzerHelper helper(localeName, buffer, bufferLength);
     56    TextAnalyzerHelper helper(reinterpret_cast<LPWSTR>(&localeName), reinterpret_cast<LPWSTR>(buffer), bufferLength);
    5757
    5858    hr = analyzer->AnalyzeScript(&helper, 0, bufferLength, &helper);
    … …  
    6565    Vector<DWRITE_SHAPING_GLYPH_PROPERTIES> glyphProperties(GlyphPage::size);
    6666
    67     hr = analyzer->GetGlyphs(buffer, bufferLength, fontPlatformData.dwFontFace(), fontPlatformData.orientation() == FontOrientation::Vertical, false,
     67    hr = analyzer->GetGlyphs(reinterpret_cast<LPCWSTR>(buffer), bufferLength, fontPlatformData.dwFontFace(), fontPlatformData.orientation() == FontOrientation::Vertical, false,
    6868        &helper.m_analysis, nullptr, nullptr, nullptr, nullptr, 0, GlyphPage::size, clusterMap, textProperties.data(),
    6969        localGlyphBuffer, glyphProperties.data(), &returnedCount);

  • trunk/Source/WebCore/platform/graphics/win/GraphicsContextDirect2D.cpp

    r239549 r247014  
    17391739    }
    17401740
    1741     RetainPtr<CFURLRef> urlRef = link.createCFURL();
    1742     if (!urlRef)
    1743         return;
    1744 
    17451741    notImplemented();
    17461742}

  • trunk/Source/WebCore/platform/graphics/win/PatternDirect2D.cpp

    r237394 r247014  
    3131#include "AffineTransform.h"
    3232#include "GraphicsContext.h"
    33 #include <CoreGraphics/CoreGraphics.h>
    3433#include <d2d1.h>
    3534#include <wtf/MainThread.h>

  • trunk/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp

    r237977 r247014  
    3939#include <dwrite.h>
    4040#include <mlang.h>
    41 #include <pal/spi/win/CoreTextSPIWin.h>
    4241#include <unicode/uchar.h>
    4342#include <unicode/unorm.h>

  • trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp

    r244372 r247014  
    2828#include "ICOImageDecoder.h"
    2929#include "JPEGImageDecoder.h"
     30#include "NotImplemented.h"
    3031#include "PNGImageDecoder.h"
    3132#include "SharedBuffer.h"
    … …  
    307308}
    308309
    309 }
     310#if USE(DIRECT2D)
     311void ScalableImageDecoder::setTargetContext(ID2D1RenderTarget*)
     312{
     313    notImplemented();
     314}
     315#endif
     316
     317}

  • trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.h

    r239427 r247014  
    218218    virtual void tryDecodeSize(bool) = 0;
    219219
     220#if USE(DIRECT2D)
     221    void setTargetContext(ID2D1RenderTarget*) override;
     222#endif
     223
    220224    IntSize m_size;
    221225    EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::TypeAvailable };

  • trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp

    r242776 r247014  
    2828#include "CookieUtil.h"
    2929#include "Logging.h"
     30#include "PublicSuffix.h"
    3031#include "RegistrableDomain.h"
    3132#include "SQLiteFileSystem.h"
    … …  
    338339        return false;
    339340
     341#if ENABLE(PUBLIC_SUFFIX_LIST)
    340342    if (isPublicSuffix(host))
    341343        return false;
     344#endif
    342345
    343346    RegistrableDomain registrableDomain { url };
    … …  
    456459bool CookieJarDB::canAcceptCookie(const Cookie& cookie, const URL& firstParty, const URL& url, CookieJarDB::Source source)
    457460{
     461#if ENABLE(PUBLIC_SUFFIX_LIST)
    458462    if (isPublicSuffix(cookie.domain))
    459463        return false;
     464#endif
    460465
    461466    bool fromJavaScript = source == CookieJarDB::Source::Script;

  • trunk/Source/cmake/OptionsFTW.cmake

    r246884 r247014  
    5252WEBKIT_OPTION_BEGIN()
    5353
    54 # Enabled features
     54# Features in the same state on WinCairo and AppleWin
     55
     56WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE OFF)
     57WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
     58WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CACHE_PARTITIONING PRIVATE ON)
     59WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PRIVATE ON)
     60WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
     61WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PRIVATE ON)
     62WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_CONIC_GRADIENTS PRIVATE ON)
     63WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PRIVATE OFF)
     64WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
     65WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
     66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ON)
     67WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
     68WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
     69WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
     70WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
     71WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_JIT_PERMISSIONS PRIVATE OFF)
     72WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FETCH_API PRIVATE ON)
     73WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
     74WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
     75WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE ON)
     76WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
     77WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
     78WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PRIVATE ON)
     79WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
     80WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
     81WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_CODE_ATTRIBUTE PRIVATE ON)
     82WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_KEY_ATTRIBUTE PRIVATE ON)
     83WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)
     84WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER PRIVATE ON)
     85WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_GESTURE_EVENTS PRIVATE OFF)
     86WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE ON)
     87WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE ON)
     88WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE OFF)
     89WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PRIVATE ON)
     90WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
     91WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
     92WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ORIENTATION_EVENTS PRIVATE OFF)
     93WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
     94WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PRIVATE OFF)
     95WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESIZE_OBSERVER PRIVATE ON)
     96WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
     97WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PRIVATE OFF)
     98WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PRIVATE OFF)
     99WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PRIVATE ON)
     100WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
     101WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
     102WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER PRIVATE OFF)
     103WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_UNIFIED_BUILDS PRIVATE ON)
     104WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
     105WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY_STREAMING_API PRIVATE OFF)
     106WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX PRIVATE OFF)
     107WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE OFF)
     108WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PRIVATE ON)
     109
     110# Media things that should be on
     111WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE OFF)
     112WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE OFF)
     113WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PRIVATE OFF)
     114WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)
     115WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE OFF)
     116WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE OFF)
     117WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PRIVATE OFF)
     118WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE OFF)
     119WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PRIVATE OFF)
     120WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE OFF)
     121WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE OFF)
     122WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN PRIVATE OFF)
     123WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE OFF)
     124
     125# Payment things
     126WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY PRIVATE OFF)
     127WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V3 PRIVATE OFF)
     128WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V4 PRIVATE OFF)
     129WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAYMENT_REQUEST PRIVATE OFF)
     130
     131# WebGL
     132WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE OFF)
     133WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF)
     134WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE OFF)
     135
     136# Off for now, but should be on
     137WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE OFF)
     138WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
     139WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
     140WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE OFF)
     141WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
     142WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE OFF)
     143WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_FILTERING PRIVATE OFF)
     144WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PRIVATE OFF)
     145WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE OFF)
     146WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE OFF)
     147WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE OFF)
     148WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE PRIVATE OFF)
     149WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
     150WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_INTERACTION PRIVATE OFF)
     151WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
     152WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
     153WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
     154WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PRIVATE OFF)
     155WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE OFF)
     156WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
     157WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE OFF)
     158WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
     159WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE OFF)
     160WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE OFF)
     161WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE OFF)
     162WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE OFF)
     163WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE OFF)
     164WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE OFF)
     165WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE OFF)
     166WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE OFF)
     167WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
     168WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE OFF)
     169WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE OFF)
     170WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVER_PRECONNECT PRIVATE OFF)
     171WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE OFF)
     172WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE OFF)
     173WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE OFF)
     174WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE OFF)
     175WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE OFF)
     176WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE OFF)
     177WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE OFF)
     178WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE OFF)
     179WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE OFF)
     180WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
     181WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PRIVATE OFF)
     182WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE OFF)
     183WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUTHN PRIVATE OFF)
     184WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE OFF)
     185
     186#WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_VERSION_STAMPER PRIVATE ON)
    55187
    56188# Experimental features
    … …  
    71203WEBKIT_OPTION_END()
    72204
     205find_package(CURL 7.60.0 REQUIRED)
    73206find_package(ICU REQUIRED COMPONENTS data i18n uc)
    74 
     207find_package(JPEG 1.5.2 REQUIRED)
     208find_package(LibXml2 2.9.7 REQUIRED)
     209find_package(OpenSSL 2.0.0 REQUIRED)
     210find_package(PNG 1.6.34 REQUIRED)
     211find_package(Sqlite 3.23.1 REQUIRED)
     212find_package(ZLIB 1.2.11 REQUIRED)
     213find_package(LibPSL 0.20.2 REQUIRED)
     214
     215# FIXME: We should add the following, too.
     216# find_package(WebP 1.0.0)
     217# if (WEBP_FOUND)
     218#     SET_AND_EXPOSE_TO_BUILD(USE_WEBP ON)
     219# endif ()
     220
     221if (ENABLE_XSLT)
     222    find_package(LibXslt 1.1.32 REQUIRED)
     223endif ()
     224
     225SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
     226SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
    75227SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
    76228SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ${ENABLE_REMOTE_INSPECTOR})
    … …  
    80232
    81233set(ENABLE_API_TESTS OFF)
    82 set(ENABLE_WEBCORE OFF)
     234set(ENABLE_WEBCORE ON)
    83235set(ENABLE_WEBKIT OFF)
    84236set(ENABLE_WEBKIT_LEGACY OFF)
Note: See TracChangeset for help on using the changeset viewer.