Diff
Modified: trunk/ChangeLog (284305 => 284306)
--- trunk/ChangeLog 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/ChangeLog 2021-10-16 05:31:25 UTC (rev 284306)
@@ -1,3 +1,15 @@
+2021-10-15 Basuke Suzuki <basuke.suz...@sony.com>
+
+ Add flag to turn off Iso heap
+ https://bugs.webkit.org/show_bug.cgi?id=231823
+
+ Reviewed by Yusuke Suzuki.
+
+ Added USE_ISO_MALLOC feature flags which is on by default for most platforms.
+
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
Realize Mac CMake build of WebCore and WebKit
Modified: trunk/Source/WTF/ChangeLog (284305 => 284306)
--- trunk/Source/WTF/ChangeLog 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/WTF/ChangeLog 2021-10-16 05:31:25 UTC (rev 284306)
@@ -1,3 +1,16 @@
+2021-10-15 Basuke Suzuki <basuke.suz...@sony.com>
+
+ Add flag to turn off Iso heap
+ https://bugs.webkit.org/show_bug.cgi?id=231823
+
+ Reviewed by Yusuke Suzuki.
+
+ If this flag is off, then all allocations are replaced with FastMalloc.
+
+ * wtf/IsoMalloc.h:
+ * wtf/IsoMallocInlines.h:
+ * wtf/PlatformUse.h:
+
2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
Realize Mac CMake build of WebCore and WebKit
Modified: trunk/Source/WTF/wtf/IsoMalloc.h (284305 => 284306)
--- trunk/Source/WTF/wtf/IsoMalloc.h 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/WTF/wtf/IsoMalloc.h 2021-10-16 05:31:25 UTC (rev 284306)
@@ -26,8 +26,9 @@
#pragma once
#include <wtf/ForbidHeapAllocation.h>
+#include <wtf/Platform.h>
-#if (USE(SYSTEM_MALLOC))
+#if USE(SYSTEM_MALLOC) || !USE(ISO_MALLOC)
#include <wtf/FastMalloc.h>
Modified: trunk/Source/WTF/wtf/IsoMallocInlines.h (284305 => 284306)
--- trunk/Source/WTF/wtf/IsoMallocInlines.h 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/WTF/wtf/IsoMallocInlines.h 2021-10-16 05:31:25 UTC (rev 284306)
@@ -25,8 +25,10 @@
#pragma once
-#if (USE(SYSTEM_MALLOC))
+#include <wtf/Platform.h>
+#if USE(SYSTEM_MALLOC) || !USE(ISO_MALLOC)
+
#include <wtf/FastMalloc.h>
#define WTF_MAKE_ISO_ALLOCATED_INLINE(name) WTF_MAKE_FAST_ALLOCATED
Modified: trunk/Source/WTF/wtf/PlatformUse.h (284305 => 284306)
--- trunk/Source/WTF/wtf/PlatformUse.h 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2021-10-16 05:31:25 UTC (rev 284306)
@@ -355,3 +355,7 @@
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
#define USE_VORBIS_AUDIOCOMPONENT_WORKAROUND 1
#endif
+
+#if !defined(USE_ISO_MALLOC)
+#define USE_ISO_MALLOC 1
+#endif
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (284305 => 284306)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2021-10-16 05:31:25 UTC (rev 284306)
@@ -36,6 +36,9 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DFG_JIT PRIVATE OFF)
+# Don't use IsoMalloc
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_ISO_MALLOC PRIVATE OFF)
+
# Enabled features
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (284305 => 284306)
--- trunk/Source/cmake/WebKitFeatures.cmake 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2021-10-16 05:31:25 UTC (rev 284306)
@@ -235,6 +235,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_WEBXR "Toggle WebXR support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WIRELESS_PLAYBACK_TARGET "Toggle wireless playback target support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
+ WEBKIT_OPTION_DEFINE(USE_ISO_MALLOC "Toggle IsoMalloc support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE ${USE_SYSTEM_MALLOC_DEFAULT})
WEBKIT_OPTION_CONFLICT(ENABLE_JIT ENABLE_C_LOOP)
Modified: trunk/Tools/ChangeLog (284305 => 284306)
--- trunk/Tools/ChangeLog 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Tools/ChangeLog 2021-10-16 05:31:25 UTC (rev 284306)
@@ -1,3 +1,14 @@
+2021-10-15 Basuke Suzuki <basuke.suz...@sony.com>
+
+ Add flag to turn off Iso heap
+ https://bugs.webkit.org/show_bug.cgi?id=231823
+
+ Reviewed by Yusuke Suzuki.
+
+ Added --(no-)iso-malloc feature flag for cmake build.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2021-10-15 Alex Christensen <achristen...@webkit.org>
Start using adattributiond on iOS
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (284305 => 284306)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2021-10-16 04:38:16 UTC (rev 284305)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2021-10-16 05:31:25 UTC (rev 284306)
@@ -152,6 +152,7 @@
$spellcheckSupport,
$streamsAPISupport,
$svgFontsSupport,
+ $isoMallocSupport,
$systemMallocSupport,
$telephoneNumberDetectionSupport,
$textAutosizingSupport,
@@ -560,6 +561,9 @@
{ option => "gstreamer-gl", desc => "Toggle GStreamer GL support",
define => "USE_GSTREAMER_GL", value => \$gstreamerGLSupport },
+ { option => "iso-malloc", desc => "Toggle IsoMalloc support",
+ define => "USE_ISO_MALLOC", value => \$isoMallocSupport },
+
{ option => "system-malloc", desc => "Toggle system allocator instead of bmalloc",
define => "USE_SYSTEM_MALLOC", value => \$systemMallocSupport },
);
