| Index: third_party/WebKit/Source/core/events/MessageEvent.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/MessageEvent.cpp b/third_party/WebKit/Source/core/events/MessageEvent.cpp
|
| index 5fef430f20da7493a01c606e9d5c83ae34d36e93..43da489d5e2d0d2ef40d535608282d370e89eb4e 100644
|
| --- a/third_party/WebKit/Source/core/events/MessageEvent.cpp
|
| +++ b/third_party/WebKit/Source/core/events/MessageEvent.cpp
|
| @@ -54,14 +54,14 @@ MessageEvent::MessageEvent(const AtomicString& type, const MessageEventInit& ini
|
| m_origin = initializer.origin();
|
| if (initializer.hasLastEventId())
|
| m_lastEventId = initializer.lastEventId();
|
| - if (initializer.hasSource() && isValidSource(initializer.source().get()))
|
| + if (initializer.hasSource() && isValidSource(initializer.source()))
|
| m_source = initializer.source();
|
| if (initializer.hasPorts())
|
| m_ports = new MessagePortArray(initializer.ports());
|
| ASSERT(isValidSource(m_source.get()));
|
| }
|
|
|
| -MessageEvent::MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, MessagePortArray* ports, const String& suborigin)
|
| +MessageEvent::MessageEvent(const String& origin, const String& lastEventId, RawPtr<EventTarget> source, MessagePortArray* ports, const String& suborigin)
|
| : Event(EventTypeNames::message, false, false)
|
| , m_dataType(DataTypeScriptValue)
|
| , m_origin(origin)
|
| @@ -72,7 +72,7 @@ MessageEvent::MessageEvent(const String& origin, const String& lastEventId, Pass
|
| ASSERT(isValidSource(m_source.get()));
|
| }
|
|
|
| -MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, MessagePortArray* ports, const String& suborigin)
|
| +MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, RawPtr<EventTarget> source, MessagePortArray* ports, const String& suborigin)
|
| : Event(EventTypeNames::message, false, false)
|
| , m_dataType(DataTypeSerializedScriptValue)
|
| , m_dataAsSerializedScriptValue(data)
|
| @@ -86,7 +86,7 @@ MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String&
|
| ASSERT(isValidSource(m_source.get()));
|
| }
|
|
|
| -MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr<MessagePortChannelArray> channels, const String& suborigin)
|
| +MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, RawPtr<EventTarget> source, PassOwnPtr<MessagePortChannelArray> channels, const String& suborigin)
|
| : Event(EventTypeNames::message, false, false)
|
| , m_dataType(DataTypeSerializedScriptValue)
|
| , m_dataAsSerializedScriptValue(data)
|
| @@ -129,13 +129,13 @@ MessageEvent::~MessageEvent()
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<MessageEvent> MessageEvent::create(const AtomicString& type, const MessageEventInit& initializer, ExceptionState& exceptionState)
|
| +RawPtr<MessageEvent> MessageEvent::create(const AtomicString& type, const MessageEventInit& initializer, ExceptionState& exceptionState)
|
| {
|
| - if (initializer.source().get() && !isValidSource(initializer.source().get())) {
|
| + if (initializer.source() && !isValidSource(initializer.source())) {
|
| exceptionState.throwTypeError("The optional 'source' property is neither a Window nor MessagePort.");
|
| return nullptr;
|
| }
|
| - return adoptRefWillBeNoop(new MessageEvent(type, initializer));
|
| + return new MessageEvent(type, initializer);
|
| }
|
|
|
| void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, ScriptValue data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePortArray* ports)
|
|
|