Eagerly install Origin Trial features on window

third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "bindings/core/v8/V8DOMConfiguration.h"
 
 #include "bindings/core/v8/GeneratedCodeHelper.h"  // just for DCHECK
+#include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "platform/tracing/TraceEvent.h"
 
 namespace blink {
 
 namespace {
 
 void installAttributeInternal(
     v8::Isolate* isolate,
@@ skipping 29 matching lines @@
     prototypeTemplate->SetNativeDataProperty(
         name, getter, setter, data,
         static_cast<v8::PropertyAttribute>(attribute.attribute),
         v8::Local<v8::AccessorSignature>(),
         static_cast<v8::AccessControl>(attribute.settings));
   if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInterface)
     NOTREACHED();
 }
 
 void installAttributeInternal(
-    v8::Isolate* isolate,
+    const ScriptState* scriptState,
     v8::Local<v8::Object> instance,
     v8::Local<v8::Object> prototype,
-    const V8DOMConfiguration::AttributeConfiguration& attribute,
-    const DOMWrapperWorld& world) {
+    const V8DOMConfiguration::AttributeConfiguration& attribute) {
+  v8::Isolate* isolate = scriptState->isolate();
+  const DOMWrapperWorld& world = scriptState->world();
+
   if (attribute.exposeConfiguration ==
           V8DOMConfiguration::OnlyExposedToPrivateScript &&
       !world.isPrivateScriptIsolatedWorld())
     return;
 
   v8::Local<v8::Name> name = v8AtomicString(isolate, attribute.name);
 
   // This method is only being used for installing interfaces which are
   // enabled through origin trials. Assert here that it is being called with
   // an attribute configuration for a constructor.
   // TODO(iclelland): Relax this constraint and allow arbitrary data-type
   // properties to be added here.
   DCHECK_EQ(&v8ConstructorAttributeGetter, attribute.getter);
 
   V8PerContextData* perContextData =
-      V8PerContextData::from(isolate->GetCurrentContext());
+      V8PerContextData::from(scriptState->context());
   v8::Local<v8::Function> data =
       perContextData->constructorForType(attribute.data);
 
   DCHECK(attribute.propertyLocationConfiguration);
   if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInstance)
     instance
         ->DefineOwnProperty(
-            isolate->GetCurrentContext(), name, data,
+            scriptState->context(), name, data,
             static_cast<v8::PropertyAttribute>(attribute.attribute))
         .ToChecked();
   if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnPrototype)
     prototype
         ->DefineOwnProperty(
-            isolate->GetCurrentContext(), name, data,
+            scriptState->context(), name, data,
             static_cast<v8::PropertyAttribute>(attribute.attribute))
         .ToChecked();
   if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInterface)
     NOTREACHED();
 }
 
 template <class FunctionOrTemplate>
 v8::Local<FunctionOrTemplate> createAccessorFunctionOrTemplate(
     v8::Isolate*,
     v8::FunctionCallback,
@@ skipping 282 matching lines @@
     v8::Isolate* isolate,
     const DOMWrapperWorld& world,
     v8::Local<v8::ObjectTemplate> instanceTemplate,
     v8::Local<v8::ObjectTemplate> prototypeTemplate,
     const AttributeConfiguration& attribute) {
   installAttributeInternal(isolate, instanceTemplate, prototypeTemplate,
                            attribute, world);
 }
 
 void V8DOMConfiguration::installAttribute(
-    v8::Isolate* isolate,
-    const DOMWrapperWorld& world,
+    const ScriptState* scriptState,
     v8::Local<v8::Object> instance,
     v8::Local<v8::Object> prototype,
     const AttributeConfiguration& attribute) {
-  installAttributeInternal(isolate, instance, prototype, attribute, world);
+  installAttributeInternal(scriptState, instance, prototype, attribute);
 }
 
 void V8DOMConfiguration::installAccessors(
     v8::Isolate* isolate,
     const DOMWrapperWorld& world,
     v8::Local<v8::ObjectTemplate> instanceTemplate,
     v8::Local<v8::ObjectTemplate> prototypeTemplate,
     v8::Local<v8::FunctionTemplate> interfaceTemplate,
     v8::Local<v8::Signature> signature,
     const AccessorConfiguration* accessors,
@@ skipping 168 matching lines @@
 void V8DOMConfiguration::setClassString(
     v8::Isolate* isolate,
     v8::Local<v8::ObjectTemplate> objectTemplate,
     const char* classString) {
   objectTemplate->Set(
       v8::Symbol::GetToStringTag(isolate), v8AtomicString(isolate, classString),
       static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
 }
 
 }  // namespace blink