<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196519] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196519">196519</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-12 15:16:57 -0800 (Fri, 12 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: IDBObjectStore and IDBIndex need to be ActiveDOMObjects.
https://bugs.webkit.org/show_bug.cgi?id=154153

Reviewed by Alex Christensen.

No new tests (No testable change in behavior).

This is needed so that IDBObjectStore and IDBIndex JS wrappers are not garbage collected
while their IDBTransaction is still in progress.

* Modules/indexeddb/client/IDBIndexImpl.cpp:
(WebCore::IDBClient::IDBIndex::IDBIndex):
(WebCore::IDBClient::IDBIndex::activeDOMObjectName):
(WebCore::IDBClient::IDBIndex::canSuspendForDocumentSuspension):
(WebCore::IDBClient::IDBIndex::hasPendingActivity):
* Modules/indexeddb/client/IDBIndexImpl.h:

* Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
(WebCore::IDBClient::IDBObjectStore::create):
(WebCore::IDBClient::IDBObjectStore::IDBObjectStore):
(WebCore::IDBClient::IDBObjectStore::activeDOMObjectName):
(WebCore::IDBClient::IDBObjectStore::canSuspendForDocumentSuspension):
(WebCore::IDBClient::IDBObjectStore::hasPendingActivity):
(WebCore::IDBClient::IDBObjectStore::index):
* Modules/indexeddb/client/IDBObjectStoreImpl.h:

* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::objectStore):
(WebCore::IDBClient::IDBTransaction::createObjectStore):
(WebCore::IDBClient::IDBTransaction::createIndex):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBIndexImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBIndexImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/ChangeLog        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-02-12  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Modern IDB: IDBObjectStore and IDBIndex need to be ActiveDOMObjects.
+        https://bugs.webkit.org/show_bug.cgi?id=154153
+
+        Reviewed by Alex Christensen.
+
+        No new tests (No testable change in behavior).
+
+        This is needed so that IDBObjectStore and IDBIndex JS wrappers are not garbage collected
+        while their IDBTransaction is still in progress.
+
+        * Modules/indexeddb/client/IDBIndexImpl.cpp:
+        (WebCore::IDBClient::IDBIndex::IDBIndex):
+        (WebCore::IDBClient::IDBIndex::activeDOMObjectName):
+        (WebCore::IDBClient::IDBIndex::canSuspendForDocumentSuspension):
+        (WebCore::IDBClient::IDBIndex::hasPendingActivity):
+        * Modules/indexeddb/client/IDBIndexImpl.h:
+        
+        * Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
+        (WebCore::IDBClient::IDBObjectStore::create):
+        (WebCore::IDBClient::IDBObjectStore::IDBObjectStore):
+        (WebCore::IDBClient::IDBObjectStore::activeDOMObjectName):
+        (WebCore::IDBClient::IDBObjectStore::canSuspendForDocumentSuspension):
+        (WebCore::IDBClient::IDBObjectStore::hasPendingActivity):
+        (WebCore::IDBClient::IDBObjectStore::index):
+        * Modules/indexeddb/client/IDBObjectStoreImpl.h:
+        
+        * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+        (WebCore::IDBClient::IDBTransaction::objectStore):
+        (WebCore::IDBClient::IDBTransaction::createObjectStore):
+        (WebCore::IDBClient::IDBTransaction::createIndex):
+
+2016-02-12  Brady Eidson  &lt;beidson@apple.com&gt;
+
</ins><span class="cx">         Modern IDB: Simplify the relationship between IDBObjectStore and IDBIndex.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=154187
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBIndexImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -41,16 +41,33 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace IDBClient {
</span><span class="cx"> 
</span><del>-IDBIndex::IDBIndex(const IDBIndexInfo&amp; info, IDBObjectStore&amp; objectStore)
-    : m_info(info)
</del><ins>+IDBIndex::IDBIndex(ScriptExecutionContext* context, const IDBIndexInfo&amp; info, IDBObjectStore&amp; objectStore)
+    : ActiveDOMObject(context)
+    , m_info(info)
</ins><span class="cx">     , m_objectStore(objectStore)
</span><span class="cx"> {
</span><ins>+    suspendIfNeeded();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IDBIndex::~IDBIndex()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const char* IDBIndex::activeDOMObjectName() const
+{
+    return &quot;IDBIndex&quot;;
+}
+
+bool IDBIndex::canSuspendForDocumentSuspension() const
+{
+    return false;
+}
+
+bool IDBIndex::hasPendingActivity() const
+{
+    return !m_objectStore.modernTransaction().isFinished();
+}
+
</ins><span class="cx"> const String&amp; IDBIndex::name() const
</span><span class="cx"> {
</span><span class="cx">     return m_info.name();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBIndexImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.h (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.h        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.h        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> 
</span><ins>+#include &quot;ActiveDOMObject.h&quot;
</ins><span class="cx"> #include &quot;IDBIndexInfo.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -40,9 +41,9 @@
</span><span class="cx"> 
</span><span class="cx"> class IDBObjectStore;
</span><span class="cx"> 
</span><del>-class IDBIndex : public WebCore::IDBIndex {
</del><ins>+class IDBIndex : public WebCore::IDBIndex, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><del>-    IDBIndex(const IDBIndexInfo&amp;, IDBObjectStore&amp;);
</del><ins>+    IDBIndex(ScriptExecutionContext*, const IDBIndexInfo&amp;, IDBObjectStore&amp;);
</ins><span class="cx"> 
</span><span class="cx">     virtual ~IDBIndex();
</span><span class="cx"> 
</span><span class="lines">@@ -92,6 +93,11 @@
</span><span class="cx">     RefPtr&lt;WebCore::IDBRequest&gt; doGet(ScriptExecutionContext&amp;, const IDBKeyRangeData&amp;, ExceptionCodeWithMessage&amp;);
</span><span class="cx">     RefPtr&lt;WebCore::IDBRequest&gt; doGetKey(ScriptExecutionContext&amp;, const IDBKeyRangeData&amp;, ExceptionCodeWithMessage&amp;);
</span><span class="cx"> 
</span><ins>+    // ActiveDOMObject
+    virtual const char* activeDOMObjectName() const override final;
+    virtual bool canSuspendForDocumentSuspension() const override final;
+    virtual bool hasPendingActivity() const override final;
+
</ins><span class="cx">     IDBIndexInfo m_info;
</span><span class="cx"> 
</span><span class="cx">     bool m_deleted { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -46,22 +46,39 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace IDBClient {
</span><span class="cx"> 
</span><del>-Ref&lt;IDBObjectStore&gt; IDBObjectStore::create(const IDBObjectStoreInfo&amp; info, IDBTransaction&amp; transaction)
</del><ins>+Ref&lt;IDBObjectStore&gt; IDBObjectStore::create(ScriptExecutionContext* context, const IDBObjectStoreInfo&amp; info, IDBTransaction&amp; transaction)
</ins><span class="cx"> {
</span><del>-    return adoptRef(*new IDBObjectStore(info, transaction));
</del><ins>+    return adoptRef(*new IDBObjectStore(context, info, transaction));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-IDBObjectStore::IDBObjectStore(const IDBObjectStoreInfo&amp; info, IDBTransaction&amp; transaction)
-    : m_info(info)
</del><ins>+IDBObjectStore::IDBObjectStore(ScriptExecutionContext* context, const IDBObjectStoreInfo&amp; info, IDBTransaction&amp; transaction)
+    : ActiveDOMObject(context)
+    , m_info(info)
</ins><span class="cx">     , m_originalInfo(info)
</span><span class="cx">     , m_transaction(transaction)
</span><span class="cx"> {
</span><ins>+    suspendIfNeeded();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IDBObjectStore::~IDBObjectStore()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const char* IDBObjectStore::activeDOMObjectName() const
+{
+    return &quot;IDBObjectStore&quot;;
+}
+
+bool IDBObjectStore::canSuspendForDocumentSuspension() const
+{
+    return false;
+}
+
+bool IDBObjectStore::hasPendingActivity() const
+{
+    return !m_transaction-&gt;isFinished();
+}
+
</ins><span class="cx"> const String IDBObjectStore::name() const
</span><span class="cx"> {
</span><span class="cx">     return m_info.name();
</span><span class="lines">@@ -500,6 +517,9 @@
</span><span class="cx"> {
</span><span class="cx">     LOG(IndexedDB, &quot;IDBObjectStore::index&quot;);
</span><span class="cx"> 
</span><ins>+    if (!scriptExecutionContext())
+        return nullptr;
+
</ins><span class="cx">     if (m_deleted) {
</span><span class="cx">         ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="cx">         ec.message = ASCIILiteral(&quot;Failed to execute 'index' on 'IDBObjectStore': The object store has been deleted.&quot;);
</span><span class="lines">@@ -524,7 +544,7 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto index = std::make_unique&lt;IDBIndex&gt;(*info, *this);
</del><ins>+    auto index = std::make_unique&lt;IDBIndex&gt;(scriptExecutionContext(), *info, *this);
</ins><span class="cx">     RefPtr&lt;IDBIndex&gt; refIndex = index.get();
</span><span class="cx">     m_referencedIndexes.set(indexName, WTFMove(index));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> 
</span><ins>+#include &quot;ActiveDOMObject.h&quot;
</ins><span class="cx"> #include &quot;IDBIndexImpl.h&quot;
</span><span class="cx"> #include &quot;IDBObjectStore.h&quot;
</span><span class="cx"> #include &quot;IDBObjectStoreInfo.h&quot;
</span><span class="lines">@@ -44,9 +45,9 @@
</span><span class="cx"> class IDBRequest;
</span><span class="cx"> class IDBTransaction;
</span><span class="cx"> 
</span><del>-class IDBObjectStore : public WebCore::IDBObjectStore {
</del><ins>+class IDBObjectStore : public WebCore::IDBObjectStore, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><del>-    static Ref&lt;IDBObjectStore&gt; create(const IDBObjectStoreInfo&amp;, IDBTransaction&amp;);
</del><ins>+    static Ref&lt;IDBObjectStore&gt; create(ScriptExecutionContext*, const IDBObjectStoreInfo&amp;, IDBTransaction&amp;);
</ins><span class="cx"> 
</span><span class="cx">     virtual ~IDBObjectStore() override final;
</span><span class="cx"> 
</span><span class="lines">@@ -98,7 +99,7 @@
</span><span class="cx">     void visitReferencedIndexes(JSC::SlotVisitor&amp;) const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    IDBObjectStore(const IDBObjectStoreInfo&amp;, IDBTransaction&amp;);
</del><ins>+    IDBObjectStore(ScriptExecutionContext*, const IDBObjectStoreInfo&amp;, IDBTransaction&amp;);
</ins><span class="cx"> 
</span><span class="cx">     enum class InlineKeyCheck {
</span><span class="cx">         Perform,
</span><span class="lines">@@ -109,6 +110,11 @@
</span><span class="cx">     RefPtr&lt;WebCore::IDBRequest&gt; doCount(ScriptExecutionContext&amp;, const IDBKeyRangeData&amp;, ExceptionCodeWithMessage&amp;);
</span><span class="cx">     RefPtr&lt;IDBRequest&gt; doDelete(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCodeWithMessage&amp; ec);
</span><span class="cx"> 
</span><ins>+    // ActiveDOMObject
+    virtual const char* activeDOMObjectName() const override final;
+    virtual bool canSuspendForDocumentSuspension() const override final;
+    virtual bool hasPendingActivity() const override final;
+
</ins><span class="cx">     IDBObjectStoreInfo m_info;
</span><span class="cx">     IDBObjectStoreInfo m_originalInfo;
</span><span class="cx">     Ref&lt;IDBTransaction&gt; m_transaction;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (196518 => 196519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2016-02-12 23:01:20 UTC (rev 196518)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2016-02-12 23:16:57 UTC (rev 196519)
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx"> {
</span><span class="cx">     LOG(IndexedDB, &quot;IDBTransaction::objectStore&quot;);
</span><span class="cx"> 
</span><ins>+    if (!scriptExecutionContext())
+        return nullptr;
+
</ins><span class="cx">     if (isFinishedOrFinishing()) {
</span><span class="cx">         ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="cx">         ec.message = ASCIILiteral(&quot;Failed to execute 'objectStore' on 'IDBTransaction': The transaction finished.&quot;);
</span><span class="lines">@@ -159,7 +162,7 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto objectStore = IDBObjectStore::create(*info, *this);
</del><ins>+    auto objectStore = IDBObjectStore::create(scriptExecutionContext(), *info, *this);
</ins><span class="cx">     m_referencedObjectStores.set(objectStoreName, &amp;objectStore.get());
</span><span class="cx"> 
</span><span class="cx">     return adoptRef(&amp;objectStore.leakRef());
</span><span class="lines">@@ -468,8 +471,9 @@
</span><span class="cx"> {
</span><span class="cx">     LOG(IndexedDB, &quot;IDBTransaction::createObjectStore&quot;);
</span><span class="cx">     ASSERT(isVersionChange());
</span><ins>+    ASSERT(scriptExecutionContext());
</ins><span class="cx"> 
</span><del>-    Ref&lt;IDBObjectStore&gt; objectStore = IDBObjectStore::create(info, *this);
</del><ins>+    Ref&lt;IDBObjectStore&gt; objectStore = IDBObjectStore::create(scriptExecutionContext(), info, *this);
</ins><span class="cx">     m_referencedObjectStores.set(info.name(), &amp;objectStore.get());
</span><span class="cx"> 
</span><span class="cx">     auto operation = createTransactionOperation(*this, &amp;IDBTransaction::didCreateObjectStoreOnServer, &amp;IDBTransaction::createObjectStoreOnServer, info);
</span><span class="lines">@@ -499,10 +503,13 @@
</span><span class="cx">     LOG(IndexedDB, &quot;IDBTransaction::createIndex&quot;);
</span><span class="cx">     ASSERT(isVersionChange());
</span><span class="cx"> 
</span><ins>+    if (!scriptExecutionContext())
+        return nullptr;
+
</ins><span class="cx">     auto operation = createTransactionOperation(*this, &amp;IDBTransaction::didCreateIndexOnServer, &amp;IDBTransaction::createIndexOnServer, info);
</span><span class="cx">     scheduleOperation(WTFMove(operation));
</span><span class="cx"> 
</span><del>-    return std::make_unique&lt;IDBIndex&gt;(info, objectStore);
</del><ins>+    return std::make_unique&lt;IDBIndex&gt;(scriptExecutionContext(), info, objectStore);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void IDBTransaction::createIndexOnServer(TransactionOperation&amp; operation, const IDBIndexInfo&amp; info)
</span></span></pre>
</div>
</div>

</body>
</html>