Oilpan: move core/workers to oilpan's heap.

Source/core/dom/MessagePort.h

 /*
  * 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 13 matching lines @@
  *
  */
 
 #ifndef MessagePort_h
 #define MessagePort_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventListener.h"
 #include "core/events/EventTarget.h"
+#include "heap/Handle.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebMessagePortChannelClient.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
 
 namespace WebCore {
 
 class Event;
 class ExceptionState;
 class Frame;
 class MessagePort;
 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;
 
 // 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;
 
-class MessagePort FINAL : public RefCounted<MessagePort>
+class MessagePort FINAL : public RefCountedWillBeRefCountedGarbageCollected<MessagePort>
     , public ActiveDOMObject
     , public EventTargetWithInlineData
     , public ScriptWrappable
     , public blink::WebMessagePortChannelClient {
-    REFCOUNTED_EVENT_TARGET(MessagePort);
+    DECLARE_GC_INFO;
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MessagePort>);
 public:
-    static PassRefPtr<MessagePort> create(ExecutionContext&);
+    static PassRefPtrWillBeRawPtr<MessagePort> create(ExecutionContext&);
     virtual ~MessagePort();
 
     void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionState&);
 
     void start();
     void close();
 
     void entangle(PassOwnPtr<blink::WebMessagePortChannel>);
     PassOwnPtr<blink::WebMessagePortChannel> disentangle();
 
@@ skipping 19 matching lines @@
         start();
     }
     EventListener* onmessage() { return getAttributeEventListener(EventTypeNames::message); }
 
     // A port starts out its life entangled, and remains entangled until it is closed or is cloned.
     bool isEntangled() const { return !m_closed && !isNeutered(); }
 
     // A port gets neutered when it is transferred to a new owner via postMessage().
     bool isNeutered() const { return !m_entangledChannel; }
 
+    void trace(Visitor*) { }
+
 private:
     explicit MessagePort(ExecutionContext&);
 
     // WebMessagePortChannelClient implementation.
     virtual void messageAvailable() OVERRIDE;
     void dispatchMessages();
 
     OwnPtr<blink::WebMessagePortChannel> m_entangledChannel;

[Mads Ager (chromium), 2014/02/24 13:27:53]

This doesn't actually point back to a WebCore MessageChannel, right?

 
     bool m_started;
     bool m_closed;
 
     WeakPtrFactory<MessagePort> m_weakFactory;

[Mads Ager (chromium), 2014/02/24 13:27:53]

Down the line we should use real weak pointers provided by the oilpan system for
this. I think this will work for now, but we really should get rid of it and
just hand out raw pointers that are put in WeakMembers. That requires the
holders of those pointers to be in the heap as well so we probably cannot do it
yet. These places are luckily easy to find when they have been explicitly
implemented with the WeakPtrFactory, so that is really nice.

[haraken, 2014/02/24 13:28:36]

Shouldn't this become a WeakMember<MessagePort> ?

 };
 
 } // namespace WebCore
 
 #endif // MessagePort_h