Changeset 163810 in webkit

Timestamp:

Feb 10, 2014, 1:37:00 PM (11 years ago)

Author:

ap@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBObjectStore.cpp (modified) (4 diffs)
• bindings/js/IDBBindingUtilities.cpp (modified) (2 diffs)
• bindings/js/SerializedScriptValue.cpp (modified) (1 diff)
• bindings/js/SerializedScriptValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2014-02-10  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp

@@ -133 +133 @@
     if (m_deleted) {
         ec = IDBDatabaseException::InvalidStateError;
-        return 0;
-    }
-    if (!m_transaction->isActive()) {
-        ec = IDBDatabaseException::TransactionInactiveError;
-        return 0;
+        return nullptr;
+    }
+    if (!m_transaction->isActive()) {
+        ec = IDBDatabaseException::TransactionInactiveError;
+        return nullptr;
     }
     if (m_transaction->isReadOnly()) {
         ec = IDBDatabaseException::ReadOnlyError;
-        return 0;
-    }
-
-    // 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;
-    }
+        return nullptr;
+    }
+
+    RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(state, value.jsValue(), nullptr, nullptr);
+    if (state->hadException())
+        return nullptr;
 
     if (serializedValue->blobURLs().size() > 0) {
         // FIXME: Add Blob/File/FileList support
         ec = IDBDatabaseException::DataCloneError;
-        return 0;
+        return nullptr;
     }
 
@@ -167 +163 @@
     if (putMode != IDBDatabaseBackend::CursorUpdate && usesInLineKeys && key) {
         ec = IDBDatabaseException::DataError;
-        return 0;
+        return nullptr;
     }
     if (!usesInLineKeys && !hasKeyGenerator && !key) {
         ec = IDBDatabaseException::DataError;
-        return 0;
+        return nullptr;
     }
     if (usesInLineKeys) {
@@ -177 +173 @@
         if (keyPathKey && !keyPathKey->isValid()) {
             ec = IDBDatabaseException::DataError;
-            return 0;
+            return nullptr;
         }
         if (!hasKeyGenerator && !keyPathKey) {
             ec = IDBDatabaseException::DataError;
-            return 0;
+            return nullptr;
         }
         if (hasKeyGenerator && !keyPathKey) {
             if (!canInjectIDBKeyIntoScriptValue(&requestState, value, keyPath)) {
                 ec = IDBDatabaseException::DataError;
-                return 0;
+                return nullptr;
             }
         }
@@ -194 +190 @@
     if (key && !key->isValid()) {
         ec = IDBDatabaseException::DataError;
-        return 0;
+        return nullptr;
     }
 

trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp

@@ -300 +300 @@
     ExecState* exec = requestState->exec();
     RefPtr<SerializedScriptValue> serializedValue = prpValue;
+    JSValue result;
     if (serializedValue)
-        return SerializedScriptValue::deserialize(exec, serializedValue.get(), NonThrowing);
-    return Deprecated::ScriptValue(exec->vm(), jsNull());
+        result = serializedValue->deserialize(exec, exec->lexicalGlobalObject(), 0);
+    else
+        result = jsNull();
+    return Deprecated::ScriptValue(exec->vm(), result);
 }
 
@@ -325 +328 @@
     }
 
+    JSValue result;
     if (buffer.size()) {
         RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::createFromWireBytes(buffer);
-        return SerializedScriptValue::deserialize(exec, serializedValue.get(), NonThrowing);
-    }
-
-    return Deprecated::ScriptValue(exec->vm(), jsNull());
+        result = serializedValue->deserialize(exec, exec->lexicalGlobalObject(), 0, NonThrowing);
+    } else
+        result = jsNull();
+
+    return Deprecated::ScriptValue(exec->vm(), result);
 }
 

trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -2617 +2617 @@
 }
 
-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));
-}
-
 void SerializedScriptValue::maybeThrowExceptionIfSerializationFailed(ExecState* exec, SerializationReturnCode code)
 {

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -80 +80 @@
     JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
 
-    static PassRefPtr<SerializedScriptValue> create(const Deprecated::ScriptValue&, JSC::ExecState*, MessagePortArray*, ArrayBufferArray*, bool& didThrow);
-    static Deprecated::ScriptValue deserialize(JSC::ExecState*, SerializedScriptValue*, SerializationErrorMode = Throwing);
-
     static uint32_t wireFormatVersion();