Oilpan: fix build after r195134.

Source/bindings/core/v8/PageScriptDebugServer.cpp

 /*
  * Copyright (c) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 static LocalFrame* retrieveFrameWithGlobalObjectCheck(v8::Local<v8::Context> context)
 {
     return toLocalFrame(toFrameIfNotDetached(context));
 }
 
+// TODO(Oilpan): avoid keeping a raw reference separate from the
+// owner one; does not enable heap-movable objects.
 PageScriptDebugServer* PageScriptDebugServer::s_instance = nullptr;

[haraken, 2015/05/09 14:37:28]

This looks nasty, not only in oilpan but also in non-oilpan. Can we probably
instantiate the instance using DEFINE_STATIC_LOCAL?

 
 PageScriptDebugServer::PageScriptDebugServer(PassOwnPtr<ClientMessageLoop> clientMessageLoop, v8::Isolate* isolate)
-    : PerIsolateDebuggerClient(isolate, adoptPtr(new ScriptDebugServer(isolate, this)))
+    : PerIsolateDebuggerClient(isolate, ScriptDebugServer::create(isolate, this))
     , m_clientMessageLoop(clientMessageLoop)
     , m_pausedFrame(nullptr)
 {
     MutexLocker locker(creationMutex());
     ASSERT(!s_instance);
     s_instance = this;
 }
 
 PageScriptDebugServer::~PageScriptDebugServer()
 {
     MutexLocker locker(creationMutex());
     ASSERT(s_instance == this);
     s_instance = nullptr;
 }
 
 Mutex& PageScriptDebugServer::creationMutex()
 {
     AtomicallyInitializedStaticReference(Mutex, mutex, (new Mutex));
     return mutex;
 }
 
+DEFINE_TRACE(PageScriptDebugServer)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_pausedFrame);
+    visitor->trace(m_listenersMap);
+#endif
+    PerIsolateDebuggerClient::trace(visitor);
+}
+
 void PageScriptDebugServer::setContextDebugData(v8::Local<v8::Context> context, const String& type, int contextDebugId)
 {
     String debugData = "[" + type + "," + String::number(contextDebugId) + "]";
     ScriptDebugServer::setContextDebugData(context, debugData);
 }
 
 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, LocalFrame* localFrameRoot, int contextDebugId)
 {
     ASSERT(localFrameRoot == localFrameRoot->localFrameRoot());
 
@@ skipping 59 matching lines @@
 
     m_pausedFrame = 0;
 }
 
 void PageScriptDebugServer::quitMessageLoopOnPause()
 {
     m_clientMessageLoop->quitNow();
 }
 
 } // namespace blink