Make 'any'-typed attributes of events available in isolated worlds

Source/bindings/v8/custom/V8MessageEventCustom.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 namespace WebCore {
 
 void V8MessageEvent::dataAttrGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     MessageEvent* event = V8MessageEvent::toNative(info.Holder());
 
     v8::Handle<v8::Value> result;
     switch (event->dataType()) {
     case MessageEvent::DataTypeScriptValue: {
         result = info.Holder()->GetHiddenValue(V8HiddenPropertyName::data());
-        if (result.IsEmpty())
-            result = v8::Null(info.GetIsolate());
+        if (result.IsEmpty()) {
+            if (!event->dataAsSerializedScriptValue()) {
+                // If we're in an isolated world and the event was created in the main world,
+                // we need to find the 'data' property on the main world wrapper and clone it.
+                v8::Local<v8::Value> mainWorldData = getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenPropertyName::data());
+                if (!mainWorldData.IsEmpty())
+                    event->setSerializedData(SerializedScriptValue::createAndSwallowExceptions(mainWorldData, info.GetIsolate()));
+            }
+            if (event->dataAsSerializedScriptValue())
+                result = event->dataAsSerializedScriptValue()->deserialize(info.GetIsolate());
+            else
+                result = v8::Null(info.GetIsolate());
+        }
         break;
     }
 
     case MessageEvent::DataTypeSerializedScriptValue:
         if (SerializedScriptValue* serializedValue = event->dataAsSerializedScriptValue()) {
             MessagePortArray ports = event->ports();
             result = serializedValue->deserialize(info.GetIsolate(), &ports);
         } else {
             result = v8::Null(info.GetIsolate());
         }
@@ skipping 38 matching lines @@
         if (!window.IsEmpty())
             sourceArg = V8Window::toNative(window);
     }
     OwnPtr<MessagePortArray> portArray;
 
     if (!isUndefinedOrNull(args[7])) {
         portArray = adoptPtr(new MessagePortArray);
         if (!getMessagePortArray(args[7], *portArray, args.GetIsolate()))
             return;
     }
-    args.Holder()->SetHiddenValue(V8HiddenPropertyName::data(), dataArg);
     event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, lastEventIdArg, sourceArg, portArray.release());
+
+    if (!dataArg.IsEmpty()) {
+        args.Holder()->SetHiddenValue(V8HiddenPropertyName::data(), dataArg);
+        if (isolatedWorldForIsolate(args.GetIsolate()))
+            event->setSerializedData(SerializedScriptValue::createAndSwallowExceptions(dataArg, args.GetIsolate()));
+    }
 }
 
 void V8MessageEvent::webkitInitMessageEventMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     initMessageEventMethodCustom(args);
 }
 
 
 } // namespace WebCore