| Index: sky/engine/bindings-dart/core/dart/DartInjectedScriptManager.cpp
|
| diff --git a/sky/engine/v8_inspector/InjectedScriptManager.cpp b/sky/engine/bindings-dart/core/dart/DartInjectedScriptManager.cpp
|
| similarity index 62%
|
| copy from sky/engine/v8_inspector/InjectedScriptManager.cpp
|
| copy to sky/engine/bindings-dart/core/dart/DartInjectedScriptManager.cpp
|
| index 514a4b34bb7c24944ab2c44b3a1bc0f837d647be..6bced3471e1e9522b29e08d1aec7a75386aaa8bf 100644
|
| --- a/sky/engine/v8_inspector/InjectedScriptManager.cpp
|
| +++ b/sky/engine/bindings-dart/core/dart/DartInjectedScriptManager.cpp
|
| @@ -28,46 +28,39 @@
|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "sky/engine/config.h"
|
| -#include "sky/engine/v8_inspector/InjectedScriptManager.h"
|
| -
|
| -#include "sky/engine/bindings/core/v8/ScriptValue.h"
|
| -#include "sky/engine/core/inspector/InjectedScriptHost.h"
|
| -#include "sky/engine/platform/JSONValues.h"
|
| -#include "sky/engine/v8_inspector/InjectedScript.h"
|
| -#include "sky/engine/v8_inspector/JSONParser.h"
|
| -#include "sky/engine/v8_inspector/read_from_source_tree.h"
|
| -#include "sky/engine/wtf/PassOwnPtr.h"
|
| +#include "config.h"
|
| +#include "bindings/core/dart/DartInjectedScriptManager.h"
|
| +
|
| +#include "bindings/common/ScriptValue.h"
|
| +#include "bindings/core/dart/DartInjectedScript.h"
|
| +#include "bindings/core/dart/DartScriptState.h"
|
| +#include "core/inspector/InjectedScriptHost.h"
|
| +#include "core/inspector/InjectedScriptManager.h"
|
| +#include "core/inspector/JSONParser.h"
|
| +#include "platform/JSONValues.h"
|
| +#include "public/platform/Platform.h"
|
| +#include "public/platform/WebData.h"
|
| +#include "wtf/PassOwnPtr.h"
|
|
|
| namespace blink {
|
|
|
| -PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
|
| +DartInjectedScriptManager::DartInjectedScriptManager(InspectedStateAccessCheck accessCheck, InjectedScriptManager* javaScriptInjectedScriptManager)
|
| + : m_nextInjectedScriptId(1000000000) // Elegant design so that Dart and JavaScript ids don't overlap.
|
| + , m_inspectedStateAccessCheck(accessCheck)
|
| + , m_javaScriptInjectedScriptManager(javaScriptInjectedScriptManager)
|
| {
|
| - return adoptPtr(new InjectedScriptManager);
|
| }
|
|
|
| -InjectedScriptManager::InjectedScriptManager()
|
| - : m_nextInjectedScriptId(1)
|
| - , m_injectedScriptHost(InjectedScriptHost::create())
|
| +DartInjectedScriptManager::~DartInjectedScriptManager()
|
| {
|
| }
|
|
|
| -InjectedScriptManager::~InjectedScriptManager()
|
| +InjectedScriptHost* DartInjectedScriptManager::injectedScriptHost()
|
| {
|
| + return m_javaScriptInjectedScriptManager->injectedScriptHost();
|
| }
|
|
|
| -void InjectedScriptManager::disconnect()
|
| -{
|
| - m_injectedScriptHost->disconnect();
|
| - m_injectedScriptHost.clear();
|
| -}
|
| -
|
| -InjectedScriptHost* InjectedScriptManager::injectedScriptHost()
|
| -{
|
| - return m_injectedScriptHost.get();
|
| -}
|
| -
|
| -InjectedScript InjectedScriptManager::injectedScriptForId(int id)
|
| +DartInjectedScript* DartInjectedScriptManager::injectedScriptForId(int id)
|
| {
|
| IdToInjectedScriptMap::iterator it = m_idToInjectedScript.find(id);
|
| if (it != m_idToInjectedScript.end())
|
| @@ -76,10 +69,10 @@ InjectedScript InjectedScriptManager::injectedScriptForId(int id)
|
| if (it->value == id)
|
| return injectedScriptFor(it->key.get());
|
| }
|
| - return InjectedScript();
|
| + return 0;
|
| }
|
|
|
| -int InjectedScriptManager::injectedScriptIdFor(ScriptState* scriptState)
|
| +int DartInjectedScriptManager::injectedScriptIdFor(ScriptState* scriptState)
|
| {
|
| ScriptStateToId::iterator it = m_scriptStateToId.find(scriptState);
|
| if (it != m_scriptStateToId.end())
|
| @@ -89,25 +82,28 @@ int InjectedScriptManager::injectedScriptIdFor(ScriptState* scriptState)
|
| return id;
|
| }
|
|
|
| -InjectedScript InjectedScriptManager::injectedScriptForObjectId(const String& objectId)
|
| +DartInjectedScript* DartInjectedScriptManager::injectedScriptForObjectId(const String& objectId)
|
| {
|
| RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
|
| if (parsedObjectId && parsedObjectId->type() == JSONValue::TypeObject) {
|
| long injectedScriptId = 0;
|
| bool success = parsedObjectId->asObject()->getNumber("injectedScriptId", &injectedScriptId);
|
| - if (success)
|
| - return m_idToInjectedScript.get(injectedScriptId);
|
| + if (success) {
|
| + IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(injectedScriptId);
|
| + if (s != m_idToInjectedScript.end())
|
| + return s->value;
|
| + }
|
| }
|
| - return InjectedScript();
|
| + return 0;
|
| }
|
|
|
| -void InjectedScriptManager::discardInjectedScripts()
|
| +void DartInjectedScriptManager::discardInjectedScripts()
|
| {
|
| m_idToInjectedScript.clear();
|
| m_scriptStateToId.clear();
|
| }
|
|
|
| -void InjectedScriptManager::discardInjectedScriptsFor(LocalDOMWindow* window)
|
| +void DartInjectedScriptManager::discardInjectedScriptsFor(LocalDOMWindow* window)
|
| {
|
| if (m_scriptStateToId.isEmpty())
|
| return;
|
| @@ -115,14 +111,17 @@ void InjectedScriptManager::discardInjectedScriptsFor(LocalDOMWindow* window)
|
| Vector<long> idsToRemove;
|
| IdToInjectedScriptMap::iterator end = m_idToInjectedScript.end();
|
| for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it != end; ++it) {
|
| - ScriptState* scriptState = it->value.scriptState();
|
| + ScriptState* scriptState = it->value->scriptState();
|
| if (window != scriptState->domWindow())
|
| continue;
|
| m_scriptStateToId.remove(scriptState);
|
| idsToRemove.append(it->key);
|
| }
|
| + for (size_t i = 0; i < idsToRemove.size(); i++)
|
| + delete m_idToInjectedScript.get(idsToRemove[i]);
|
| m_idToInjectedScript.removeAll(idsToRemove);
|
|
|
| +
|
| // Now remove script states that have id but no injected script.
|
| Vector<ScriptState*> scriptStatesToRemove;
|
| for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scriptStateToId.end(); ++it) {
|
| @@ -133,26 +132,26 @@ void InjectedScriptManager::discardInjectedScriptsFor(LocalDOMWindow* window)
|
| m_scriptStateToId.removeAll(scriptStatesToRemove);
|
| }
|
|
|
| -void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)
|
| +bool DartInjectedScriptManager::canAccessInspectedWorkerGlobalScope(ScriptState*)
|
| +{
|
| + return true;
|
| +}
|
| +
|
| +void DartInjectedScriptManager::releaseObjectGroup(const String& objectGroup)
|
| {
|
| Vector<int> keys;
|
| keys.appendRange(m_idToInjectedScript.keys().begin(), m_idToInjectedScript.keys().end());
|
| for (Vector<int>::iterator k = keys.begin(); k != keys.end(); ++k) {
|
| IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(*k);
|
| if (s != m_idToInjectedScript.end())
|
| - s->value.releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
|
| + s->value->releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
|
| }
|
| }
|
|
|
| -String InjectedScriptManager::injectedScriptSource()
|
| -{
|
| - std::string buffer;
|
| - inspector::ReadFileFromSourceTree("InjectedScriptSource.js", &buffer);
|
| - return String::fromUTF8(buffer);
|
| -}
|
| -
|
| -InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState* inspectedScriptState)
|
| +DartInjectedScript* DartInjectedScriptManager::injectedScriptFor(ScriptState* inspectedScriptState)
|
| {
|
| + if (!inspectedScriptState)
|
| + return 0;
|
| ScriptStateToId::iterator it = m_scriptStateToId.find(inspectedScriptState);
|
| if (it != m_scriptStateToId.end()) {
|
| IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->value);
|
| @@ -160,15 +159,15 @@ InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState* inspectedSc
|
| return it1->value;
|
| }
|
|
|
| + if (!m_inspectedStateAccessCheck(inspectedScriptState))
|
| + return 0;
|
| +
|
| int id = injectedScriptIdFor(inspectedScriptState);
|
| - ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), inspectedScriptState, id);
|
| - InjectedScript result(injectedScriptValue);
|
| - m_idToInjectedScript.set(id, result);
|
|
|
| - // TODO(yurys): InjecedScript should be available as a regular module rather that using a global variable.
|
| - v8::Isolate* isolate = inspectedScriptState->isolate();
|
| - v8::Local<v8::Object> global = inspectedScriptState->context()->Global();
|
| - global->Set(v8::String::NewFromUtf8(isolate, "injectedScript"), injectedScriptValue.v8ValueUnsafe());
|
| + DartInjectedScript* result;
|
| + ASSERT(!inspectedScriptState->isJavaScript());
|
| + result = new DartInjectedScript(static_cast<DartScriptState*>(inspectedScriptState), m_inspectedStateAccessCheck, id, injectedScriptHost(), m_javaScriptInjectedScriptManager);
|
| + m_idToInjectedScript.set(id, result);
|
| return result;
|
| }
|
|
|
|
|