Changeset 57276 in webkit

Timestamp:

Apr 8, 2010 7:28:32 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-04-08 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Correctly save number of properties when object being serialized
have properties in its prorotype.

​https://bugs.webkit.org/show_bug.cgi?id=37263

• bindings/v8/SerializedScriptValue.cpp: (WebCore::ZigZag::Serializer::AbstractObjectState::AbstractObjectState): (WebCore::ZigZag::Serializer::AbstractObjectState::advance):

2010-04-08 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Test that object with ptototype can be sent as message.

​https://bugs.webkit.org/show_bug.cgi?id=37263

• fast/dom/Window/window-postmessage-clone-expected.txt:
• fast/dom/Window/window-postmessage-clone.html:

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/v8/SerializedScriptValue.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-08  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Test that object with ptototype can be sent as message.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37263
+
+        * fast/dom/Window/window-postmessage-clone-expected.txt:
+        * fast/dom/Window/window-postmessage-clone.html:
+
 2010-04-08  Kent Tamura  <tkent@chromium.org>
 

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

@@ -16 +16 @@
 PASS: eventData is null of type object
 PASS: eventData is 2009-02-13T23:31:30.000Z of type object
+PASS: eventData is [object Object] 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

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

@@ -93 +93 @@
 window.addEventListener('message', onmessage, false);
 
+function ConstructorWithPrototype(s) {
+    this.field = s;
+}
+
+ConstructorWithPrototype.prototype = {
+    protoProperty: 2010
+};
+
 function tryPostMessage(message, shouldThrow, expected) {
     try {
@@ -122 +130 @@
 tryPostMessage('(function(){})', false, 'null');
 tryPostMessage('new Date(1234567890000)');
+tryPostMessage('new ConstructorWithPrototype("foo")', false, '({field:"foo"})');
 cyclicObject={};
 cyclicObject.self = cyclicObject;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-08  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Correctly save number of properties when object being serialized
+        have properties in its prorotype.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37263
+
+        * bindings/v8/SerializedScriptValue.cpp:
+        (WebCore::ZigZag::Serializer::AbstractObjectState::AbstractObjectState):
+        (WebCore::ZigZag::Serializer::AbstractObjectState::advance):
+
 2010-04-08  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/bindings/v8/SerializedScriptValue.cpp

@@ -385 +385 @@
             , m_propertyNames(object->GetPropertyNames())
             , m_index(-1)
+            , m_numSerializedProperties(0)
             , m_nameDone(false)
         {
@@ -410 +411 @@
                 m_nameDone = false;
                 m_propertyName.Clear();
+                ++m_numSerializedProperties;
                 if (StateBase* newState = serializer.doSerialize(value, this))
                     return newState;
             }
-            return objectDone(m_index, serializer);
+            return objectDone(m_numSerializedProperties, serializer);
         }
 
@@ -423 +425 @@
         v8::Local<v8::Value> m_propertyName;
         unsigned m_index;
+        unsigned m_numSerializedProperties;
         bool m_nameDone;
     };