<!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>[163732] 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/163732">163732</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 17:21:32 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some unused functions from SerializedScriptValue
https://bugs.webkit.org/show_bug.cgi?id=128407
Reviewed by Oliver Hunt.
Removed more unused code, particularly in API helpers. Renamed one serialize()
function to create(), because it does the same thing as other create() functions.
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::put):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::SerializedScriptValue::create):
(WebCore::SerializedScriptValue::deserialize):
* bindings/js/SerializedScriptValue.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValueh">trunk/Source/WebCore/bindings/js/SerializedScriptValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163731 => 163732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-02-09 01:13:50 UTC (rev 163731)
+++ trunk/Source/WebCore/ChangeLog        2014-02-09 01:21:32 UTC (rev 163732)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-08 Alexey Proskuryakov <ap@apple.com>
+
+ Remove some unused functions from SerializedScriptValue
+ https://bugs.webkit.org/show_bug.cgi?id=128407
+
+ Reviewed by Oliver Hunt.
+
+ Removed more unused code, particularly in API helpers. Renamed one serialize()
+ function to create(), because it does the same thing as other create() functions.
+
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::put):
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::SerializedScriptValue::create):
+ (WebCore::SerializedScriptValue::deserialize):
+ * bindings/js/SerializedScriptValue.h:
+
</ins><span class="cx"> 2014-02-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: storage/indexeddb/mozilla/versionchange-abort.html fails
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (163731 => 163732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp        2014-02-09 01:13:50 UTC (rev 163731)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp        2014-02-09 01:21:32 UTC (rev 163732)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Expose the JS engine exception state through ScriptState.
</span><span class="cx"> bool didThrow = false;
</span><del>- RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::serialize(value, state, nullptr, nullptr, didThrow);
</del><ins>+ RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(value, state, nullptr, nullptr, didThrow);
</ins><span class="cx"> if (didThrow) {
</span><span class="cx"> // Setting an explicit ExceptionCode here would defer handling the already thrown exception.
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (163731 => 163732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp        2014-02-09 01:13:50 UTC (rev 163731)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp        2014-02-09 01:21:32 UTC (rev 163732)
</span><span class="lines">@@ -2564,14 +2564,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(JSContextRef originContext, JSValueRef apiValue,
- MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers,
- JSValueRef* exception)
</del><ins>+PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(JSContextRef originContext, JSValueRef apiValue, JSValueRef* exception)
</ins><span class="cx"> {
</span><span class="cx"> ExecState* exec = toJS(originContext);
</span><span class="cx"> APIEntryShim entryShim(exec);
</span><span class="cx"> JSValue value = toJS(exec, apiValue);
</span><del>- RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(exec, value, messagePorts, arrayBuffers);
</del><ins>+ RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(exec, value, nullptr, nullptr);
</ins><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> if (exception)
</span><span class="cx"> *exception = toRef(exec, exec->exception());
</span><span class="lines">@@ -2582,12 +2580,6 @@
</span><span class="cx"> return serializedValue.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(JSContextRef originContext, JSValueRef apiValue,
- JSValueRef* exception)
-{
- return create(originContext, apiValue, 0, 0, exception);
-}
-
</del><span class="cx"> String SerializedScriptValue::toString()
</span><span class="cx"> {
</span><span class="cx"> return CloneDeserializer::deserializeString(m_data);
</span><span class="lines">@@ -2603,11 +2595,11 @@
</span><span class="cx"> return result.first;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception, MessagePortArray* messagePorts)
</del><ins>+JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception)
</ins><span class="cx"> {
</span><span class="cx"> ExecState* exec = toJS(destinationContext);
</span><span class="cx"> APIEntryShim entryShim(exec);
</span><del>- JSValue value = deserialize(exec, exec->lexicalGlobalObject(), messagePorts);
</del><ins>+ JSValue value = deserialize(exec, exec->lexicalGlobalObject(), nullptr);
</ins><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> if (exception)
</span><span class="cx"> *exception = toRef(exec, exec->exception());
</span><span class="lines">@@ -2618,32 +2610,14 @@
</span><span class="cx"> return toRef(exec, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception)
-{
- return deserialize(destinationContext, exception, 0);
-}
-
</del><span class="cx"> PassRefPtr<SerializedScriptValue> SerializedScriptValue::nullValue()
</span><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> buffer;
</span><span class="cx"> return adoptRef(new SerializedScriptValue(buffer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SerializedScriptValue> SerializedScriptValue::booleanValue(bool value)
</del><ins>+PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const Deprecated::ScriptValue& value, JSC::ExecState* scriptState, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThrow)
</ins><span class="cx"> {
</span><del>- Vector<uint8_t> buffer;
- CloneSerializer::serializeBoolean(value, buffer);
- return adoptRef(new SerializedScriptValue(buffer));
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::serialize(const Deprecated::ScriptValue& value, JSC::ExecState* scriptState, SerializationErrorMode throwExceptions)
-{
- return SerializedScriptValue::create(scriptState, value.jsValue(), nullptr, nullptr, throwExceptions);
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::serialize(const Deprecated::ScriptValue& value, JSC::ExecState* scriptState, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThrow)
-{
</del><span class="cx"> RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(scriptState, value.jsValue(), messagePorts, arrayBuffers);
</span><span class="cx"> didThrow = scriptState->hadException();
</span><span class="cx"> return serializedValue.release();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (163731 => 163732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h        2014-02-09 01:13:50 UTC (rev 163731)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h        2014-02-09 01:21:32 UTC (rev 163732)
</span><span class="lines">@@ -68,8 +68,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SerializedScriptValue> create(JSC::ExecState*, JSC::JSValue, MessagePortArray*, ArrayBufferArray*, SerializationErrorMode = Throwing);
</span><del>- static PassRefPtr<SerializedScriptValue> create(JSContextRef, JSValueRef, MessagePortArray*, ArrayBufferArray*, JSValueRef* exception);
- static PassRefPtr<SerializedScriptValue> create(JSContextRef, JSValueRef, JSValueRef* exception);
</del><span class="cx">
</span><span class="cx"> static PassRefPtr<SerializedScriptValue> create(const String&);
</span><span class="cx"> static PassRefPtr<SerializedScriptValue> adopt(Vector<uint8_t>& buffer)
</span><span class="lines">@@ -78,18 +76,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SerializedScriptValue> nullValue();
</span><del>- static PassRefPtr<SerializedScriptValue> booleanValue(bool value);
</del><span class="cx">
</span><del>- static PassRefPtr<SerializedScriptValue> serialize(const Deprecated::ScriptValue&, JSC::ExecState*, SerializationErrorMode = Throwing);
- static PassRefPtr<SerializedScriptValue> serialize(const Deprecated::ScriptValue&, JSC::ExecState*, MessagePortArray*, ArrayBufferArray*, bool&);
</del><ins>+ JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
+
+ static PassRefPtr<SerializedScriptValue> create(const Deprecated::ScriptValue&, JSC::ExecState*, MessagePortArray*, ArrayBufferArray*, bool& didThrow);
</ins><span class="cx"> static Deprecated::ScriptValue deserialize(JSC::ExecState*, SerializedScriptValue*, SerializationErrorMode = Throwing);
</span><span class="cx">
</span><span class="cx"> static uint32_t wireFormatVersion();
</span><span class="cx">
</span><span class="cx"> String toString();
</span><del>-
- JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
- JSValueRef deserialize(JSContextRef, JSValueRef* exception, MessagePortArray*);
</del><ins>+
+ // API implementation helpers. These don't expose special behavior for ArrayBuffers or MessagePorts.
+ static PassRefPtr<SerializedScriptValue> create(JSContextRef, JSValueRef, JSValueRef* exception);
</ins><span class="cx"> JSValueRef deserialize(JSContextRef, JSValueRef* exception);
</span><span class="cx">
</span><span class="cx"> const Vector<uint8_t>& data() const { return m_data; }
</span><span class="lines">@@ -119,6 +117,7 @@
</span><span class="cx"> SerializedScriptValue(Vector<unsigned char>&);
</span><span class="cx"> SerializedScriptValue(Vector<unsigned char>&, Vector<String>& blobURLs);
</span><span class="cx"> SerializedScriptValue(Vector<unsigned char>&, Vector<String>& blobURLs, PassOwnPtr<ArrayBufferContentsArray>);
</span><ins>+
</ins><span class="cx"> Vector<unsigned char> m_data;
</span><span class="cx"> OwnPtr<ArrayBufferContentsArray> m_arrayBufferContentsArray;
</span><span class="cx"> Vector<String> m_blobURLs;
</span></span></pre>
</div>
</div>
</body>
</html>