Attachment 373163 Details for Bug 199199 – Patch

[patch] Patch

bug-199199-20190628164254.patch (text/plain), 21.10 KB, created by Brent Fulgham on 2019-06-28 16:42:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2019-06-28 16:42:56 PDT

Size: 21.10 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 246891)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2019-06-28  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [FTW] Build WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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:
>+
> 2019-06-27  Don Olmstead  <don.olmstead@sony.com>
> 
>         [FTW] Build JavaScriptCore
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246929)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,27 @@
>+2019-06-28  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [FTW] Build WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make some minor corrections needed to get FTW WebCore to build and link.
>+
>+        * PlatformFTW.cmake: Added.
>+        * PlatformWin.cmake: Refer to the new PlatformFTW.cmake file.
>+        * 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):
>+
> 2019-06-28  Konstantin Tokarev  <annulen@yandex.ru>
> 
>         Remove traces of ENABLE_ICONDATABASE remaining after its removal in 219733
>Index: Source/WebCore/PlatformFTW.cmake
>===================================================================
>--- Source/WebCore/PlatformFTW.cmake	(nonexistent)
>+++ Source/WebCore/PlatformFTW.cmake	(working copy)
>@@ -0,0 +1,68 @@
>+include(platform/Curl.cmake)
>+include(platform/ImageDecoders.cmake)
>+# FIXME: Enable
>+# include(platform/TextureMapper.cmake)
>+
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${DirectX_INCLUDE_DIRS}"
>+    "${WEBKIT_LIBRARIES_DIR}/include"
>+    "${WEBCORE_DIR}/accessibility/win"
>+    "${WEBCORE_DIR}/page/win"
>+    "${WEBCORE_DIR}/platform/graphics/egl"
>+    "${WEBCORE_DIR}/platform/graphics/opengl"
>+    "${WEBCORE_DIR}/platform/graphics/opentype"
>+    "${WEBCORE_DIR}/platform/graphics/win"
>+    "${WEBCORE_DIR}/platform/mediacapabilities"
>+    "${WEBCORE_DIR}/platform/network/win"
>+    "${WEBCORE_DIR}/platform/win")
>+
>+list(APPEND WebCore_SOURCES
>+    page/win/FrameWinDirect2D.cpp
>+
>+    platform/graphics/win/FontCascadeDirect2D.cpp
>+    platform/graphics/win/FontCustomPlatformData.cpp
>+    platform/graphics/win/FontPlatformDataDirect2D.cpp
>+    platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp
>+    platform/graphics/win/GradientDirect2D.cpp
>+    platform/graphics/win/GraphicsContextDirect2D.cpp
>+    platform/graphics/win/GraphicsLayerDirect2D.cpp
>+    platform/graphics/win/ImageBufferDataDirect2D.cpp
>+    platform/graphics/win/ImageBufferDirect2D.cpp
>+    platform/graphics/win/ImageDecoderDirect2D.cpp
>+    platform/graphics/win/ImageDirect2D.cpp
>+    platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp
>+    platform/graphics/win/NativeImageDirect2D.cpp
>+    platform/graphics/win/PathDirect2D.cpp
>+    platform/graphics/win/PatternDirect2D.cpp
>+    platform/graphics/win/SimpleFontDataDirect2D.cpp
>+    platform/graphics/win/TextAnalyzerHelper.cpp
>+
>+    platform/network/win/CurlSSLHandleWin.cpp
>+
>+    platform/text/win/LocaleWin.cpp
>+
>+    platform/win/DelayLoadedModulesEnumerator.cpp
>+    platform/win/DragImageDirect2D.cpp
>+    platform/win/ImportedFunctionsEnumerator.cpp
>+    platform/win/ImportedModulesEnumerator.cpp
>+    platform/win/PEImage.cpp
>+)
>+
>+list(APPEND WebCore_LIBRARIES
>+    ${DirectX_LIBRARIES}
>+    comctl32
>+    crypt32
>+    iphlpapi
>+    rpcrt4
>+    shlwapi
>+    usp10
>+    version
>+    winmm
>+    ws2_32
>+)
>+
>+list(APPEND WebCoreTestSupport_LIBRARIES
>+    shlwapi
>+)
>+
>+set(WebCore_OUTPUT_NAME WebCore${DEBUG_SUFFIX})
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246929)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-28  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [FTW] Build WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/PlatformFTW.cmake: Added.
>+
> 2019-06-28  Konstantin Tokarev  <annulen@yandex.ru>
> 
>         Remove traces of ENABLE_ICONDATABASE remaining after its removal in 219733
>Index: Source/WebCore/PAL/pal/PlatformFTW.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformFTW.cmake	(nonexistent)
>+++ Source/WebCore/PAL/pal/PlatformFTW.cmake	(working copy)
>@@ -0,0 +1,12 @@
>+list(APPEND PAL_PUBLIC_HEADERS
>+)
>+
>+list(APPEND PAL_SOURCES
>+    crypto/openssl/CryptoDigestOpenSSL.cpp
>+
>+    crypto/win/CryptoDigestWin.cpp
>+)
>+
>+list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBKIT_LIBRARIES_DIR}/include"
>+)
>Index: Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp	(revision 246891)
>+++ Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp	(working copy)
>@@ -53,7 +53,7 @@ bool GlyphPage::fill(UChar* buffer, unsi
>     RELEASE_ASSERT(localeLength <= LOCALE_NAME_MAX_LENGTH);
>     localeName[localeLength] = '\0';
> 
>-    TextAnalyzerHelper helper(localeName, buffer, bufferLength);
>+    TextAnalyzerHelper helper(reinterpret_cast<LPWSTR>(&localeName), reinterpret_cast<LPWSTR>(buffer), bufferLength);
> 
>     hr = analyzer->AnalyzeScript(&helper, 0, bufferLength, &helper);
>     RELEASE_ASSERT(SUCCEEDED(hr));
>@@ -64,7 +64,7 @@ bool GlyphPage::fill(UChar* buffer, unsi
>     Vector<DWRITE_SHAPING_TEXT_PROPERTIES> textProperties(GlyphPage::size);
>     Vector<DWRITE_SHAPING_GLYPH_PROPERTIES> glyphProperties(GlyphPage::size);
> 
>-    hr = analyzer->GetGlyphs(buffer, bufferLength, fontPlatformData.dwFontFace(), fontPlatformData.orientation() == FontOrientation::Vertical, false,
>+    hr = analyzer->GetGlyphs(reinterpret_cast<LPCWSTR>(buffer), bufferLength, fontPlatformData.dwFontFace(), fontPlatformData.orientation() == FontOrientation::Vertical, false,
>         &helper.m_analysis, nullptr, nullptr, nullptr, nullptr, 0, GlyphPage::size, clusterMap, textProperties.data(),
>         localGlyphBuffer, glyphProperties.data(), &returnedCount);
>     if (!SUCCEEDED(hr))
>Index: Source/WebCore/platform/graphics/win/GraphicsContextDirect2D.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/win/GraphicsContextDirect2D.cpp	(revision 246891)
>+++ Source/WebCore/platform/graphics/win/GraphicsContextDirect2D.cpp	(working copy)
>@@ -1738,10 +1738,6 @@ void GraphicsContext::setURLForRect(cons
>         return; // FIXME for display lists.
>     }
> 
>-    RetainPtr<CFURLRef> urlRef = link.createCFURL();
>-    if (!urlRef)
>-        return;
>-
>     notImplemented();
> }
> 
>Index: Source/WebCore/platform/graphics/win/PatternDirect2D.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/win/PatternDirect2D.cpp	(revision 246891)
>+++ Source/WebCore/platform/graphics/win/PatternDirect2D.cpp	(working copy)
>@@ -30,7 +30,6 @@
> 
> #include "AffineTransform.h"
> #include "GraphicsContext.h"
>-#include <CoreGraphics/CoreGraphics.h>
> #include <d2d1.h>
> #include <wtf/MainThread.h>
> 
>Index: Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp	(revision 246891)
>+++ Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp	(working copy)
>@@ -38,7 +38,6 @@
> #include <comutil.h>
> #include <dwrite.h>
> #include <mlang.h>
>-#include <pal/spi/win/CoreTextSPIWin.h>
> #include <unicode/uchar.h>
> #include <unicode/unorm.h>
> #include <winsock2.h>
>Index: Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp
>===================================================================
>--- Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp	(revision 246891)
>+++ Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp	(working copy)
>@@ -27,6 +27,7 @@
> #include "GIFImageDecoder.h"
> #include "ICOImageDecoder.h"
> #include "JPEGImageDecoder.h"
>+#include "NotImplemented.h"
> #include "PNGImageDecoder.h"
> #include "SharedBuffer.h"
> #if USE(OPENJPEG)
>@@ -306,4 +307,11 @@ int ScalableImageDecoder::scaledY(int or
>     return getScaledValue<Exact>(m_scaledRows, origY, searchStart);
> }
> 
>+#if USE(DIRECT2D)
>+void ScalableImageDecoder::setTargetContext(ID2D1RenderTarget*)
>+{
>+    notImplemented();
>+}
>+#endif
>+
> }
>Index: Source/WebCore/platform/image-decoders/ScalableImageDecoder.h
>===================================================================
>--- Source/WebCore/platform/image-decoders/ScalableImageDecoder.h	(revision 246891)
>+++ Source/WebCore/platform/image-decoders/ScalableImageDecoder.h	(working copy)
>@@ -217,6 +217,10 @@ protected:
> private:
>     virtual void tryDecodeSize(bool) = 0;
> 
>+#if USE(DIRECT2D)
>+    void setTargetContext(ID2D1RenderTarget*) override;
>+#endif
>+
>     IntSize m_size;
>     EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::TypeAvailable };
>     bool m_decodingSizeFromSetData { false };
>Index: Source/WebCore/platform/network/curl/CookieJarDB.cpp
>===================================================================
>--- Source/WebCore/platform/network/curl/CookieJarDB.cpp	(revision 246891)
>+++ Source/WebCore/platform/network/curl/CookieJarDB.cpp	(working copy)
>@@ -27,6 +27,7 @@
> 
> #include "CookieUtil.h"
> #include "Logging.h"
>+#include "PublicSuffix.h"
> #include "RegistrableDomain.h"
> #include "SQLiteFileSystem.h"
> #include <wtf/FileSystem.h>
>@@ -337,8 +338,10 @@ bool CookieJarDB::hasCookies(const URL&
>     if (host.isEmpty())
>         return false;
> 
>+#if ENABLE(PUBLIC_SUFFIX_LIST)
>     if (isPublicSuffix(host))
>         return false;
>+#endif
> 
>     RegistrableDomain registrableDomain { url };
>     auto& statement = preparedStatement(CHECK_EXISTS_COOKIE_SQL);
>@@ -455,8 +458,10 @@ bool CookieJarDB::hasHttpOnlyCookie(cons
> 
> bool CookieJarDB::canAcceptCookie(const Cookie& cookie, const URL& firstParty, const URL& url, CookieJarDB::Source source)
> {
>+#if ENABLE(PUBLIC_SUFFIX_LIST)
>     if (isPublicSuffix(cookie.domain))
>         return false;
>+#endif
> 
>     bool fromJavaScript = source == CookieJarDB::Source::Script;
>     if (fromJavaScript && (cookie.httpOnly || hasHttpOnlyCookie(cookie.name, cookie.domain, cookie.path)))
>Index: Source/cmake/OptionsFTW.cmake
>===================================================================
>--- Source/cmake/OptionsFTW.cmake	(revision 246891)
>+++ Source/cmake/OptionsFTW.cmake	(working copy)
>@@ -51,7 +51,139 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEA
> 
> WEBKIT_OPTION_BEGIN()
> 
>-# Enabled features
>+# Features in the same state on WinCairo and AppleWin
>+
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CACHE_PARTITIONING PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_CONIC_GRADIENTS PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_JIT_PERMISSIONS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FETCH_API PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_CODE_ATTRIBUTE PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_KEY_ATTRIBUTE PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_GESTURE_EVENTS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ORIENTATION_EVENTS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESIZE_OBSERVER PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_UNIFIED_BUILDS PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY_STREAMING_API PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PRIVATE ON)
>+
>+# Media things that should be on
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE OFF)
>+
>+# Payment things
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V3 PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V4 PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAYMENT_REQUEST PRIVATE OFF)
>+
>+# WebGL
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE OFF)
>+
>+# Off for now, but should be on
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_FILTERING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_INTERACTION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVER_PRECONNECT PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUTHN PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE OFF)
>+
>+#WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_VERSION_STAMPER PRIVATE ON)
> 
> # Experimental features
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>@@ -70,8 +202,28 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYS
> 
> WEBKIT_OPTION_END()
> 
>+find_package(CURL 7.60.0 REQUIRED)
> find_package(ICU REQUIRED COMPONENTS data i18n uc)
>+find_package(JPEG 1.5.2 REQUIRED)
>+find_package(LibXml2 2.9.7 REQUIRED)
>+find_package(OpenSSL 2.0.0 REQUIRED)
>+find_package(PNG 1.6.34 REQUIRED)
>+find_package(Sqlite 3.23.1 REQUIRED)
>+find_package(ZLIB 1.2.11 REQUIRED)
>+find_package(LibPSL 0.20.2 REQUIRED)
>+
>+# FIXME: We should add the following, too.
>+# find_package(WebP 1.0.0)
>+# if (WEBP_FOUND)
>+#     SET_AND_EXPOSE_TO_BUILD(USE_WEBP ON)
>+# endif ()
>+
>+if (ENABLE_XSLT)
>+    find_package(LibXslt 1.1.32 REQUIRED)
>+endif ()
> 
>+SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
> SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
> SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ${ENABLE_REMOTE_INSPECTOR})
> 
>@@ -79,7 +231,7 @@ set(WTF_LIBRARY_TYPE SHARED)
> set(JavaScriptCore_LIBRARY_TYPE SHARED)
> 
> set(ENABLE_API_TESTS OFF)
>-set(ENABLE_WEBCORE OFF)
>+set(ENABLE_WEBCORE ON)
> set(ENABLE_WEBKIT OFF)
> set(ENABLE_WEBKIT_LEGACY OFF)
>

Flags:

don.olmstead: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199199: 372866 | 372869 | 372871 | 373144 | 373145 | 373162 | 373163