DevTools: migrate injectedscript from ScriptValue to v8::Global.

third_party/WebKit/Source/core/inspector/PageDebuggerAgent.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 119 matching lines @@
     m_v8DebuggerAgent->reset();
 }
 
 void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& expression, const String& sourceURL, bool persistScript, int executionContextId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>& exceptionDetails)
 {
     InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);
     if (!injectedScript) {
         *errorString = "Inspected frame has gone";
         return;
     }
-    ExecutionContext* executionContext = injectedScript->scriptState()->executionContext();
+    v8::HandleScope handles(injectedScript->isolate());
+    ScriptState* scriptState = ScriptState::from(injectedScript->context());
+    if (!scriptState) {
+        *errorString = "Inspected frame has gone";
+        return;
+    }
+
+    ExecutionContext* executionContext = scriptState->executionContext();

[dgozman, 2016/01/27 22:05:47]

toExecutionContext(injectedScript->context())

[pfeldman, 2016/01/27 22:15:45]

Done.

     RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame());
     InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, persistScript, executionContextId, scriptId, exceptionDetails);
     if (!scriptId->isAssigned())
         return;
 
     String scriptIdValue = scriptId->getValue();
     if (!scriptIdValue.isEmpty())
         m_compiledScriptURLs.set(scriptId->getValue(), sourceURL);
 }
 
 void PageDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& scriptId, int executionContextId, const String* const objectGroup, const bool* const doNotPauseOnExceptionsAndMuteConsole, RefPtr<RemoteObject>& result, RefPtr<ExceptionDetails>& exceptionDetails)
 {
     InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);
     if (!injectedScript) {
         *errorString = "Inspected frame has gone";
         return;
     }
-    ExecutionContext* executionContext = injectedScript->scriptState()->executionContext();
+    v8::HandleScope handles(injectedScript->isolate());
+    ScriptState* scriptState = ScriptState::from(injectedScript->context());
+    if (!scriptState) {
+        *errorString = "Inspected frame has gone";
+        return;
+    }
 
+    ExecutionContext* executionContext = scriptState->executionContext();
     String sourceURL = m_compiledScriptURLs.take(scriptId);
     LocalFrame* frame = toDocument(executionContext)->frame();
     TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition()));
 
     RefPtrWillBeRawPtr<LocalFrame> protect(frame);
     InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails);
 
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
 }
 
 } // namespace blink