Changeset 56877 in webkit

Timestamp:

Mar 31, 2010 5:09:55 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Vitaly Repeshko <​vitalyr@chromium.org>

Reviewed by David Levin.

[V8] SerializedScriptValue must be deserialized only once and in the right context
​https://bugs.webkit.org/show_bug.cgi?id=36892

See also ​https://bugs.webkit.org/show_bug.cgi?id=34227 for the
corresponding JSC change.

General idea: SerializedScriptValue must be deserialized only once
and in the context of the intended MessageEvent recepient. The
approach we take for now is to eagerly deserialize when a
JavaScript wrapper for MessageEvent is created.

A better fix would be to keep a reference to the context in
MessageEvent and use it when lazily deserializing. It's harder to
do since the API doesn't have a clean method to have such a reference.

Tested by fast/dom/Window/window-postmessage-clone-frames.html. This
test still fails but only for the types which we can't serialize yet.

• bindings/scripts/CodeGeneratorV8.pm:
• bindings/v8/SerializedScriptValue.h: (WebCore::SerializedScriptValue::deserializeAndSetProperty):
• bindings/v8/custom/V8MessageEventCustom.cpp: (WebCore::V8MessageEvent::initMessageEventCallback):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (7 diffs)
• bindings/v8/SerializedScriptValue.h (modified) (1 diff)
• bindings/v8/custom/V8MessageEventCustom.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-31  Vitaly Repeshko  <vitalyr@chromium.org>
+
+        Reviewed by David Levin.
+
+        [V8] SerializedScriptValue must be deserialized only once and in the right context
+        https://bugs.webkit.org/show_bug.cgi?id=36892
+
+        See also https://bugs.webkit.org/show_bug.cgi?id=34227 for the
+        corresponding JSC change.
+
+        General idea: SerializedScriptValue must be deserialized only once
+        and in the context of the intended MessageEvent recepient. The
+        approach we take for now is to eagerly deserialize when a
+        JavaScript wrapper for MessageEvent is created.
+
+        A better fix would be to keep a reference to the context in
+        MessageEvent and use it when lazily deserializing. It's harder to
+        do since the API doesn't have a clean method to have such a reference.
+
+        Tested by fast/dom/Window/window-postmessage-clone-frames.html. This
+        test still fails but only for the types which we can't serialize yet.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValue::deserializeAndSetProperty):
+        * bindings/v8/custom/V8MessageEventCustom.cpp:
+        (WebCore::V8MessageEvent::initMessageEventCallback):
+
 2010-03-31  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -1142 +1142 @@
     my $attrExt = $attribute->signature->extendedAttributes;
 
+    # Attributes of type SerializedScriptValue are set in the
+    # constructor and don't require callbacks.
+    return if ($attribute->signature->type eq "SerializedScriptValue");
+
     my $accessControl = "v8::DEFAULT";
     if ($attrExt->{"DoNotCheckDomainSecurityOnGet"}) {
@@ -1468 +1472 @@
 
     my $hasConstructors = 0;
+    my $serializedAttribute;
     # Generate property accessors for attributes.
     for ($index = 0; $index < @{$dataNode->attributes}; $index++) {
@@ -1485 +1490 @@
         if ($attrType eq "EventListener" && $interfaceName eq "DOMWindow") {
             $attribute->signature->extendedAttributes->{"v8OnProto"} = 1;
+        }
+
+        # Attributes of type SerializedScriptValue are set in the
+        # constructor and don't require callbacks.
+        if ($attrType eq "SerializedScriptValue") {
+            die "Only one attribute of type SerializedScriptValue supported" if $serializedAttribute;
+            $implIncludes{"SerializedScriptValue.h"} = 1;
+            $serializedAttribute = $attribute;
+            next;
         }
 
@@ -1912 +1926 @@
     }
 
-    GenerateToV8Converters($dataNode, $interfaceName, $className, $nativeType);
+    GenerateToV8Converters($dataNode, $interfaceName, $className, $nativeType, $serializedAttribute);
 
     push(@implContent, <<END);
@@ -1941 +1955 @@
     my $className = shift;
     my $nativeType = shift;
+    my $serializedAttribute = shift;
 
     my $domMapFunction = GetDomMapFunction($dataNode, $interfaceName);
@@ -1994 +2009 @@
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
 END
-
     if (IsNodeSubType($dataNode)) {
         push(@implContent, <<END);
@@ -2008 +2022 @@
 END
     push(@implContent, "\n    impl->ref();\n") if IsRefPtrType($interfaceName);
+
+    # Eagerly deserialize attributes of type SerializedScriptValue
+    # while we're in the right context.
+    if ($serializedAttribute) {
+        die "Attribute of type SerializedScriptValue expected" if $serializedAttribute->signature->type ne "SerializedScriptValue";
+        my $attrName = $serializedAttribute->signature->name;
+        my $attrAttr = "v8::DontDelete";
+        if ($serializedAttribute->type =~ /^readonly/) {
+            $attrAttr .= " | v8::ReadOnly";
+        }
+        $attrAttr = "static_cast<v8::PropertyAttribute>($attrAttr)";
+        my $getterFunc = $codeGenerator->WK_lcfirst($attrName);
+        push(@implContent, <<END);
+    SerializedScriptValue::deserializeAndSetProperty(wrapper, "${attrName}", ${attrAttr}, impl->${getterFunc}());
+END
+    }
 
     if ($domMapFunction) {

trunk/WebCore/bindings/v8/SerializedScriptValue.h

@@ -41 +41 @@
 class SerializedScriptValue : public RefCounted<SerializedScriptValue> {
 public:
+    // Deserializes the given value and sets it as a property on the
+    // object.
+    static void deserializeAndSetProperty(v8::Handle<v8::Object> object,
+                                          const char* propertyName,
+                                          v8::PropertyAttribute attribute,
+                                          SerializedScriptValue* value)
+    {
+        ASSERT(value);
+        v8::Handle<v8::Value> deserialized = value->deserialize();
+        object->ForceSet(v8::String::NewSymbol(propertyName), deserialized, attribute);
+    }
+
     // Creates a serialized representation of the given V8 value.
     static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value> value)

trunk/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp

@@ -85 +85 @@
     }
     event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, dataArg.release(), originArg, lastEventIdArg, sourceArg, portArray.release());
+    v8::PropertyAttribute dataAttr = static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly);
+    SerializedScriptValue::deserializeAndSetProperty(args.Holder(), "data", dataAttr, event->data());
     return v8::Undefined();
   }