Index: Source/core/events/MessageEvent.h |
diff --git a/Source/core/events/MessageEvent.h b/Source/core/events/MessageEvent.h |
index 966f620d413b5f27fd5074fb7c87f9a5ec223819..cae88b150aaef12248f078d01c8a2e6f2fb489a2 100644 |
--- a/Source/core/events/MessageEvent.h |
+++ b/Source/core/events/MessageEvent.h |
@@ -53,11 +53,11 @@ public: |
{ |
return adoptRefWillBeNoop(new MessageEvent); |
} |
- static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtr<MessagePortArray> ports, const String& origin = String(), const String& lastEventId = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr) |
+ static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtrWillBeRawPtr<MessagePortArray> ports, const String& origin = String(), const String& lastEventId = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr) |
{ |
return adoptRefWillBeNoop(new MessageEvent(origin, lastEventId, source, ports)); |
} |
- static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtr<MessagePortArray> ports, PassRefPtr<SerializedScriptValue> data, const String& origin = String(), const String& lastEventId = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr) |
+ static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtrWillBeRawPtr<MessagePortArray> ports, PassRefPtr<SerializedScriptValue> data, const String& origin = String(), const String& lastEventId = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr) |
{ |
return adoptRefWillBeNoop(new MessageEvent(data, origin, lastEventId, source, ports)); |
} |
@@ -80,8 +80,8 @@ public: |
static PassRefPtrWillBeRawPtr<MessageEvent> create(const AtomicString& type, const MessageEventInit& initializer, ExceptionState&); |
virtual ~MessageEvent(); |
- void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtr<MessagePortArray>); |
- void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtr<MessagePortArray>); |
+ void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray>); |
+ void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray>); |
const String& origin() const { return m_origin; } |
const String& lastEventId() const { return m_lastEventId; } |
@@ -118,8 +118,8 @@ public: |
private: |
MessageEvent(); |
MessageEvent(const AtomicString&, const MessageEventInit&); |
- MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr<MessagePortArray>); |
- MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr<MessagePortArray>); |
+ MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtrWillBeRawPtr<MessagePortArray>); |
+ MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtrWillBeRawPtr<MessagePortArray>); |
MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr<MessagePortChannelArray>); |
MessageEvent(const String& data, const String& origin); |
@@ -137,7 +137,7 @@ private: |
// m_ports are the MessagePorts in an engtangled state, and m_channels are |
// the MessageChannels in a disentangled state. Only one of them can be |
// non-empty at a time. entangleMessagePorts() moves between the states. |
- OwnPtr<MessagePortArray> m_ports; |
+ OwnPtrWillBeMember<MessagePortArray> m_ports; |
OwnPtr<MessagePortChannelArray> m_channels; |
}; |