[webkit-changes] [163667] trunk/Source/WebCore

Fri, 07 Feb 2014 17:05:14 -0800

Title: [163667] trunk/Source/WebCore
Revision
163667
Author
[email protected]
Date
2014-02-07 17:09:56 -0800 (Fri, 07 Feb 2014)

Log Message

Remove some unused functions from SerializedScriptValue
https://bugs.webkit.org/show_bug.cgi?id=128407

Reviewed by Anders Carlsson.

* bindings/js/SerializedScriptValue.cpp:
(WebCore::SerializedScriptValue::undefinedValue):
(WebCore::SerializedScriptValue::nullValue):
* bindings/js/SerializedScriptValue.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (163666 => 163667)


--- trunk/Source/WebCore/ChangeLog	2014-02-08 00:58:08 UTC (rev 163666)
+++ trunk/Source/WebCore/ChangeLog	2014-02-08 01:09:56 UTC (rev 163667)
@@ -1,3 +1,15 @@
+2014-02-07  Alexey Proskuryakov  <[email protected]>
+
+        Remove some unused functions from SerializedScriptValue
+        https://bugs.webkit.org/show_bug.cgi?id=128407
+
+        Reviewed by Anders Carlsson.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::undefinedValue):
+        (WebCore::SerializedScriptValue::nullValue):
+        * bindings/js/SerializedScriptValue.h:
+
 2014-02-07  Brady Eidson  <[email protected]>
 
         IDB: Some Mozilla cursor mutation tests fail

Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (163666 => 163667)


--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp	2014-02-08 00:58:08 UTC (rev 163666)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp	2014-02-08 01:09:56 UTC (rev 163667)
@@ -2540,12 +2540,6 @@
     return adoptRef(new SerializedScriptValue(buffer, blobURLs, arrayBufferContentsArray.release()));
 }
 
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create()
-{
-    Vector<uint8_t> buffer;
-    return adoptRef(new SerializedScriptValue(buffer));
-}
-
 PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(const String& string)
 {
     Vector<uint8_t> buffer;
@@ -2555,11 +2549,6 @@
 }
 
 #if ENABLE(INDEXED_DATABASE)
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(JSC::ExecState* exec, JSC::JSValue value)
-{
-    return SerializedScriptValue::create(exec, value, 0, 0);
-}
-
 PassRefPtr<SerializedScriptValue> SerializedScriptValue::numberValue(double value)
 {
     Vector<uint8_t> buffer;
@@ -2567,9 +2556,11 @@
     return adoptRef(new SerializedScriptValue(buffer));
 }
 
-JSValue SerializedScriptValue::deserialize(JSC::ExecState* exec, JSC::JSGlobalObject* globalObject)
+PassRefPtr<SerializedScriptValue> SerializedScriptValue::undefinedValue()
 {
-    return deserialize(exec, globalObject, 0);
+    Vector<uint8_t> buffer;
+    CloneSerializer::serializeUndefined(buffer);
+    return adoptRef(new SerializedScriptValue(buffer));
 }
 #endif
 
@@ -2612,14 +2603,6 @@
     return result.first;
 }
 
-#if ENABLE(INSPECTOR)
-Deprecated::ScriptValue SerializedScriptValue::deserializeForInspector(JSC::ExecState* scriptState)
-{
-    JSValue value = deserialize(scriptState, scriptState->lexicalGlobalObject(), 0);
-    return Deprecated::ScriptValue(scriptState->vm(), value);
-}
-#endif
-
 JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception, MessagePortArray* messagePorts)
 {
     ExecState* exec = toJS(destinationContext);
@@ -2643,13 +2626,7 @@
 
 PassRefPtr<SerializedScriptValue> SerializedScriptValue::nullValue()
 {
-    return SerializedScriptValue::create();
-}
-
-PassRefPtr<SerializedScriptValue> SerializedScriptValue::undefinedValue()
-{
     Vector<uint8_t> buffer;
-    CloneSerializer::serializeUndefined(buffer);
     return adoptRef(new SerializedScriptValue(buffer));
 }

Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (163666 => 163667)


--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2014-02-08 00:58:08 UTC (rev 163666)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2014-02-08 01:09:56 UTC (rev 163667)
@@ -77,9 +77,7 @@
         return adoptRef(new SerializedScriptValue(buffer));
     }
 
-    static PassRefPtr<SerializedScriptValue> create();
     static PassRefPtr<SerializedScriptValue> nullValue();
-    static PassRefPtr<SerializedScriptValue> undefinedValue();
     static PassRefPtr<SerializedScriptValue> booleanValue(bool value);
 
     static PassRefPtr<SerializedScriptValue> serialize(const Deprecated::ScriptValue&, JSC::ExecState*, SerializationErrorMode = Throwing);
@@ -94,17 +92,13 @@
     JSValueRef deserialize(JSContextRef, JSValueRef* exception, MessagePortArray*);
     JSValueRef deserialize(JSContextRef, JSValueRef* exception);
 
-#if ENABLE(INSPECTOR)
-    Deprecated::ScriptValue deserializeForInspector(JSC::ExecState*);
-#endif
-
     const Vector<uint8_t>& data() const { return m_data; }
     const Vector<String>& blobURLs() const { return m_blobURLs; }
 
 #if ENABLE(INDEXED_DATABASE)
-    static PassRefPtr<SerializedScriptValue> create(JSC::ExecState*, JSC::JSValue);
+    // FIXME: Get rid of these. The only caller immediately deserializes the result, so it's a very roundabout way to create a JSValue.
     static PassRefPtr<SerializedScriptValue> numberValue(double value);
-    JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*);
+    static PassRefPtr<SerializedScriptValue> undefinedValue();
 #endif
 
     static PassRefPtr<SerializedScriptValue> createFromWireBytes(const Vector<uint8_t>& data)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to