Oilpan: make SuspendableScriptExecutor safe.

Source/web/SuspendableScriptExecutor.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/SuspendableScriptExecutor.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebScriptExecutionCallback.h"
 
 namespace blink {
 
 void SuspendableScriptExecutor::createAndRun(LocalFrame* frame, int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, bool userGesture, WebScriptExecutionCallback* callback)
 {
     RefPtrWillBeRawPtr<SuspendableScriptExecutor> executor = adoptRefWillBeNoop(new SuspendableScriptExecutor(frame, worldID, sources, extensionGroup, userGesture, callback));
+#if !ENABLE(OILPAN)

[haraken, 2015/06/23 08:12:01]

In Oilpan, who keeps the SuspendableScriptExecutor alive?

One option to keep the current lifetime relationship would be to use
RefCountedGarbageCollected. Then we can use ref/deref.

[sof, 2015/06/23 09:17:31]

Done.

     executor->ref();
+#endif
     executor->run();
 }
 
 void SuspendableScriptExecutor::contextDestroyed()
 {
     // this method can only be called if the script was not called in run()
     // and context remained suspend (method resume has never called)
     SuspendableTimer::contextDestroyed();
     m_callback->completed(Vector<v8::Local<v8::Value>>());
-    deref();
+    dispose();
 }
 
 SuspendableScriptExecutor::SuspendableScriptExecutor(LocalFrame* frame, int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, bool userGesture, WebScriptExecutionCallback* callback)
     : SuspendableTimer(frame->document())
     , m_frame(frame)
     , m_worldID(worldID)
     , m_sources(sources)
     , m_extensionGroup(extensionGroup)
     , m_userGesture(userGesture)
     , m_callback(callback)
@@ skipping 32 matching lines @@
 
     v8::HandleScope scope(v8::Isolate::GetCurrent());
     Vector<v8::Local<v8::Value>> results;
     if (m_worldID) {
         m_frame->script().executeScriptInIsolatedWorld(m_worldID, m_sources, m_extensionGroup, &results);
     } else {
         v8::Local<v8::Value> scriptValue = m_frame->script().executeScriptInMainWorldAndReturnValue(m_sources.first());
         results.append(scriptValue);
     }
     m_callback->completed(results);
+    dispose();
+}
+
+void SuspendableScriptExecutor::dispose()
+{
+#if ENABLE(OILPAN)
+    // Remove object as a ContextLifecycleObserver.
+    ActiveDOMObject::clearContext();
+#else
     deref();
+#endif
 }
 
 DEFINE_TRACE(SuspendableScriptExecutor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_frame);
     visitor->trace(m_sources);
 #endif
     SuspendableTimer::trace(visitor);
 }
 
 } // namespace blink