<!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>[198326] 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/198326">198326</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-17 04:25:10 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] response-consume.html is crashing on Mac WK1 Debug builds
https://bugs.webkit.org/show_bug.cgi?id=155490
Reviewed by Darin Adler.
Source/WebCore:
Covered by existing tests.
Ensured to lock state before calling JSC:JSONParse.
Adding fulfillPromiseWithJSON routine to handle it.
Applied it to FetchBody.
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::json):
(WebCore::FetchBody::loadedAsText):
(WebCore::FetchBody::resolveAsJSON): Deleted.
* Modules/fetch/FetchBody.h:
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::loadedBlobAsText):
* bindings/js/JSDOMPromise.cpp:
(WebCore::parseAsJSON):
(WebCore::fulfillPromiseWithJSON):
* bindings/js/JSDOMPromise.h:
LayoutTests:
* TestExpectations: Removed crash debug expectation of response-consume.html</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromisecpp">trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/LayoutTests/ChangeLog 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-03-17 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] response-consume.html is crashing on Mac WK1 Debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=155490
+
+ Reviewed by Darin Adler.
+
+ * TestExpectations: Removed crash debug expectation of response-consume.html
+
</ins><span class="cx"> 2016-03-17 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Update RTCIceCandidate
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/LayoutTests/TestExpectations 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -324,9 +324,6 @@
</span><span class="cx"> # New W3C ref tests that are failing.
</span><span class="cx"> webkit.org/b/148856 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# Fetch API tests
-[ Debug ] imported/w3c/web-platform-tests/fetch/api/response/response-consume.html [ Pass Crash ]
-
</del><span class="cx"> # @supports W3C Failures
</span><span class="cx"> webkit.org/b/137566 css3/conditional/w3c/at-supports-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/137568 css3/conditional/w3c/at-supports-014.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/ChangeLog 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-17 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] response-consume.html is crashing on Mac WK1 Debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=155490
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests.
+
+ Ensured to lock state before calling JSC:JSONParse.
+ Adding fulfillPromiseWithJSON routine to handle it.
+ Applied it to FetchBody.
+
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::json):
+ (WebCore::FetchBody::loadedAsText):
+ (WebCore::FetchBody::resolveAsJSON): Deleted.
+ * Modules/fetch/FetchBody.h:
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::loadedBlobAsText):
+ * bindings/js/JSDOMPromise.cpp:
+ (WebCore::parseAsJSON):
+ (WebCore::fulfillPromiseWithJSON):
+ * bindings/js/JSDOMPromise.h:
+
</ins><span class="cx"> 2016-03-17 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Update RTCIceCandidate
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "JSBlob.h"
</span><span class="cx"> #include "JSDOMFormData.h"
</span><del>-#include <runtime/JSONObject.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -135,11 +134,8 @@
</span><span class="cx"> if (processIfEmptyOrDisturbed(Consumer::Type::JSON, promise))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!owner.scriptExecutionContext())
- return;
-
</del><span class="cx"> if (m_type == Type::Text) {
</span><del>- resolveAsJSON(*owner.scriptExecutionContext(), m_text, WTFMove(promise));
</del><ins>+ fulfillPromiseWithJSON(promise, m_text);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> consume(owner, Consumer::Type::JSON, WTFMove(promise));
</span><span class="lines">@@ -208,16 +204,6 @@
</span><span class="cx"> owner.loadBlob(*m_blob, loadingType(type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::resolveAsJSON(ScriptExecutionContext& context, const String& data, DeferredWrapper&& promise)
-{
- DOMRequestState state(&context);
- JSC::JSValue value = JSC::JSONParse(state.exec(), data);
- if (!value)
- promise.reject<ExceptionCode>(SYNTAX_ERR);
- else
- promise.resolve(value);
-}
-
</del><span class="cx"> Vector<char> FetchBody::extractFromText() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == Type::Text);
</span><span class="lines">@@ -251,14 +237,14 @@
</span><span class="cx"> m_consumer = Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::loadedAsText(ScriptExecutionContext& context, String&& text)
</del><ins>+void FetchBody::loadedAsText(String&& text)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_consumer);
</span><span class="cx"> ASSERT(m_consumer->type == Consumer::Type::Text || m_consumer->type == Consumer::Type::JSON);
</span><span class="cx"> if (m_consumer->type == Consumer::Type::Text)
</span><span class="cx"> m_consumer->promise.resolve(text);
</span><span class="cx"> else
</span><del>- resolveAsJSON(context, text, WTFMove(m_consumer->promise));
</del><ins>+ fulfillPromiseWithJSON(m_consumer->promise, text);
</ins><span class="cx"> m_consumer = Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void loadingFailed();
</span><span class="cx"> void loadedAsArrayBuffer(RefPtr<ArrayBuffer>&&);
</span><del>- void loadedAsText(ScriptExecutionContext&, String&&);
</del><ins>+ void loadedAsText(String&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class Type { None, Text, Blob, FormData };
</span><span class="lines">@@ -86,7 +86,6 @@
</span><span class="cx"> bool processIfEmptyOrDisturbed(Consumer::Type, DeferredWrapper&);
</span><span class="cx"> void consumeText(Consumer::Type, DeferredWrapper&&);
</span><span class="cx"> void consumeBlob(FetchBodyOwner&, Consumer::Type, DeferredWrapper&&);
</span><del>- void resolveAsJSON(ScriptExecutionContext&, const String&, DeferredWrapper&&);
</del><span class="cx"> static FetchLoader::Type loadingType(Consumer::Type);
</span><span class="cx">
</span><span class="cx"> Type m_type = Type::None;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -69,9 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::loadedBlobAsText(String&& text)
</span><span class="cx"> {
</span><del>- ASSERT(scriptExecutionContext());
-
- m_body.loadedAsText(*scriptExecutionContext(), WTFMove(text));
</del><ins>+ m_body.loadedAsText(WTFMove(text));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::finishBlobLoading()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include <runtime/Exception.h>
</span><ins>+#include <runtime/JSONObject.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -77,4 +78,19 @@
</span><span class="cx"> DeferredWrapper(&state, &globalObject, &promiseDeferred).reject(error);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSC::JSValue parseAsJSON(JSC::ExecState* state, const String& data)
+{
+ JSC::JSLockHolder lock(state);
+ return JSC::JSONParse(state, data);
</ins><span class="cx"> }
</span><ins>+
+void fulfillPromiseWithJSON(DeferredWrapper& promise, const String& data)
+{
+ JSC::JSValue value = parseAsJSON(promise.globalObject().globalExec(), data);
+ if (!value)
+ promise.reject<ExceptionCode>(SYNTAX_ERR);
+ else
+ promise.resolve(value);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (198325 => 198326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-03-17 10:52:20 UTC (rev 198325)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-03-17 11:25:10 UTC (rev 198326)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> JSC::Strong<JSC::JSPromiseDeferred> m_deferred;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+void fulfillPromiseWithJSON(DeferredWrapper&, const String&);
</ins><span class="cx"> void rejectPromiseWithExceptionIfAny(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSPromiseDeferred&);
</span><span class="cx">
</span><span class="cx"> inline JSC::JSValue callPromiseFunction(JSC::ExecState& state, JSC::EncodedJSValue promiseFunction(JSC::ExecState*, JSC::JSPromiseDeferred*))
</span></span></pre>
</div>
</div>
</body>
</html>