| Index: Source/core/dom/MessagePort.h
|
| diff --git a/Source/core/dom/MessagePort.h b/Source/core/dom/MessagePort.h
|
| index 648f574979ad82604683fd83065beb61c631aa4e..781c9bb1eff6fd24e644156b4a7c0ae778ed33b5 100644
|
| --- a/Source/core/dom/MessagePort.h
|
| +++ b/Source/core/dom/MessagePort.h
|
| @@ -51,7 +51,7 @@ class ExecutionContext;
|
| class SerializedScriptValue;
|
|
|
| // The overwhelmingly common case is sending a single port, so handle that efficiently with an inline buffer of size 1.
|
| -typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray;
|
| +typedef WillBeHeapVector<RefPtrWillBeMember<MessagePort>, 1> MessagePortArray;
|
|
|
| // Not to be confused with blink::WebMessagePortChannelArray; this one uses Vector and OwnPtr instead of WebVector and raw pointers.
|
| typedef Vector<OwnPtr<blink::WebMessagePortChannel>, 1> MessagePortChannelArray;
|
| @@ -76,13 +76,13 @@ public:
|
| PassOwnPtr<blink::WebMessagePortChannel> disentangle();
|
|
|
| static PassOwnPtr<blink::WebMessagePortChannelArray> toWebMessagePortChannelArray(PassOwnPtr<MessagePortChannelArray>);
|
| - static PassOwnPtr<MessagePortArray> toMessagePortArray(ExecutionContext*, const blink::WebMessagePortChannelArray&);
|
| + static PassOwnPtrWillBeRawPtr<MessagePortArray> toMessagePortArray(ExecutionContext*, const blink::WebMessagePortChannelArray&);
|
|
|
| // Returns 0 if there is an exception, or if the passed-in array is 0/empty.
|
| static PassOwnPtr<MessagePortChannelArray> disentanglePorts(const MessagePortArray*, ExceptionState&);
|
|
|
| // Returns 0 if the passed array is 0/empty.
|
| - static PassOwnPtr<MessagePortArray> entanglePorts(ExecutionContext&, PassOwnPtr<MessagePortChannelArray>);
|
| + static PassOwnPtrWillBeRawPtr<MessagePortArray> entanglePorts(ExecutionContext&, PassOwnPtr<MessagePortChannelArray>);
|
|
|
| bool started() const { return m_started; }
|
|
|
|
|