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

Source/bindings/v8/custom/V8CustomEventCustom.cpp

 /*
  * Copyright (C) 2012 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "V8CustomEvent.h"
 
 #include "V8Event.h"
 #include "bindings/v8/Dictionary.h"
 #include "bindings/v8/ScriptState.h"
-#include "bindings/v8/ScriptValue.h"
+#include "bindings/v8/SerializedScriptValue.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8DOMWrapper.h"
 #include "bindings/v8/V8HiddenPropertyName.h"
 #include "core/dom/ContextFeatures.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/page/Frame.h"
 #include "RuntimeEnabledFeatures.h"
 
 namespace WebCore {
 
 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8::Handle<v8::Value> detail)
 {
     customEvent->SetHiddenValue(V8HiddenPropertyName::detail(), detail);
     return detail;
 }
 
 
 void V8CustomEvent::detailAttrGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     CustomEvent* event = V8CustomEvent::toNative(info.Holder());
 
     v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropertyName::detail());
 
     if (!result.IsEmpty()) {
         v8SetReturnValue(info, result);
         return;
     }
 
-    SerializedScriptValue* serialized = event->serializedScriptValue();
-    if (serialized) {
-        result = serialized->deserialize();
+    if (!event->serializedScriptValue()) {
+        // If we're in an isolated world and the event was created in the main world,
+        // we need to find the 'detail' property on the main world wrapper and clone it.
+        v8::Local<v8::Value> mainWorldDetail = getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenPropertyName::detail());
+        if (!mainWorldDetail.IsEmpty())
+            event->setSerializedDetail(SerializedScriptValue::createAndSwallowExceptions(mainWorldDetail, info.GetIsolate()));
+    }
+
+    if (event->serializedScriptValue()) {
+        result = event->serializedScriptValue()->deserialize();
         v8SetReturnValue(info, cacheState(info.Holder(), result));
         return;
     }
 
     v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate())));
 }
 
 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     CustomEvent* event = V8CustomEvent::toNative(args.Holder());
     ASSERT(!event->serializedScriptValue());
 
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, args[0]);
     V8TRYCATCH_VOID(bool, canBubbleArg, args[1]->BooleanValue());
     V8TRYCATCH_VOID(bool, cancelableArg, args[2]->BooleanValue());
     v8::Handle<v8::Value> detailsArg = args[3];
 
-    args.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(), detailsArg);
     event->initEvent(typeArg, canBubbleArg, cancelableArg);
+
+    if (!detailsArg.IsEmpty()) {
+        args.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(), detailsArg);
+        if (isolatedWorldForIsolate(args.GetIsolate()))
+            event->setSerializedDetail(SerializedScriptValue::createAndSwallowExceptions(detailsArg, args.GetIsolate()));
+    }
 }
 
 } // namespace WebCore