Changeset 51480 in webkit

Timestamp:

Nov 29, 2009 8:15:40 PM (14 years ago)

Author:

oliver@apple.com

Message:

postMessage should serialize File objects
​https://bugs.webkit.org/show_bug.cgi?id=31955

Reviewed by Sam Weinig.

Update SerializedScriptValue to include support for
File objects in the serialized object graph.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/window-postmessage-clone-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Window/window-postmessage-clone.html (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/SerializedScriptValue.cpp (modified) (4 diffs)
• WebCore/bindings/js/SerializedScriptValue.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-28  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        postMessage should serialize File objects
+        https://bugs.webkit.org/show_bug.cgi?id=31955
+
+        Add test for postMessage serialization of File objects.
+
+        * fast/dom/Window/window-postmessage-clone-expected.txt:
+        * fast/dom/Window/window-postmessage-clone.html:
+
 2009-11-29  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/dom/Window/window-postmessage-clone-expected.txt

@@ -17 +17 @@
 PASS: eventData is 2009-02-13T23:31:30.000Z of type object
 PASS: eventData is [object Array](default toString threw RangeError: Maximum call stack size exceeded.) of type object
+PASS: eventData is [object File] of type object
 PASS: eventData is done of type string
 

trunk/LayoutTests/fast/dom/Window/window-postmessage-clone.html

@@ -4 +4 @@
 <div id="description"></div>
 <div id="console"></div>
+<input type="file" id="fileInput"></input>
 <script>
 if (window.layoutTestController) {
@@ -124 +125 @@
 tryPostMessage('window', true);
 
+var fileInput = document.getElementById("fileInput");
+var fileRect = fileInput.getClientRects()[0];
+var targetX = fileRect.left + fileRect.width / 2;
+var targetY = fileRect.top + fileRect.height / 2;
+eventSender.beginDragWithFiles(['get-file-upload.html']);
+eventSender.mouseMoveTo(targetX, targetY);
+eventSender.mouseUp();
+
+tryPostMessage('fileInput.files[0]', false, fileInput.files[0]);
+
 tryPostMessage('"done"');
 </script>

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-28  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        postMessage should serialize File objects
+        https://bugs.webkit.org/show_bug.cgi?id=31955
+
+        Update SerializedScriptValue to include support for
+        File objects in the serialized object graph.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValueData::SerializedScriptValueData):
+        (WebCore::SerializingTreeWalker::convertIfTerminal):
+        (WebCore::DeserializingTreeWalker::convertIfTerminal):
+        * bindings/js/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValueData::):
+        (WebCore::SerializedScriptValueData::asString):
+
 2009-11-29  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -28 +28 @@
 #include "SerializedScriptValue.h"
 
+#include "File.h"
+#include "JSDOMGlobalObject.h"
+#include "JSFile.h"
+#include "JSFileList.h"
 #include <JavaScriptCore/APICast.h>
 #include <runtime/DateInstance.h>
@@ -147 +151 @@
     : m_type(ArrayType)
     , m_sharedData(data)
+{
+}
+
+SerializedScriptValueData::SerializedScriptValueData(const File* file)
+    : m_type(FileType)
+    , m_string(file->path().crossThreadString())
 {
 }
@@ -483 +493 @@
             return SerializedScriptValueData();
 
-        CallData unusedData;
-        if (value.isObject() && value.getCallData(unusedData) == CallTypeNone)
-            return SerializedScriptValueData();
-
+        if (value.isObject()) {
+            JSObject* obj = asObject(value);
+            if (obj->inherits(&JSFile::s_info))
+                return SerializedScriptValueData(toFile(obj));
+                
+            CallData unusedData;
+            if (value.getCallData(unusedData) == CallTypeNone)
+                return SerializedScriptValueData();
+        }
         // Any other types are expected to serialize as null.
         return SerializedScriptValueData(jsNull());
@@ -642 +657 @@
             case SerializedScriptValueData::DateType:
                 return new (m_exec) DateInstance(m_exec, value.asDouble());
+            case SerializedScriptValueData::FileType:
+                return toJS(m_exec, static_cast<JSDOMGlobalObject*>(m_exec->lexicalGlobalObject()), File::create(value.asString().crossThreadString()));
             default:
                 ASSERT_NOT_REACHED();

trunk/WebCore/bindings/js/SerializedScriptValue.h

@@ -34 +34 @@
 
 namespace WebCore {
+    class File;
     class SerializedObject;
     class SerializedArray;
@@ -55 +56 @@
             ObjectType,
             ArrayType,
-            StringType
+            StringType,
+            FileType
         };
 
@@ -78 +80 @@
         {
         }
+        
+        explicit SerializedScriptValueData(const File*);
 
         explicit SerializedScriptValueData(JSC::JSValue value)
@@ -109 +113 @@
         String asString() const
         {
-            ASSERT(m_type == StringType);
+            ASSERT(m_type == StringType || m_type == FileType);
             return m_string;
         }