<!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>[242818] trunk</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/242818">242818</a></dd>
<dt>Author</dt> <dd>sihui_liu@apple.com</dd>
<dt>Date</dt> <dd>2019-03-12 12:36:47 -0700 (Tue, 12 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Layout Test imported/w3c/web-platform-tests/IndexedDB/fire-*-event-exception.html are failing
https://bugs.webkit.org/show_bug.cgi?id=195581

LayoutTests/imported/w3c:

Updated test expectations to PASS.

Reviewed by Brady Eidson.

* web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt:
* web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt:
* web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt:

Source/WebCore:

Reviewed by Brady Eidson.

Uncaught exceptions should be handled after IDBRequest dispatches events so that IDBTransaction would stay
active during event dispatch.

* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::dispatchEvent):
(WebCore::IDBRequest::uncaughtExceptionInEventHandler):
* Modules/indexeddb/IDBRequest.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfireerroreventexceptionexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfiresuccesseventexceptionexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfireupgradeneededeventexceptionexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequesth">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2019-03-12  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><ins>+        Layout Test imported/w3c/web-platform-tests/IndexedDB/fire-*-event-exception.html are failing
+        https://bugs.webkit.org/show_bug.cgi?id=195581
+
+        Updated test expectations to PASS.
+
+        Reviewed by Brady Eidson.
+
+        * web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt:
+        * web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt:
+        * web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt:
+
+2019-03-12  Sihui Liu  <sihui_liu@apple.com>
+
</ins><span class="cx">         Layout Test imported/w3c/web-platform-tests/IndexedDB/transaction-abort-request-error.html is failing
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195570
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfireerroreventexceptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt      2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception-expected.txt 2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -18,15 +18,15 @@
</span><span class="cx"> PASS Exception in error event handler on request, with preventDefault 
</span><span class="cx"> PASS Exception in error event listener on request 
</span><span class="cx"> PASS Exception in second error event listener on request 
</span><del>-FAIL Exception in first error event listener on request, transaction active in second assert_equals: Active check should either not throw anything, or throw TransactionInactiveError expected "TransactionInactiveError" but got "InvalidStateError"
</del><ins>+PASS Exception in first error event listener on request, transaction active in second 
</ins><span class="cx"> PASS Exception in error event handler on transaction 
</span><span class="cx"> PASS Exception in error event handler on transaction, with preventDefault 
</span><span class="cx"> PASS Exception in error event listener on transaction 
</span><span class="cx"> PASS Exception in second error event listener on transaction 
</span><del>-FAIL Exception in first error event listener on transaction, transaction active in second assert_equals: Active check should either not throw anything, or throw TransactionInactiveError expected "TransactionInactiveError" but got "InvalidStateError"
</del><ins>+PASS Exception in first error event listener on transaction, transaction active in second 
</ins><span class="cx"> PASS Exception in error event handler on connection 
</span><span class="cx"> PASS Exception in error event handler on connection, with preventDefault 
</span><span class="cx"> PASS Exception in error event listener on connection 
</span><span class="cx"> PASS Exception in second error event listener on connection 
</span><del>-FAIL Exception in first error event listener on connection, transaction active in second assert_equals: Active check should either not throw anything, or throw TransactionInactiveError expected "TransactionInactiveError" but got "InvalidStateError"
</del><ins>+PASS Exception in first error event listener on connection, transaction active in second 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfiresuccesseventexceptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt    2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-success-event-exception-expected.txt       2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -6,5 +6,5 @@
</span><span class="cx"> PASS Exception in success event handler on request 
</span><span class="cx"> PASS Exception in success event listener on request 
</span><span class="cx"> PASS Exception in second success event listener on request 
</span><del>-FAIL Exception in first success event listener, tx active in second assert_equals: Active check should either not throw anything, or throw TransactionInactiveError expected "TransactionInactiveError" but got "InvalidStateError"
</del><ins>+PASS Exception in first success event listener, tx active in second 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBfireupgradeneededeventexceptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt      2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception-expected.txt 2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -6,5 +6,5 @@
</span><span class="cx"> PASS Exception in upgradeneeded handler 
</span><span class="cx"> PASS Exception in upgradeneeded listener 
</span><span class="cx"> PASS Exception in second upgradeneeded listener 
</span><del>-FAIL Exception in first upgradeneeded listener, tx active in second assert_equals: Active check should either not throw anything, or throw TransactionInactiveError expected "TransactionInactiveError" but got "InvalidStateError"
</del><ins>+PASS Exception in first upgradeneeded listener, tx active in second 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/Source/WebCore/ChangeLog      2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2019-03-12  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><ins>+        Layout Test imported/w3c/web-platform-tests/IndexedDB/fire-*-event-exception.html are failing
+        https://bugs.webkit.org/show_bug.cgi?id=195581
+
+        Reviewed by Brady Eidson.
+
+        Uncaught exceptions should be handled after IDBRequest dispatches events so that IDBTransaction would stay 
+        active during event dispatch.
+
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::dispatchEvent):
+        (WebCore::IDBRequest::uncaughtExceptionInEventHandler):
+        * Modules/indexeddb/IDBRequest.h:
+
+2019-03-12  Sihui Liu  <sihui_liu@apple.com>
+
</ins><span class="cx">         Layout Test imported/w3c/web-platform-tests/IndexedDB/transaction-abort-request-error.html is failing
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195570
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp    2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp       2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -304,6 +304,7 @@
</span><span class="cx">     ASSERT(!m_contextStopped);
</span><span class="cx"> 
</span><span class="cx">     auto protectedThis = makeRef(*this);
</span><ins>+    m_dispatchingEvent = true;
</ins><span class="cx"> 
</span><span class="cx">     if (event.type() != eventNames().blockedEvent)
</span><span class="cx">         m_readyState = ReadyState::Done;
</span><span class="lines">@@ -331,7 +332,9 @@
</span><span class="cx">     if (m_transaction && !m_pendingCursor && event.type() != eventNames().blockedEvent)
</span><span class="cx">         m_transaction->removeRequest(*this);
</span><span class="cx"> 
</span><del>-    if (!event.defaultPrevented() && event.type() == eventNames().errorEvent && m_transaction && !m_transaction->isFinishedOrFinishing()) {
</del><ins>+    if (m_hasUncaughtException)
+        m_transaction->abortDueToFailedRequest(DOMException::create(AbortError, "IDBTransaction will abort due to uncaught exception in an event handler"_s));
+    else if (!event.defaultPrevented() && event.type() == eventNames().errorEvent && m_transaction && !m_transaction->isFinishedOrFinishing()) {
</ins><span class="cx">         ASSERT(m_domError);
</span><span class="cx">         m_transaction->abortDueToFailedRequest(*m_domError);
</span><span class="cx">     }
</span><span class="lines">@@ -338,6 +341,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_transaction)
</span><span class="cx">         m_transaction->finishedDispatchEventForRequest(*this);
</span><ins>+
+    m_dispatchingEvent = false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void IDBRequest::uncaughtExceptionInEventHandler()
</span><span class="lines">@@ -346,6 +351,11 @@
</span><span class="cx"> 
</span><span class="cx">     ASSERT(&originThread() == &Thread::current());
</span><span class="cx"> 
</span><ins>+    if (m_dispatchingEvent) {
+        ASSERT(!m_hasUncaughtException);
+        m_hasUncaughtException = true;
+        return;
+    }
</ins><span class="cx">     if (m_transaction && m_idbError.code() != AbortError)
</span><span class="cx">         m_transaction->abortDueToFailedRequest(DOMException::create(AbortError, "IDBTransaction will abort due to uncaught exception in an event handler"_s));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (242817 => 242818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h      2019-03-12 19:34:56 UTC (rev 242817)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2019-03-12 19:36:47 UTC (rev 242818)
</span><span class="lines">@@ -181,6 +181,9 @@
</span><span class="cx">     RefPtr<IDBCursor> m_pendingCursor;
</span><span class="cx"> 
</span><span class="cx">     Ref<IDBClient::IDBConnectionProxy> m_connectionProxy;
</span><ins>+
+    bool m_dispatchingEvent { false };
+    bool m_hasUncaughtException { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>