BASELINE: Update Chromium to 70.0.3538.78

Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 24 insertions, 5 deletions

diff --git a/chromium/third_party/blink/renderer/core/events/message_event.cc b/chromium/third_party/blink/renderer/core/events/message_event.cc
index c098abda392..1d32bb8d3df 100644
--- a/chromium/third_party/blink/renderer/core/events/message_event.cc
+++ b/chromium/third_party/blink/renderer/core/events/message_event.cc
@@ -30,6 +30,7 @@
 #include <memory>
 
 #include "third_party/blink/renderer/bindings/core/v8/v8_array_buffer.h"
+#include "third_party/blink/renderer/core/frame/user_activation.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_private_property.h"
 
@@ -78,6 +79,8 @@ MessageEvent::MessageEvent(const AtomicString& type,
     source_ = initializer.source();
   if (initializer.hasPorts())
     ports_ = new MessagePortArray(initializer.ports());
+  if (initializer.hasUserActivation())
+    user_activation_ = initializer.userActivation();
   DCHECK(IsValidSource(source_.Get()));
 }
 
@@ -98,7 +101,8 @@ MessageEvent::MessageEvent(scoped_refptr<SerializedScriptValue> data,
                            const String& origin,
                            const String& last_event_id,
                            EventTarget* source,
-                           MessagePortArray* ports)
+                           MessagePortArray* ports,
+                           UserActivation* user_activation)
     : Event(EventTypeNames::message, Bubbles::kNo, Cancelable::kNo),
       data_type_(kDataTypeSerializedScriptValue),
       data_as_serialized_script_value_(
@@ -106,7 +110,8 @@ MessageEvent::MessageEvent(scoped_refptr<SerializedScriptValue> data,
       origin_(origin),
       last_event_id_(last_event_id),
       source_(source),
-      ports_(ports) {
+      ports_(ports),
+      user_activation_(user_activation) {
   DCHECK(IsValidSource(source_.Get()));
 }
 
@@ -114,7 +119,8 @@ MessageEvent::MessageEvent(scoped_refptr<SerializedScriptValue> data,
                            const String& origin,
                            const String& last_event_id,
                            EventTarget* source,
-                           Vector<MessagePortChannel> channels)
+                           Vector<MessagePortChannel> channels,
+                           UserActivation* user_activation)
     : Event(EventTypeNames::message, Bubbles::kNo, Cancelable::kNo),
       data_type_(kDataTypeSerializedScriptValue),
       data_as_serialized_script_value_(
@@ -122,7 +128,16 @@ MessageEvent::MessageEvent(scoped_refptr<SerializedScriptValue> data,
       origin_(origin),
       last_event_id_(last_event_id),
       source_(source),
-      channels_(std::move(channels)) {
+      channels_(std::move(channels)),
+      user_activation_(user_activation) {
+  DCHECK(IsValidSource(source_.Get()));
+}
+
+MessageEvent::MessageEvent(const String& origin, EventTarget* source)
+    : Event(EventTypeNames::messageerror, Bubbles::kNo, Cancelable::kNo),
+      data_type_(kDataTypeNull),
+      origin_(origin),
+      source_(source) {
   DCHECK(IsValidSource(source_.Get()));
 }
 
@@ -186,7 +201,8 @@ void MessageEvent::initMessageEvent(const AtomicString& type,
                                     const String& origin,
                                     const String& last_event_id,
                                     EventTarget* source,
-                                    MessagePortArray* ports) {
+                                    MessagePortArray* ports,
+                                    UserActivation* user_activation) {
   if (IsBeingDispatched())
     return;
 
@@ -200,6 +216,7 @@ void MessageEvent::initMessageEvent(const AtomicString& type,
   source_ = source;
   ports_ = ports;
   is_ports_dirty_ = true;
+  user_activation_ = user_activation;
 }
 
 void MessageEvent::initMessageEvent(const AtomicString& type,
@@ -248,6 +265,7 @@ void MessageEvent::Trace(blink::Visitor* visitor) {
   visitor->Trace(data_as_array_buffer_);
   visitor->Trace(source_);
   visitor->Trace(ports_);
+  visitor->Trace(user_activation_);
   Event::Trace(visitor);
 }
 
@@ -261,6 +279,7 @@ v8::Local<v8::Object> MessageEvent::AssociateWithWrapper(
   // how much memory is used via the wrapper. To keep the wrapper alive, it's
   // set to the wrapper of the MessageEvent as a private value.
   switch (GetDataType()) {
+    case MessageEvent::kDataTypeNull:
     case MessageEvent::kDataTypeScriptValue:
     case MessageEvent::kDataTypeSerializedScriptValue:
       break;