Remove remaining traces of ServiceWorkerMessageEvent

third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp

Index: third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp
diff --git a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp
index 0db1d181d584560408a86aba2546431bb22a5ce0..baa6cc160aecfed171c755797fcb502e11c1aaf7 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp
@@ -4,21 +4,94 @@
 
 #include "bindings/modules/v8/V8ExtendableMessageEvent.h"
 
+#include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/modules/v8/V8ExtendableMessageEventInit.h"
-#include "bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h"
 
 namespace blink {
 
 void V8ExtendableMessageEvent::constructorCustom(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
-  V8ServiceWorkerMessageEventInternal::ConstructorCustom<
-      ExtendableMessageEvent, ExtendableMessageEventInit>(info);
+  v8::Isolate* isolate = info.GetIsolate();
+  ExceptionState exception_state(isolate, ExceptionState::kConstructionContext,
+                                 "ExtendableMessageEvent");
+  if (UNLIKELY(info.Length() < 1)) {
+    exception_state.ThrowTypeError(
+        ExceptionMessages::NotEnoughArguments(1, info.Length()));
+    return;
+  }
+
+  V8StringResource<> type = info[0];
+  if (!type.Prepare())
+    return;
+
+  ExtendableMessageEventInit event_init_dict;
+  if (!IsUndefinedOrNull(info[1])) {
+    if (!info[1]->IsObject()) {
+      exception_state.ThrowTypeError(
+          "parameter 2 ('eventInitDict') is not an object.");
+      return;
+    }
+    V8ExtendableMessageEventInit::toImpl(isolate, info[1], event_init_dict,
+                                         exception_state);
+    if (exception_state.HadException())
+      return;
+  }
+
+  ExtendableMessageEvent* impl =
+      ExtendableMessageEvent::Create(type, event_init_dict);
+  v8::Local<v8::Object> wrapper = info.Holder();
+  wrapper = impl->AssociateWithWrapper(
+      isolate, &V8ExtendableMessageEvent::wrapperTypeInfo, wrapper);
+
+  // TODO(bashi): Workaround for http://crbug.com/529941. We need to store
+  // |data| as a private value to avoid cyclic references.
+  if (event_init_dict.hasData()) {
+    v8::Local<v8::Value> v8_data = event_init_dict.data().V8Value();
+    V8PrivateProperty::GetMessageEventCachedData(isolate).Set(wrapper, v8_data);
+    if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) {
+      impl->SetSerializedData(
+          SerializedScriptValue::SerializeAndSwallowExceptions(isolate,
+                                                               v8_data));
+    }
+  }
+  V8SetReturnValue(info, wrapper);
 }
 
 void V8ExtendableMessageEvent::dataAttributeGetterCustom(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
-  V8ServiceWorkerMessageEventInternal::DataAttributeGetterCustom<
-      ExtendableMessageEvent>(info);
+  ExtendableMessageEvent* event =
+      V8ExtendableMessageEvent::toImpl(info.Holder());
+  v8::Isolate* isolate = info.GetIsolate();
+  auto private_cached_data =
+      V8PrivateProperty::GetMessageEventCachedData(isolate);
+  v8::Local<v8::Value> result = private_cached_data.GetOrEmpty(info.Holder());
+  if (!result.IsEmpty()) {
+    V8SetReturnValue(info, result);
+    return;
+  }
+
+  v8::Local<v8::Value> data;
+  if (SerializedScriptValue* serialized_value = event->SerializedData()) {
+    MessagePortArray ports = event->ports();
+    SerializedScriptValue::DeserializeOptions options;
+    options.message_ports = &ports;
+    data = serialized_value->Deserialize(isolate, options);
+  } else if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) {
+    v8::Local<v8::Value> main_world_data =
+        private_cached_data.GetFromMainWorld(event);
+    if (!main_world_data.IsEmpty()) {
+      // TODO(bashi): Enter the main world's ScriptState::Scope while
+      // serializing the main world's value.
+      event->SetSerializedData(
+          SerializedScriptValue::SerializeAndSwallowExceptions(
+              info.GetIsolate(), main_world_data));
+      data = event->SerializedData()->Deserialize(isolate);
+    }
+  }
+  if (data.IsEmpty())
+    data = v8::Null(isolate);
+  private_cached_data.Set(info.Holder(), data);
+  V8SetReturnValue(info, data);
 }
 
 }  // namespace blink