Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-05-07 18:48:34 UTC (rev 277191)
@@ -1,3 +1,75 @@
+2021-05-07 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r276575. rdar://problem/77581037
+
+ Make more IndexedDB objects iso-heap'ed
+ https://bugs.webkit.org/show_bug.cgi?id=225029
+
+ Reviewed by Darin Adler.
+
+ Deployed IsoHeap on more IndexedDB objects.
+
+ * Modules/indexeddb/IDBFactory.cpp:
+ * Modules/indexeddb/IDBFactory.h:
+ * Modules/indexeddb/IDBGetAllResult.cpp:
+ * Modules/indexeddb/IDBGetAllResult.h:
+ * Modules/indexeddb/IDBGetResult.cpp:
+ * Modules/indexeddb/IDBGetResult.h:
+ * Modules/indexeddb/IDBIndex.cpp:
+ * Modules/indexeddb/IDBIndex.h:
+ * Modules/indexeddb/IDBKey.cpp:
+ * Modules/indexeddb/IDBKey.h:
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ * Modules/indexeddb/IDBObjectStore.h:
+ * Modules/indexeddb/IDBRecordIdentifier.h: Removed since it's not used anywhere.
+ * Modules/indexeddb/IDBRequest.cpp:
+ * Modules/indexeddb/IDBRequest.h:
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/TransactionOperation.cpp:
+ * Modules/indexeddb/client/TransactionOperation.h:
+ * Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+ * WebCore.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-25 Ryosuke Niwa <rn...@webkit.org>
+
+ Make more IndexedDB objects iso-heap'ed
+ https://bugs.webkit.org/show_bug.cgi?id=225029
+
+ Reviewed by Darin Adler.
+
+ Deployed IsoHeap on more IndexedDB objects.
+
+ * Modules/indexeddb/IDBFactory.cpp:
+ * Modules/indexeddb/IDBFactory.h:
+ * Modules/indexeddb/IDBGetAllResult.cpp:
+ * Modules/indexeddb/IDBGetAllResult.h:
+ * Modules/indexeddb/IDBGetResult.cpp:
+ * Modules/indexeddb/IDBGetResult.h:
+ * Modules/indexeddb/IDBIndex.cpp:
+ * Modules/indexeddb/IDBIndex.h:
+ * Modules/indexeddb/IDBKey.cpp:
+ * Modules/indexeddb/IDBKey.h:
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ * Modules/indexeddb/IDBObjectStore.h:
+ * Modules/indexeddb/IDBRecordIdentifier.h: Removed since it's not used anywhere.
+ * Modules/indexeddb/IDBRequest.cpp:
+ * Modules/indexeddb/IDBRequest.h:
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/TransactionOperation.cpp:
+ * Modules/indexeddb/client/TransactionOperation.h:
+ * Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+ * WebCore.xcodeproj/project.pbxproj:
+
2021-05-06 Russell Epstein <repst...@apple.com>
Cherry-pick r276696. rdar://problem/77581076
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -38,11 +38,13 @@
#include "Logging.h"
#include "Page.h"
#include "ScriptExecutionContext.h"
+#include <wtf/IsoMallocInlines.h>
-
namespace WebCore {
using namespace JSC;
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBFactory);
+
static bool shouldThrowSecurityException(ScriptExecutionContext& context)
{
ASSERT(is<Document>(context) || context.isWorkerGlobalScope());
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBFactory.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -31,6 +31,7 @@
#include "JSDOMPromiseDeferred.h"
#include <wtf/Function.h>
#include <wtf/Forward.h>
+#include <wtf/IsoMalloc.h>
#include <wtf/Ref.h>
#include <wtf/ThreadSafeRefCounted.h>
@@ -51,6 +52,7 @@
}
class IDBFactory : public ThreadSafeRefCounted<IDBFactory> {
+ WTF_MAKE_ISO_ALLOCATED(IDBFactory);
public:
static Ref<IDBFactory> create(IDBClient::IDBConnectionProxy&);
~IDBFactory();
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -30,9 +30,12 @@
#include <wtf/CrossThreadCopier.h>
#include <wtf/HashSet.h>
+#include <wtf/IsoMallocInlines.h>
namespace WebCore {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBGetAllResult);
+
IDBGetAllResult::IDBGetAllResult(const IDBGetAllResult& that, IsolatedCopyTag)
{
isolatedCopy(that, *this);
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetAllResult.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -32,12 +32,13 @@
#include "IDBValue.h"
#include "IndexedDB.h"
+#include <wtf/IsoMalloc.h>
#include <wtf/Variant.h>
namespace WebCore {
class IDBGetAllResult {
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_ISO_ALLOCATED_EXPORT(IDBGetAllResult, WEBCORE_EXPORT);
public:
IDBGetAllResult()
{
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -27,9 +27,12 @@
#include "IDBGetResult.h"
#if ENABLE(INDEXED_DATABASE)
+#include <wtf/IsoMallocInlines.h>
namespace WebCore {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBGetResult);
+
void IDBGetResult::dataFromBuffer(SharedBuffer& buffer)
{
Vector<uint8_t> data(buffer.size());
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -33,11 +33,12 @@
#include "IDBKeyPath.h"
#include "IDBValue.h"
#include "SharedBuffer.h"
+#include <wtf/IsoMalloc.h>
namespace WebCore {
class IDBGetResult {
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_ISO_ALLOCATED_EXPORT(IDBGetResult, WEBCORE_EXPORT);
public:
IDBGetResult()
: m_isDefined(false)
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -37,10 +37,13 @@
#include "IDBTransaction.h"
#include "Logging.h"
#include <_javascript_Core/HeapInlines.h>
+#include <wtf/IsoMallocInlines.h>
namespace WebCore {
using namespace JSC;
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBIndex);
+
IDBIndex::IDBIndex(ScriptExecutionContext& context, const IDBIndexInfo& info, IDBObjectStore& objectStore)
: ActiveDOMObject(&context)
, m_info(info)
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBIndex.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -30,6 +30,7 @@
#include "IDBCursor.h"
#include "IDBIndexInfo.h"
#include "IDBRequest.h"
+#include <wtf/IsoMalloc.h>
namespace JSC {
class CallFrame;
@@ -42,8 +43,7 @@
struct IDBKeyRangeData;
class IDBIndex final : public ActiveDOMObject {
- WTF_MAKE_NONCOPYABLE(IDBIndex);
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_ISO_ALLOCATED(IDBIndex);
public:
IDBIndex(ScriptExecutionContext&, const IDBIndexInfo&, IDBObjectStore&);
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -33,9 +33,12 @@
#include <_javascript_Core/JSArrayBuffer.h>
#include <_javascript_Core/JSArrayBufferView.h>
#include <_javascript_Core/JSCInlines.h>
+#include <wtf/IsoMallocInlines.h>
namespace WebCore {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBKey);
+
using IDBKeyVector = Vector<RefPtr<IDBKey>>;
Ref<IDBKey> IDBKey::createBinary(const ThreadSafeDataBuffer& buffer)
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBKey.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -30,6 +30,7 @@
#include "IndexedDB.h"
#include "ThreadSafeDataBuffer.h"
#include <wtf/Forward.h>
+#include <wtf/IsoMalloc.h>
#include <wtf/RefCounted.h>
#include <wtf/Variant.h>
#include <wtf/Vector.h>
@@ -43,6 +44,7 @@
namespace WebCore {
class IDBKey : public RefCounted<IDBKey> {
+ WTF_MAKE_ISO_ALLOCATED(IDBKey);
public:
static Ref<IDBKey> createInvalid()
{
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -49,11 +49,14 @@
#include <_javascript_Core/CatchScope.h>
#include <_javascript_Core/HeapInlines.h>
#include <_javascript_Core/JSCJSValueInlines.h>
+#include <wtf/IsoMallocInlines.h>
#include <wtf/Locker.h>
namespace WebCore {
using namespace JSC;
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBObjectStore);
+
IDBObjectStore::IDBObjectStore(ScriptExecutionContext& context, const IDBObjectStoreInfo& info, IDBTransaction& transaction)
: ActiveDOMObject(&context)
, m_info(info)
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -32,6 +32,7 @@
#include "IDBCursorDirection.h"
#include "IDBKeyPath.h"
#include "IDBObjectStoreInfo.h"
+#include <wtf/IsoMalloc.h>
namespace JSC {
class CallFrame;
@@ -56,8 +57,7 @@
}
class IDBObjectStore final : public ActiveDOMObject {
- WTF_MAKE_NONCOPYABLE(IDBObjectStore);
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_ISO_ALLOCATED(IDBObjectStore);
public:
IDBObjectStore(ScriptExecutionContext&, const IDBObjectStoreInfo&, IDBTransaction&);
~IDBObjectStore();
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -52,7 +52,6 @@
#include <wtf/Scope.h>
#include <wtf/Variant.h>
-
namespace WebCore {
using namespace JSC;
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/IDBRequest.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -40,6 +40,7 @@
#include "JSValueInWrappedObject.h"
#include <_javascript_Core/Strong.h>
#include <wtf/Function.h>
+#include <wtf/IsoMalloc.h>
#include <wtf/Scope.h>
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/WeakPtr.h>
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -40,11 +40,14 @@
#include "IDBResultData.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
+#include <wtf/IsoMallocInlines.h>
#include <wtf/MainThread.h>
namespace WebCore {
namespace IDBClient {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBConnectionProxy);
+
IDBConnectionProxy::IDBConnectionProxy(IDBConnectionToServer& connection)
: m_connectionToServer(connection)
, m_serverConnectionIdentifier(connection.identifier())
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -36,6 +36,7 @@
#include <wtf/Forward.h>
#include <wtf/Function.h>
#include <wtf/HashMap.h>
+#include <wtf/IsoMalloc.h>
#include <wtf/MainThread.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -58,9 +59,8 @@
class IDBConnectionToServer;
-class WEBCORE_EXPORT IDBConnectionProxy {
- WTF_MAKE_NONCOPYABLE(IDBConnectionProxy);
- WTF_MAKE_FAST_ALLOCATED;
+class WEBCORE_EXPORT IDBConnectionProxy final {
+ WTF_MAKE_ISO_ALLOCATED(IDBConnectionProxy);
public:
IDBConnectionProxy(IDBConnectionToServer&);
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -39,11 +39,14 @@
#include "Logging.h"
#include "SecurityOrigin.h"
#include "TransactionOperation.h"
+#include <wtf/IsoMallocInlines.h>
#include <wtf/MainThread.h>
namespace WebCore {
namespace IDBClient {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBConnectionToServer);
+
Ref<IDBConnectionToServer> IDBConnectionToServer::create(IDBConnectionToServerDelegate& delegate)
{
return adoptRef(*new IDBConnectionToServer(delegate));
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -32,6 +32,7 @@
#include "IDBResourceIdentifier.h"
#include <wtf/Function.h>
#include <wtf/HashMap.h>
+#include <wtf/IsoMalloc.h>
#include <wtf/Ref.h>
#include <wtf/ThreadSafeRefCounted.h>
@@ -54,6 +55,7 @@
namespace IDBClient {
class IDBConnectionToServer : public ThreadSafeRefCounted<IDBConnectionToServer> {
+ WTF_MAKE_ISO_ALLOCATED_EXPORT(IDBConnectionToServer, WEBCORE_EXPORT);
public:
WEBCORE_EXPORT static Ref<IDBConnectionToServer> create(IDBConnectionToServerDelegate&);
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -30,10 +30,14 @@
#include "IDBCursor.h"
#include <_javascript_Core/HeapInlines.h>
+#include <wtf/IsoMallocInlines.h>
namespace WebCore {
namespace IDBClient {
+WTF_MAKE_ISO_ALLOCATED_IMPL(TransactionOperation);
+WTF_MAKE_ISO_ALLOCATED_IMPL(TransactionOperationImpl);
+
TransactionOperation::TransactionOperation(IDBTransaction& transaction, IDBRequest& request)
: TransactionOperation(transaction)
{
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -47,6 +47,7 @@
namespace IDBClient {
class TransactionOperation : public ThreadSafeRefCounted<TransactionOperation> {
+ WTF_MAKE_ISO_ALLOCATED(TransactionOperation);
friend IDBRequestData::IDBRequestData(TransactionOperation&);
public:
virtual ~TransactionOperation()
@@ -150,6 +151,7 @@
};
class TransactionOperationImpl final : public TransactionOperation {
+ WTF_MAKE_ISO_ALLOCATED(TransactionOperationImpl);
public:
template<typename... Args> static Ref<TransactionOperationImpl> create(Args&&... args) { return adoptRef(*new TransactionOperationImpl(std::forward<Args>(args)...)); }
private:
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2021-05-07 18:48:34 UTC (rev 277191)
@@ -26,6 +26,7 @@
#include "config.h"
#include "IDBDatabaseInfo.h"
+#include <wtf/IsoMallocInlines.h>
#include <wtf/text/StringBuilder.h>
#if ENABLE(INDEXED_DATABASE)
@@ -32,6 +33,8 @@
namespace WebCore {
+WTF_MAKE_ISO_ALLOCATED_IMPL(IDBDatabaseInfo);
+
IDBDatabaseInfo::IDBDatabaseInfo()
{
}
Modified: branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2021-05-07 18:48:34 UTC (rev 277191)
@@ -29,11 +29,12 @@
#include "IDBObjectStoreInfo.h"
#include <wtf/HashMap.h>
+#include <wtf/IsoMalloc.h>
namespace WebCore {
class IDBDatabaseInfo {
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_ISO_ALLOCATED_EXPORT(IDBDatabaseInfo, WEBCORE_EXPORT);
public:
explicit IDBDatabaseInfo(const String& name, uint64_t version, uint64_t maxIndexID);
Modified: branches/safari-611-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (277190 => 277191)
--- branches/safari-611-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-05-07 18:48:25 UTC (rev 277190)
+++ branches/safari-611-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-05-07 18:48:34 UTC (rev 277191)
@@ -1518,7 +1518,6 @@
5185FC9E1BB4C4E80012898F /* IDBKeyRangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123AF171890A4CA0031CDC9 /* IDBKeyRangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
5185FCA01BB4C4E80012898F /* IDBObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51645B4B1B9F889B00F789CE /* IDBObjectStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
5185FCA41BB4C4E80012898F /* IDBOpenDBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 51645B4D1B9F889B00F789CE /* IDBOpenDBRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 5185FCA71BB4C4E80012898F /* IDBRecordIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EAC5B018163F4E004F1BA4 /* IDBRecordIdentifier.h */; };
5185FCA91BB4C4E80012898F /* IDBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 51645B4F1B9F889B00F789CE /* IDBRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
5185FCAD1BB4C4E80012898F /* IDBTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 51645B511B9F889B00F789CE /* IDBTransaction.h */; settings = {ATTRIBUTES = (Private, ); }; };
5185FCB01BB4C4E80012898F /* IDBVersionChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 51645B531B9F889B00F789CE /* IDBVersionChangeEvent.h */; };
@@ -3375,6 +3374,7 @@
A7D20F63107F406900A80392 /* JSWebGLActiveInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D20F61107F406900A80392 /* JSWebGLActiveInfo.h */; };
A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D20F6B107F438B00A80392 /* WebGLActiveInfo.h */; };
A7D6B3490F61104500B79FD1 /* WorkerScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D6B3470F61104500B79FD1 /* WorkerScriptLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A7D6B3490F61104500FF9FD1 /* WorkerFontLoadRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D6B3470F61104500FF9FD1 /* WorkerFontLoadRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
A7DBF8DE1276919C006B6008 /* TextCheckingHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A7DBF8DC1276919C006B6008 /* TextCheckingHelper.h */; };
A80D67080E9E9DEB00E420F0 /* GraphicsContextPlatformPrivateCG.h in Headers */ = {isa = PBXBuildFile; fileRef = A80D67070E9E9DEB00E420F0 /* GraphicsContextPlatformPrivateCG.h */; };
A80E6CE60A1989CA007FB8C5 /* CSSPrimitiveValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CBC0A1989CA007FB8C5 /* CSSPrimitiveValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -8854,7 +8854,6 @@
51E3F9D40DA05E1D00250911 /* JSStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorage.cpp; sourceTree = "<group>"; };
51E3F9D50DA05E1D00250911 /* JSStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorage.h; sourceTree = "<group>"; };
51E6820F16387302003BBF3C /* LoaderStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderStrategy.h; sourceTree = "<group>"; };
- 51EAC5B018163F4E004F1BA4 /* IDBRecordIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRecordIdentifier.h; sourceTree = "<group>"; };
51ECC3F1200587B500483EAE /* MessagePortChannelRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagePortChannelRegistry.h; sourceTree = "<group>"; };
51ECC3F3200587B600483EAE /* MessagePortChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessagePortChannel.cpp; sourceTree = "<group>"; };
51ECC3F4200587B700483EAE /* MessagePortChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagePortChannel.h; sourceTree = "<group>"; };
@@ -12669,7 +12668,9 @@
A7D20F61107F406900A80392 /* JSWebGLActiveInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLActiveInfo.h; sourceTree = "<group>"; };
A7D20F6B107F438B00A80392 /* WebGLActiveInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLActiveInfo.h; sourceTree = "<group>"; };
A7D6B3470F61104500B79FD1 /* WorkerScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerScriptLoader.h; sourceTree = "<group>"; };
+ A7D6B3470F61104500FF9FD1 /* WorkerFontLoadRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerFontLoadRequest.h; sourceTree = "<group>"; };
A7D6B3480F61104500B79FD1 /* WorkerScriptLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerScriptLoader.cpp; sourceTree = "<group>"; };
+ A7D6B3480F61104500FF9FD1 /* WorkerFontLoadRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerFontLoadRequest.cpp; sourceTree = "<group>"; };
A7DBF8DB1276919C006B6008 /* TextCheckingHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCheckingHelper.cpp; sourceTree = "<group>"; };
A7DBF8DC1276919C006B6008 /* TextCheckingHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckingHelper.h; sourceTree = "<group>"; };
A80A38FD0E50CC8200A25EBC /* PatternCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PatternCG.cpp; sourceTree = "<group>"; };
@@ -23927,7 +23928,6 @@
51645B4C1B9F889B00F789CE /* IDBOpenDBRequest.cpp */,
51645B4D1B9F889B00F789CE /* IDBOpenDBRequest.h */,
51D7199E181106E00016DC51 /* IDBOpenDBRequest.idl */,
- 51EAC5B018163F4E004F1BA4 /* IDBRecordIdentifier.h */,
51645B4E1B9F889B00F789CE /* IDBRequest.cpp */,
51645B4F1B9F889B00F789CE /* IDBRequest.h */,
51D719A3181106E00016DC51 /* IDBRequest.idl */,
@@ -32463,7 +32463,6 @@
5185FCA01BB4C4E80012898F /* IDBObjectStore.h in Headers */,
5160712F1BD8307800DBC4F2 /* IDBObjectStoreInfo.h in Headers */,
5185FCA41BB4C4E80012898F /* IDBOpenDBRequest.h in Headers */,
- 5185FCA71BB4C4E80012898F /* IDBRecordIdentifier.h in Headers */,
5185FCA91BB4C4E80012898F /* IDBRequest.h in Headers */,
514129991C6976900059E714 /* IDBRequestCompletionEvent.h in Headers */,
510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */,
