Added Dartium changes onto 45.0.2454.104

Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp

 /*
  * 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:
  *
  *     * 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 40 matching lines @@
     v8::Local<v8::FunctionTemplate> wrapperTemplate = m_injectedScriptHost->wrapperTemplate(isolate);
     if (wrapperTemplate.IsEmpty()) {
         wrapperTemplate = V8InjectedScriptHost::createWrapperTemplate(isolate);
         m_injectedScriptHost->setWrapperTemplate(wrapperTemplate, isolate);
     }
 
     v8::Local<v8::Object> scriptHostWrapper = V8InjectedScriptHost::wrap(wrapperTemplate, inspectedScriptState->context(), m_injectedScriptHost);
     if (scriptHostWrapper.IsEmpty())
         return ScriptValue();
 
+    // Store the inspectedScriptState on the scriptHostWrapper if it is
+    // different from the ScriptState associated with the context.
+    // This is needed to support Dart as Dart does not create a separate V8
+    // context for every Dart library.
+    if (inspectedScriptState != ScriptState::from(inspectedScriptState->context()))
+        V8HiddenValue::setHiddenValue(isolate, scriptHostWrapper, V8HiddenValue::scriptState(isolate), v8::External::New(isolate, inspectedScriptState));
+
     injectedScriptNative->setOnInjectedScriptHost(scriptHostWrapper);
 
     // Inject javascript into the context. The compiled script is supposed to evaluate into
     // a single anonymous function(it's anonymous to avoid cluttering the global object with
     // inspector's stuff) the function is called a few lines below with InjectedScriptHost wrapper,
     // injected script id and explicit reference to the inspected global object. The function is expected
     // to create and configure InjectedScript instance that is going to be used by the inspector.
     v8::Local<v8::Value> value;
     if (!V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, scriptSource), isolate).ToLocal(&value))
         return ScriptValue();
@@ skipping 17 matching lines @@
         return false;
     v8::Local<v8::Object> holder = V8Window::findInstanceInPrototypeChain(global, scriptState->isolate());
     if (holder.IsEmpty())
         return false;
     LocalFrame* frame = toLocalDOMWindow(V8Window::toImpl(holder))->frame();
 
     return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), frame, DoNotReportSecurityError);
 }
 
 } // namespace blink