Have MessagePort use Oilpan-based weak pointers.

third_party/WebKit/Source/core/dom/MessagePort.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 37 matching lines @@
     MessagePort* port = new MessagePort(executionContext);
     port->suspendIfNeeded();
     return port;
 }
 
 MessagePort::MessagePort(ExecutionContext& executionContext)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(&executionContext)
     , m_started(false)
     , m_closed(false)
-    , m_weakFactory(this)
 {
 }
 
 MessagePort::~MessagePort()
 {
     close();
     if (m_scriptStateForConversion)
         m_scriptStateForConversion->disposePerContextData();
 }
 
 void MessagePort::postMessage(ExecutionContext* context, PassRefPtr<SerializedScriptValue> message, const MessagePortArray& ports, ExceptionState& exceptionState)
 {
     if (!isEntangled())
         return;
     DCHECK(getExecutionContext());
     DCHECK(m_entangledChannel);
 
-    OwnPtr<MessagePortChannelArray> channels;
     // Make sure we aren't connected to any of the passed-in ports.
     for (unsigned i = 0; i < ports.size(); ++i) {
         if (ports[i] == this) {
             exceptionState.throwDOMException(DataCloneError, "Port at index " + String::number(i) + " contains the source port.");
             return;
         }
     }
-    channels = MessagePort::disentanglePorts(context, ports, exceptionState);
+    OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
     if (exceptionState.hadException())
         return;
 
     if (message->containsTransferableArrayBuffer())
         getExecutionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "MessagePort cannot send an ArrayBuffer as a transferable object yet. See http://crbug.com/334408"));
 
     WebString messageString = message->toWireString();
     OwnPtr<WebMessagePortChannelArray> webChannels = toWebMessagePortChannelArray(channels.release());
     m_entangledChannel->postMessage(messageString, webChannels.leakPtr());
 }
@@ skipping 24 matching lines @@
     DCHECK(m_entangledChannel);
     m_entangledChannel->setClient(0);
     return m_entangledChannel.release();
 }
 
 // Invoked to notify us that there are messages available for this port.
 // This code may be called from another thread, and so should not call any non-threadsafe APIs (i.e. should not call into the entangled channel or access mutable variables).
 void MessagePort::messageAvailable()
 {
     DCHECK(getExecutionContext());
-    getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&MessagePort::dispatchMessages, m_weakFactory.createWeakPtr()));
+    getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&MessagePort::dispatchMessages, CrossThreadWeakPersistentThisPointer<MessagePort>(this)));
 }
 
 void MessagePort::start()
 {
     // Do nothing if we've been cloned or closed.
     if (!isEntangled())
         return;
 
     DCHECK(getExecutionContext());
     if (m_started)
@@ skipping 145 matching lines @@
 {
     DCHECK(getExecutionContext());
     if (!m_scriptStateForConversion) {
         v8::Isolate* isolate = scriptIsolate();
         m_scriptStateForConversion = ScriptState::create(v8::Context::New(isolate), DOMWrapperWorld::create(isolate));
     }
     return m_scriptStateForConversion->context();
 }
 
 } // namespace blink