Make ScriptStreamer and dependents Oilpan friendly.

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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/core/v8/PageScriptDebugServer.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
+#include "bindings/core/v8/ScriptPreprocessor.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ skipping 24 matching lines @@
     v8::Handle<v8::Value> global = V8Window::findInstanceInPrototypeChain(context->Global(), context->GetIsolate());
     if (global.IsEmpty())
         return 0;
 
     return toFrameIfNotDetached(context);
 }
 
 void PageScriptDebugServer::setPreprocessorSource(const String& preprocessorSource)
 {
     if (preprocessorSource.isEmpty())
-        m_preprocessorSourceCode.clear();
+        m_preprocessorSourceCode = nullptr;
     else
-        m_preprocessorSourceCode = adoptPtr(new ScriptSourceCode(preprocessorSource));
+        m_preprocessorSourceCode = ScriptSourceCode(preprocessorSource);
     m_scriptPreprocessor.clear();
 }
 
 PageScriptDebugServer& PageScriptDebugServer::shared()
 {
-    DEFINE_STATIC_LOCAL(PageScriptDebugServer, server, ());
-    return server;
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<PageScriptDebugServer>, server, (adoptPtrWillBeNoop(new PageScriptDebugServer())));
+    return *server;
 }
 
 v8::Isolate* PageScriptDebugServer::s_mainThreadIsolate = 0;
 
 void PageScriptDebugServer::setMainThreadIsolate(v8::Isolate* isolate)
 {
     s_mainThreadIsolate = isolate;
 }
 
 PageScriptDebugServer::PageScriptDebugServer()
     : ScriptDebugServer(s_mainThreadIsolate)
-    , m_pausedPage(0)
+    , m_pausedPage(nullptr)
+    , m_preprocessorSourceCode()
 {
 }
 
 PageScriptDebugServer::~PageScriptDebugServer()
 {
 }
 
+void PageScriptDebugServer::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_listenersMap);
+    visitor->trace(m_pausedPage);
+    visitor->trace(m_preprocessorSourceCode);

[haraken, 2015/01/22 08:45:11]

Just want to confirm, but does visitor->trace(m_preprocessorSourceCode) work as
expected? I mean, the ScriptSourceCode does not have a valid header, but won't
it cause an issue when Nullable<ScriptSourceCode> traces the ScriptSourceCode?

[sof, 2015/01/22 09:16:45]

I think it will statically resolve to the trace() method used for part objects
(as ScriptSourceCode is a part object of Nullable<ScriptSourceCode>), but let me
verify.

+#endif
+    ScriptDebugServer::trace(visitor);
+}
+
 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
 {
     ScriptController& scriptController = page->deprecatedLocalMainFrame()->script();
     if (!scriptController.canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     v8::HandleScope scope(m_isolate);
 
     if (!m_listenersMap.size()) {
         v8::Debug::SetDebugEventListener(&PageScriptDebugServer::v8DebugEventCallback, v8::External::New(m_isolate, this));
@@ skipping 151 matching lines @@
 {
     ASSERT(frame);
 
     if (!m_preprocessorSourceCode || !frame->page() || isCreatingPreprocessor)
         return false;
 
     // We delay the creation of the preprocessor until just before the first JS from the
     // Web page to ensure that the debugger's console initialization code has completed.
     if (!m_scriptPreprocessor) {
         TemporaryChange<bool> isPreprocessing(isCreatingPreprocessor, true);
-        m_scriptPreprocessor = adoptPtr(new ScriptPreprocessor(m_isolate, *m_preprocessorSourceCode.get(), frame));
+        m_scriptPreprocessor = adoptPtr(new ScriptPreprocessor(m_isolate, m_preprocessorSourceCode.get(), frame));
     }
 
     if (m_scriptPreprocessor->isValid())
         return true;
 
     m_scriptPreprocessor.clear();
     // Don't retry the compile if we fail one time.
-    m_preprocessorSourceCode.clear();
+    m_preprocessorSourceCode = nullptr;
     return false;
 }
 
 // Source to Source processing iff debugger enabled and it has loaded a preprocessor.
-PassOwnPtr<ScriptSourceCode> PageScriptDebugServer::preprocess(LocalFrame* frame, const ScriptSourceCode& sourceCode)
+Nullable<ScriptSourceCode> PageScriptDebugServer::preprocess(LocalFrame* frame, const ScriptSourceCode& sourceCode)
 {
     if (!canPreprocess(frame))
-        return PassOwnPtr<ScriptSourceCode>();
+        return nullptr;
 
     String preprocessedSource = m_scriptPreprocessor->preprocessSourceCode(sourceCode.source(), sourceCode.url());
-    return adoptPtr(new ScriptSourceCode(preprocessedSource, sourceCode.url()));
+    return ScriptSourceCode(preprocessedSource, sourceCode.url());
 }
 
 String PageScriptDebugServer::preprocessEventListener(LocalFrame* frame, const String& source, const String& url, const String& functionName)
 {
     if (!canPreprocess(frame))
         return source;
 
     return m_scriptPreprocessor->preprocessSourceCode(source, url, functionName);
 }
 
 void PageScriptDebugServer::clearPreprocessor()
 {
     m_scriptPreprocessor.clear();
 }
 
 void PageScriptDebugServer::muteWarningsAndDeprecations()
 {
     FrameConsole::mute();
     UseCounter::muteForInspector();
 }
 
 void PageScriptDebugServer::unmuteWarningsAndDeprecations()
 {
     FrameConsole::unmute();
     UseCounter::unmuteForInspector();
 }
 
 } // namespace blink