Re-land: bindings: Use MessageEventInit for MessageEvent constructor

Source/bindings/core/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 31 matching lines @@
 #include "core/events/MessageEvent.h"
 
 namespace blink {
 
 void V8MessageEvent::dataAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     MessageEvent* event = V8MessageEvent::toImpl(info.Holder());
 
     v8::Local<v8::Value> result;
     switch (event->dataType()) {
-    case MessageEvent::DataTypeScriptValue: {
-        result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::data(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 = V8HiddenValue::getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::data(info.GetIsolate()));
-                if (!mainWorldData.IsEmpty())
-                    event->setSerializedData(SerializedScriptValueFactory::instance().createAndSwallowExceptions(info.GetIsolate(), mainWorldData));
-            }
-            if (event->dataAsSerializedScriptValue())
-                result = event->dataAsSerializedScriptValue()->deserialize(info.GetIsolate());
-            else
-                result = v8::Null(info.GetIsolate());
-        }
+    case MessageEvent::DataTypeScriptValue:
+        result = event->dataAsScriptValue().v8ValueFor(ScriptState::current(info.GetIsolate()));
+        if (result.IsEmpty())
+            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());
         }
         break;
 
@@ skipping 12 matching lines @@
 
     case MessageEvent::DataTypeArrayBuffer:
         result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::arrayBufferData(info.GetIsolate()));
         if (result.IsEmpty())
             result = toV8(event->dataAsArrayBuffer(), info.Holder(), info.GetIsolate());
         break;
     }
 
     // Overwrite the data attribute so it returns the cached result in future invocations.
     // This custom getter handler will not be called again.
+    // TODO(bashi): We use ForceSet() here, and we use hidden values in other
+    // places (e.g. V8CustomEventCustom.cpp). We should use the same way to
+    // handle "any" attributes.
     v8::PropertyAttribute dataAttr = static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly);
     if (!v8CallBoolean(info.Holder()->ForceSet(info.GetIsolate()->GetCurrentContext(), v8AtomicString(info.GetIsolate(), "data"), result, dataAttr))) {
         v8SetReturnValue(info, v8::Null(info.GetIsolate()));
         return;
     }
     v8SetReturnValue(info, result);
 }
 
 void V8MessageEvent::initMessageEventMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
@@ skipping 10 matching lines @@
     TOSTRING_VOID(V8StringResource<>, lastEventIdArg, info[5]);
     DOMWindow* sourceArg = toDOMWindow(info.GetIsolate(), info[6]);
     OwnPtrWillBeRawPtr<MessagePortArray> portArray = nullptr;
     const int portArrayIndex = 7;
     if (!isUndefinedOrNull(info[portArrayIndex])) {
         portArray = adoptPtrWillBeNoop(new MessagePortArray);
         *portArray = toRefPtrWillBeMemberNativeArray<MessagePort, V8MessagePort>(info[portArrayIndex], portArrayIndex + 1, info.GetIsolate(), exceptionState);
         if (exceptionState.throwIfNeeded())
             return;
     }
-    event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, lastEventIdArg, sourceArg, portArray.release());
-
-    if (!dataArg.IsEmpty()) {
-        V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::data(info.GetIsolate()), dataArg);
-        if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld())
-            event->setSerializedData(SerializedScriptValueFactory::instance().createAndSwallowExceptions(info.GetIsolate(), dataArg));
-    }
+    event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, ScriptValue(ScriptState::current(info.GetIsolate()), dataArg), originArg, lastEventIdArg, sourceArg, portArray.release());
 }
 
 } // namespace blink