<!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>[197347] 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/197347">197347</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-02-29 05:01:51 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor FetchBody constructors
https://bugs.webkit.org/show_bug.cgi?id=154721
Reviewed by Sam Weinig and Darin Adler.
Covered by existing tests.
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::extract): Renamed from "fromJSValue"
(WebCore::FetchBody::extractFromBody): Renamed from "fromRequestBody" and making use of move constructor.
* Modules/fetch/FetchBody.h:
(WebCore::FetchBody::FetchBody): Making default constructor public and removing empty static method.
* Modules/fetch/FetchRequest.cpp:
(WebCore::buildBody):
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::error):
(WebCore::FetchResponse::redirect):
(WebCore::FetchResponse::initializeWith):
* Modules/fetch/FetchResponse.h:
(WebCore::FetchResponse::create):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/ChangeLog 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-02-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Refactor FetchBody constructors
+ https://bugs.webkit.org/show_bug.cgi?id=154721
+
+ Reviewed by Sam Weinig and Darin Adler.
+
+ Covered by existing tests.
+
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::extract): Renamed from "fromJSValue"
+ (WebCore::FetchBody::extractFromBody): Renamed from "fromRequestBody" and making use of move constructor.
+ * Modules/fetch/FetchBody.h:
+ (WebCore::FetchBody::FetchBody): Making default constructor public and removing empty static method.
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::buildBody):
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::error):
+ (WebCore::FetchResponse::redirect):
+ (WebCore::FetchResponse::initializeWith):
+ * Modules/fetch/FetchResponse.h:
+ (WebCore::FetchResponse::create):
+
</ins><span class="cx"> 2016-02-28 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> ::slotted doesn't work in nested shadow trees
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FetchBody FetchBody::fromJSValue(JSC::ExecState& state, JSC::JSValue value)
</del><ins>+FetchBody FetchBody::extract(JSC::ExecState& state, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> if (value.inherits(JSBlob::info()))
</span><span class="cx"> return FetchBody(*JSBlob::toWrapped(value));
</span><span class="lines">@@ -69,27 +69,16 @@
</span><span class="cx"> return FetchBody(*JSDOMFormData::toWrapped(value));
</span><span class="cx"> if (value.isString())
</span><span class="cx"> return FetchBody(value.toWTFString(&state));
</span><del>- return FetchBody();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Once FetchResponse is added, check whether using a move constructor instead.
-// Ensure whether resetting m_mimeType to the empty string be not observable.
-FetchBody FetchBody::fromRequestBody(FetchBody* body)
</del><ins>+FetchBody FetchBody::extractFromBody(FetchBody* body)
</ins><span class="cx"> {
</span><span class="cx"> if (!body)
</span><del>- return FetchBody();
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- FetchBody result;
- result.m_type = body->m_type;
- result.m_mimeType = body->m_mimeType;
-
- result.m_blob = WTFMove(body->m_blob);
- result.m_formData = WTFMove(body->m_formData);
- result.m_text = WTFMove(body->m_text);
-
</del><span class="cx"> body->m_isDisturbed = true;
</span><del>-
- return result;
</del><ins>+ return FetchBody(WTFMove(*body));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline bool FetchBody::processIfEmptyOrDisturbed(DOMPromise<T, ExceptionCode>& promise)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -68,9 +68,9 @@
</span><span class="cx"> void setMimeType(const String& mimeType) { m_mimeType = mimeType; }
</span><span class="cx"> String mimeType() const { return m_mimeType; }
</span><span class="cx">
</span><del>- static FetchBody fromJSValue(JSC::ExecState&, JSC::JSValue);
- static FetchBody fromRequestBody(FetchBody*);
- static FetchBody empty() { return FetchBody(); }
</del><ins>+ static FetchBody extract(JSC::ExecState&, JSC::JSValue);
+ static FetchBody extractFromBody(FetchBody*);
+ FetchBody() = default;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> template<typename T> bool processIfEmptyOrDisturbed(DOMPromise<T, ExceptionCode>&);
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> FetchBody(Ref<Blob>&&);
</span><span class="cx"> FetchBody(Ref<DOMFormData>&&);
</span><span class="cx"> FetchBody(String&&);
</span><del>- FetchBody() { }
</del><span class="cx">
</span><span class="cx"> Type m_type = Type::None;
</span><span class="cx"> String m_mimeType;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::JSValue value;
</span><span class="cx"> bool hasInitBody = init.get("body", value);
</span><del>- FetchBody body = hasInitBody ? FetchBody::fromJSValue(*init.execState(), value) : FetchBody::fromRequestBody(inputBody);
</del><ins>+ FetchBody body = hasInitBody ? FetchBody::extract(*init.execState(), value) : FetchBody::extractFromBody(inputBody);
</ins><span class="cx">
</span><span class="cx"> String type = headers.fastGet(HTTPHeaderName::ContentType);
</span><span class="cx"> if (hasInitBody && type.isEmpty() && !body.mimeType().isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<FetchResponse> FetchResponse::error()
</span><span class="cx"> {
</span><del>- return adoptRef(*new FetchResponse(Type::Error, FetchBody::empty(), FetchHeaders::create(FetchHeaders::Guard::Immutable), ResourceResponse()));
</del><ins>+ return adoptRef(*new FetchResponse(Type::Error, { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), ResourceResponse()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<FetchResponse> FetchResponse::redirect(ScriptExecutionContext* context, const String& url, int status, ExceptionCode& ec)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> ec = TypeError;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- RefPtr<FetchResponse> redirectResponse = adoptRef(*new FetchResponse(Type::Default, FetchBody::empty(), FetchHeaders::create(FetchHeaders::Guard::Immutable), ResourceResponse()));
</del><ins>+ RefPtr<FetchResponse> redirectResponse = adoptRef(*new FetchResponse(Type::Default, { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), ResourceResponse()));
</ins><span class="cx"> redirectResponse->m_response.setHTTPStatusCode(status);
</span><span class="cx"> redirectResponse->m_headers->fastSet(HTTPHeaderName::Location, requestURL.string());
</span><span class="cx"> return redirectResponse;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> ec = TypeError;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_body = FetchBody::fromJSValue(*init.execState(), body);
</del><ins>+ m_body = FetchBody::extract(*init.execState(), body);
</ins><span class="cx"> if (m_headers->fastGet(HTTPHeaderName::ContentType).isEmpty() && !m_body.mimeType().isEmpty())
</span><span class="cx"> m_headers->fastSet(HTTPHeaderName::ContentType, m_body.mimeType());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (197346 => 197347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-02-29 11:47:14 UTC (rev 197346)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-02-29 13:01:51 UTC (rev 197347)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class FetchResponse : public RefCounted<FetchResponse> {
</span><span class="cx"> public:
</span><del>- static Ref<FetchResponse> create() { return adoptRef(*new FetchResponse(Type::Default, FetchBody::empty(), FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</del><ins>+ static Ref<FetchResponse> create() { return adoptRef(*new FetchResponse(Type::Default, { }, FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</ins><span class="cx"> static Ref<FetchResponse> error();
</span><span class="cx"> static RefPtr<FetchResponse> redirect(ScriptExecutionContext*, const String&, int, ExceptionCode&);
</span><span class="cx"> // FIXME: Binding generator should not require below method to handle optional status parameter.
</span></span></pre>
</div>
</div>
</body>
</html>