<!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>[163810] 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/163810">163810</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 13:37:00 -0800 (Mon, 10 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 functions that used Deprecated::ScriptValue
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::put):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::deserializeIDBValue):
(WebCore::deserializeIDBValueBuffer):
* bindings/js/SerializedScriptValue.cpp:
* 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="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.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 (163809 => 163810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-10 21:11:03 UTC (rev 163809)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 21:37:00 UTC (rev 163810)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-10 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 functions that used Deprecated::ScriptValue
+
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::put):
+ * bindings/js/IDBBindingUtilities.cpp:
+ (WebCore::deserializeIDBValue):
+ (WebCore::deserializeIDBValueBuffer):
+ * bindings/js/SerializedScriptValue.cpp:
+ * bindings/js/SerializedScriptValue.h:
+
</ins><span class="cx"> 2014-02-10 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> [Windows] Unreviewed test fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (163809 => 163810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2014-02-10 21:11:03 UTC (rev 163809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2014-02-10 21:37:00 UTC (rev 163810)
</span><span class="lines">@@ -132,29 +132,25 @@
</span><span class="cx"> RefPtr<IDBKey> key = prpKey;
</span><span class="cx"> if (m_deleted) {
</span><span class="cx"> ec = IDBDatabaseException::InvalidStateError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!m_transaction->isActive()) {
</span><span class="cx"> ec = IDBDatabaseException::TransactionInactiveError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (m_transaction->isReadOnly()) {
</span><span class="cx"> ec = IDBDatabaseException::ReadOnlyError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Expose the JS engine exception state through ScriptState.
- bool didThrow = false;
- RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(value, state, nullptr, nullptr, didThrow);
- if (didThrow) {
- // Setting an explicit ExceptionCode here would defer handling the already thrown exception.
- return 0;
- }
</del><ins>+ RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(state, value.jsValue(), nullptr, nullptr);
+ if (state->hadException())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (serializedValue->blobURLs().size() > 0) {
</span><span class="cx"> // FIXME: Add Blob/File/FileList support
</span><span class="cx"> ec = IDBDatabaseException::DataCloneError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBKeyPath& keyPath = m_metadata.keyPath;
</span><span class="lines">@@ -166,26 +162,26 @@
</span><span class="cx">
</span><span class="cx"> if (putMode != IDBDatabaseBackend::CursorUpdate && usesInLineKeys && key) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!usesInLineKeys && !hasKeyGenerator && !key) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (usesInLineKeys) {
</span><span class="cx"> RefPtr<IDBKey> keyPathKey = createIDBKeyFromScriptValueAndKeyPath(requestState.exec(), value, keyPath);
</span><span class="cx"> if (keyPathKey && !keyPathKey->isValid()) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!hasKeyGenerator && !keyPathKey) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (hasKeyGenerator && !keyPathKey) {
</span><span class="cx"> if (!canInjectIDBKeyIntoScriptValue(&requestState, value, keyPath)) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (keyPathKey)
</span><span class="lines">@@ -193,7 +189,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (key && !key->isValid()) {
</span><span class="cx"> ec = IDBDatabaseException::DataError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<int64_t> indexIds;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (163809 => 163810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2014-02-10 21:11:03 UTC (rev 163809)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2014-02-10 21:37:00 UTC (rev 163810)
</span><span class="lines">@@ -299,9 +299,12 @@
</span><span class="cx"> {
</span><span class="cx"> ExecState* exec = requestState->exec();
</span><span class="cx"> RefPtr<SerializedScriptValue> serializedValue = prpValue;
</span><ins>+ JSValue result;
</ins><span class="cx"> if (serializedValue)
</span><del>- return SerializedScriptValue::deserialize(exec, serializedValue.get(), NonThrowing);
- return Deprecated::ScriptValue(exec->vm(), jsNull());
</del><ins>+ result = serializedValue->deserialize(exec, exec->lexicalGlobalObject(), 0);
+ else
+ result = jsNull();
+ return Deprecated::ScriptValue(exec->vm(), result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue deserializeIDBValueBuffer(DOMRequestState* requestState, PassRefPtr<SharedBuffer> prpBuffer, bool keyIsDefined)
</span><span class="lines">@@ -324,12 +327,14 @@
</span><span class="cx"> return Deprecated::ScriptValue(exec->vm(), jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ JSValue result;
</ins><span class="cx"> if (buffer.size()) {
</span><span class="cx"> RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::createFromWireBytes(buffer);
</span><del>- return SerializedScriptValue::deserialize(exec, serializedValue.get(), NonThrowing);
- }
</del><ins>+ result = serializedValue->deserialize(exec, exec->lexicalGlobalObject(), 0, NonThrowing);
+ } else
+ result = jsNull();
</ins><span class="cx">
</span><del>- return Deprecated::ScriptValue(exec->vm(), jsNull());
</del><ins>+ return Deprecated::ScriptValue(exec->vm(), result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue idbKeyToScriptValue(DOMRequestState* requestState, PassRefPtr<IDBKey> key)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (163809 => 163810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-02-10 21:11:03 UTC (rev 163809)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-02-10 21:37:00 UTC (rev 163810)
</span><span class="lines">@@ -2616,18 +2616,6 @@
</span><span class="cx"> return adoptRef(new SerializedScriptValue(buffer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const Deprecated::ScriptValue& value, JSC::ExecState* scriptState, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThrow)
-{
- RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(scriptState, value.jsValue(), messagePorts, arrayBuffers);
- didThrow = scriptState->hadException();
- return serializedValue.release();
-}
-
-Deprecated::ScriptValue SerializedScriptValue::deserialize(JSC::ExecState* scriptState, SerializedScriptValue* value, SerializationErrorMode throwExceptions)
-{
- return Deprecated::ScriptValue(scriptState->vm(), value->deserialize(scriptState, scriptState->lexicalGlobalObject(), 0, throwExceptions));
-}
-
</del><span class="cx"> void SerializedScriptValue::maybeThrowExceptionIfSerializationFailed(ExecState* exec, SerializationReturnCode code)
</span><span class="cx"> {
</span><span class="cx"> if (code == SuccessfullyCompleted)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (163809 => 163810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2014-02-10 21:11:03 UTC (rev 163809)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2014-02-10 21:37:00 UTC (rev 163810)
</span><span class="lines">@@ -79,9 +79,6 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
</span><span class="cx">
</span><del>- static PassRefPtr<SerializedScriptValue> create(const Deprecated::ScriptValue&, JSC::ExecState*, MessagePortArray*, ArrayBufferArray*, bool& didThrow);
- static Deprecated::ScriptValue deserialize(JSC::ExecState*, SerializedScriptValue*, SerializationErrorMode = Throwing);
-
</del><span class="cx"> static uint32_t wireFormatVersion();
</span><span class="cx">
</span><span class="cx"> String toString();
</span></span></pre>
</div>
</div>
</body>
</html>