DevTools: remove ScriptState/Value from the InjectedScript APIs.

third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 70 matching lines @@
 InjectedScript* InjectedScriptManager::findInjectedScript(RemoteObjectIdBase* objectId) const
 {
     return objectId ? findInjectedScript(objectId->contextId()) : nullptr;
 }
 
 void InjectedScriptManager::discardInjectedScripts()
 {
     m_idToInjectedScript.clear();
 }
 
-int InjectedScriptManager::discardInjectedScriptFor(ScriptState* scriptState)
+int InjectedScriptManager::discardInjectedScriptFor(v8::Local<v8::Context> context)
 {
-    ScriptState::Scope scope(scriptState);
-    int contextId = V8Debugger::contextId(scriptState->context());
+    int contextId = V8Debugger::contextId(context);
     m_idToInjectedScript.remove(contextId);
     return contextId;
 }
 
 void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)
 {
     Vector<int> keys;
     keys.appendRange(m_idToInjectedScript.keys().begin(), m_idToInjectedScript.keys().end());
     for (auto& key : keys) {
         IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(key);
@@ skipping 10 matching lines @@
         it->value->setCustomObjectFormatterEnabled(enabled);
     }
 }
 
 String InjectedScriptManager::injectedScriptSource()
 {
     const WebData& injectedScriptSourceResource = Platform::current()->loadResource("InjectedScriptSource.js");
     return String(injectedScriptSourceResource.data(), injectedScriptSourceResource.size());
 }
 
-InjectedScript* InjectedScriptManager::injectedScriptFor(ScriptState* scriptState)
+InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context> context)
 {
-    ScriptState::Scope scope(scriptState);
-    int contextId = V8Debugger::contextId(scriptState->context());
+    v8::HandleScope handles(context->GetIsolate());

[dgozman, 2016/01/27 02:36:37]

Not needed.

[pfeldman, 2016/01/27 16:56:20]

Done.

+    v8::Context::Scope scope(context);

[dgozman, 2016/01/27 02:36:37]

Now you have to artificially enter this context instead of passing it to access
check explicitly.

[pfeldman, 2016/01/27 16:56:20]

This is a trial check for access. Actual access is going to take place further
and I'll be using the calling/entered context check there. Passing two context
here would simply be wrong.

+    int contextId = V8Debugger::contextId(context);
 
     IdToInjectedScriptMap::iterator it = m_idToInjectedScript.find(contextId);
     if (it != m_idToInjectedScript.end())
         return it->value.get();
 
-    if (!m_client->canAccessContext(scriptState->context()))
+    if (!m_client->callingContextCanAccessContext(context))
         return nullptr;
 
-    RefPtr<InjectedScriptNative> injectedScriptNative = adoptRef(new InjectedScriptNative(scriptState->isolate()));
-    ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), scriptState, contextId, injectedScriptNative.get());
+    RefPtr<InjectedScriptNative> injectedScriptNative = adoptRef(new InjectedScriptNative(context->GetIsolate()));
+    v8::Local<v8::Object> injectedScriptValue = createInjectedScript(injectedScriptSource(), context, contextId, injectedScriptNative.get());
     OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(injectedScriptValue, m_client, injectedScriptNative.release(), contextId));
     InjectedScript* resultPtr = result.get();
     if (m_customObjectFormatterEnabled)
         result->setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
     m_idToInjectedScript.set(contextId, result.release());
     return resultPtr;
 }
 
 } // namespace blink