Stop storing ScriptValue in MessageEvent

third_party/WebKit/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 37 matching lines @@
   auto private_cached_data =
       V8PrivateProperty::GetMessageEventCachedData(isolate);
   v8::Local<v8::Value> cached_data =
       private_cached_data.GetOrEmpty(info.Holder());
   if (!cached_data.IsEmpty()) {
     V8SetReturnValue(info, cached_data);
     return;
   }
 
   MessageEvent* event = V8MessageEvent::toImpl(info.Holder());
+  ScriptState* script_state = ScriptState::Current(isolate);
 
   v8::Local<v8::Value> result;
   switch (event->GetDataType()) {
-    case MessageEvent::kDataTypeScriptValue:
-      result =
-          event->DataAsScriptValue().V8ValueFor(ScriptState::Current(isolate));
+    case MessageEvent::kDataTypeV8Reference:
+      result = event->DataAsScriptValue(script_state).V8Value();
       if (result.IsEmpty())
         result = v8::Null(isolate);
       break;
 
     case MessageEvent::kDataTypeSerializedScriptValue:
       if (SerializedScriptValue* serialized_value =
               event->DataAsSerializedScriptValue()) {
         MessagePortArray ports = event->ports();
         SerializedScriptValue::DeserializeOptions options;
         options.message_ports = &ports;
@@ skipping 45 matching lines @@
       V8EventTarget::toImplWithTypeCheck(info.GetIsolate(), info[6]);
   MessagePortArray* port_array = nullptr;
   const int kPortArrayIndex = 7;
   if (!IsUndefinedOrNull(info[kPortArrayIndex])) {
     port_array = new MessagePortArray;
     *port_array = NativeValueTraits<IDLSequence<MessagePort>>::NativeValue(
         info.GetIsolate(), info[kPortArrayIndex], exception_state);
     if (exception_state.HadException())
       return;
   }
-  event->initMessageEvent(
-      type_arg, can_bubble_arg, cancelable_arg,
-      ScriptValue(ScriptState::Current(info.GetIsolate()), data_arg),
-      origin_arg, last_event_id_arg, source_arg, port_array);
+  ScriptState* script_state = ScriptState::Current(info.GetIsolate());
+  event->initMessageEvent(script_state, type_arg, can_bubble_arg,
+                          cancelable_arg, ScriptValue(script_state, data_arg),
+                          origin_arg, last_event_id_arg, source_arg,
+                          port_array);
 }
 
 }  // namespace blink