Changeset 94004 in webkit

Timestamp:

Aug 29, 2011, 12:35:08 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] Add ability to do static SerializedScriptValue deserialization
​https://bugs.webkit.org/show_bug.cgi?id=66877

Patch by Greg Billock <​gbillock@google.com> on 2011-08-29
Reviewed by Darin Fisher.

• public/WebSerializedScriptValue.h:
• src/WebSerializedScriptValue.cpp:

(WebKit::WebSerializedScriptValue::deserialize):
(WebKit::WebSerializedScriptValue::serialize):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebSerializedScriptValue.h (modified) (3 diffs)
• src/WebSerializedScriptValue.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-29  Greg Billock  <gbillock@google.com>
+
+        [Chromium] Add ability to do static SerializedScriptValue deserialization
+        https://bugs.webkit.org/show_bug.cgi?id=66877
+
+        Reviewed by Darin Fisher.
+
+        * public/WebSerializedScriptValue.h:
+        * src/WebSerializedScriptValue.cpp:
+        (WebKit::WebSerializedScriptValue::deserialize):
+        (WebKit::WebSerializedScriptValue::serialize):
+
 2011-08-27  Peter Beverloo  <peter@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h

@@ -37 +37 @@
 namespace WebCore { class SerializedScriptValue; }
 
+#if WEBKIT_USING_V8
+namespace v8 {
+class Value;
+template <class T> class Handle;
+}
+#endif
+
 namespace WebKit {
 class WebString;
+
 
 class WebSerializedScriptValue {
@@ -54 +62 @@
     WEBKIT_EXPORT static WebSerializedScriptValue fromString(const WebString&);
 
+#if WEBKIT_USING_V8
+    WEBKIT_EXPORT static WebSerializedScriptValue serialize(v8::Handle<v8::Value>);
+#endif
+
     // Create a WebSerializedScriptValue that represents a serialization error.
     WEBKIT_EXPORT static WebSerializedScriptValue createInvalid();
@@ -64 +76 @@
     // Returns a string representation of the WebSerializedScriptValue.
     WEBKIT_EXPORT WebString toString() const;
+
+#if WEBKIT_USING_V8
+    // Convert the serialized value to a parsed v8 value.
+    WEBKIT_EXPORT v8::Handle<v8::Value> deserialize();
+#endif
 
 #if WEBKIT_IMPLEMENTATION

trunk/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp

@@ -44 +44 @@
 }
 
+#if WEBKIT_USING_V8
+WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Value> value)
+{
+    bool didThrow;
+    WebSerializedScriptValue v = SerializedScriptValue::create(value, didThrow);
+    if (didThrow)
+      return createInvalid();
+    return v;
+}
+#endif
+
 WebSerializedScriptValue WebSerializedScriptValue::createInvalid()
 {
@@ -64 +75 @@
 }
 
+#if WEBKIT_USING_V8
+v8::Handle<v8::Value> WebSerializedScriptValue::deserialize()
+{
+    return m_private->deserialize();
+}
+#endif
+
 WebSerializedScriptValue::WebSerializedScriptValue(const PassRefPtr<SerializedScriptValue>& value)
     : m_private(value)