<!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>[190398] 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/190398">190398</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-10-01 01:12:40 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Binding generator should make mutable CachedAttribute member fields
https://bugs.webkit.org/show_bug.cgi?id=148056
Reviewed by Chris Dumez.
Making mutable CachedAttribute member fields.
Removing const_cast from custom binding code.
Rebased bindings tests.
No change in behavior.
* bindings/js/JSHistoryCustom.cpp:
(WebCore::JSHistory::state):
* bindings/js/JSMessageEventCustom.cpp:
(WebCore::JSMessageEvent::data):
* bindings/js/JSPopStateEventCustom.cpp:
(WebCore::cacheState):
(WebCore::JSPopStateEvent::state):
* bindings/js/JSReadableStreamReaderEventCustom.cpp:
(WebCore::JSReadableStreamReader::closed):
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::response):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHistoryCustomcpp">trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessageEventCustomcpp">trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSPopStateEventCustomcpp">trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSXMLHttpRequestCustomcpp">trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfaceh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/ChangeLog 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Binding generator should make mutable CachedAttribute member fields
+ https://bugs.webkit.org/show_bug.cgi?id=148056
+
+ Reviewed by Chris Dumez.
+
+ Making mutable CachedAttribute member fields.
+ Removing const_cast from custom binding code.
+ Rebased bindings tests.
+
+ No change in behavior.
+
+ * bindings/js/JSHistoryCustom.cpp:
+ (WebCore::JSHistory::state):
+ * bindings/js/JSMessageEventCustom.cpp:
+ (WebCore::JSMessageEvent::data):
+ * bindings/js/JSPopStateEventCustom.cpp:
+ (WebCore::cacheState):
+ (WebCore::JSPopStateEvent::state):
+ * bindings/js/JSReadableStreamReaderEventCustom.cpp:
+ (WebCore::JSReadableStreamReader::closed):
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::response):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
+
</ins><span class="cx"> 2015-10-01 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Create ByteLengthQueuingStrategy object as per spec
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHistoryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SerializedScriptValue> serialized = history.state();
</span><span class="cx"> JSValue result = serialized ? serialized->deserialize(&state, globalObject(), 0) : jsNull();
</span><del>- const_cast<JSHistory*>(this)->m_state.set(state.vm(), this, result);
</del><ins>+ m_state.set(state.vm(), this, result);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessageEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Save the result so we don't have to deserialize the value again.
</span><del>- const_cast<JSMessageEvent*>(this)->m_data.set(state.vm(), this, result);
</del><ins>+ m_data.set(state.vm(), this, result);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSPopStateEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // Save the state value to the m_state member of a JSPopStateEvent, and return it, for convenience.
</span><del>-static const JSValue& cacheState(ExecState& state, JSPopStateEvent* event, const JSValue& eventState)
</del><ins>+static const JSValue& cacheState(ExecState& state, const JSPopStateEvent* event, const JSValue& eventState)
</ins><span class="cx"> {
</span><span class="cx"> event->m_state.set(state.vm(), event, eventState);
</span><span class="cx"> return eventState;
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> eventState = jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return cacheState(state, const_cast<JSPopStateEvent*>(this), eventState);
</del><ins>+ return cacheState(state, this, eventState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> History* history = event.history();
</span><span class="cx"> if (!history || !event.serializedState())
</span><del>- return cacheState(state, const_cast<JSPopStateEvent*>(this), jsNull());
</del><ins>+ return cacheState(state, this, jsNull());
</ins><span class="cx">
</span><span class="cx"> // There's no cached value from a previous invocation, nor a state value was provided by the
</span><span class="cx"> // event, but there is a history object, so first we need to see if the state object has been
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> } else
</span><span class="cx"> result = event.serializedState()->deserialize(&state, globalObject(), 0);
</span><span class="cx">
</span><del>- return cacheState(state, const_cast<JSPopStateEvent*>(this), result);
</del><ins>+ return cacheState(state, this, result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_closed) {
</span><span class="cx"> JSPromiseDeferred* closedPromise = JSPromiseDeferred::create(&state, globalObject());
</span><del>- const_cast<JSReadableStreamReader*>(this)->m_closed.set(state.vm(), this, closedPromise->promise());
</del><ins>+ m_closed.set(state.vm(), this, closedPromise->promise());
</ins><span class="cx"> impl().closed(DeferredWrapper(&state, globalObject(), closedPromise));
</span><span class="cx"> }
</span><span class="cx"> return m_closed.get();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSXMLHttpRequestCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -196,8 +196,7 @@
</span><span class="cx"> JSValue value = JSONParse(&state, impl().responseTextIgnoringResponseType());
</span><span class="cx"> if (!value)
</span><span class="cx"> value = jsNull();
</span><del>- JSXMLHttpRequest* jsRequest = const_cast<JSXMLHttpRequest*>(this);
- jsRequest->m_response.set(state.vm(), jsRequest, value);
</del><ins>+ m_response.set(state.vm(), this, value);
</ins><span class="cx">
</span><span class="cx"> impl().didCacheResponseJSON();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -1114,7 +1114,7 @@
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
</span><span class="cx"> push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
</span><del>- push(@headerContent, " JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
</del><ins>+ push(@headerContent, " mutable JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
</ins><span class="cx"> $numCachedAttributes++;
</span><span class="cx"> $needsVisitChildren = 1;
</span><span class="cx"> push(@headerContent, "#endif\n") if $conditionalString;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, JSC::JSGlobalObject*);
</span><del>- JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute1;
- JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute2;
</del><ins>+ mutable JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute1;
+ mutable JSC::WriteBarrier<JSC::Unknown> m_cachedAttribute2;
</ins><span class="cx"> static void visitChildren(JSCell*, JSC::SlotVisitor&);
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h (190397 => 190398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2015-10-01 08:00:14 UTC (rev 190397)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2015-10-01 08:12:40 UTC (rev 190398)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue getConstructor(JSC::VM&, JSC::JSGlobalObject*);
</span><del>- JSC::WriteBarrier<JSC::Unknown> m_cachedValue;
- JSC::WriteBarrier<JSC::Unknown> m_cachedReadonlyValue;
</del><ins>+ mutable JSC::WriteBarrier<JSC::Unknown> m_cachedValue;
+ mutable JSC::WriteBarrier<JSC::Unknown> m_cachedReadonlyValue;
</ins><span class="cx"> static void visitChildren(JSCell*, JSC::SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> TestSerializedScriptValueInterface& impl() const { return *m_impl; }
</span></span></pre>
</div>
</div>
</body>
</html>