Eagerly install Origin Trial features on window

third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ConditionalFeatures.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8HTMLLinkElement.h"
 #include "bindings/core/v8/V8Navigator.h"
 #include "bindings/core/v8/V8Window.h"
@@ skipping 12 matching lines @@
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   if (!executionContext)
     return;
   OriginTrialContext* originTrialContext = OriginTrialContext::from(
       executionContext, OriginTrialContext::DontCreateIfNotExists);
   if (wrapperTypeInfo == &V8HTMLLinkElement::wrapperTypeInfo) {
     if (RuntimeEnabledFeatures::linkServiceWorkerEnabled() ||
         (originTrialContext &&
          originTrialContext->isTrialEnabled("ForeignFetch"))) {
       V8HTMLLinkElement::installLinkServiceWorker(
-          scriptState->isolate(), scriptState->world(), v8::Local<v8::Object>(),
-          prototypeObject, interfaceObject);
+          scriptState, v8::Local<v8::Object>(), prototypeObject,
+          interfaceObject);
     }
   }
 }
 
 namespace {
 
 InstallConditionalFeaturesFunction s_installConditionalFeaturesFunction =
     &installConditionalFeaturesCore;
 }
 
 InstallConditionalFeaturesFunction setInstallConditionalFeaturesFunction(
     InstallConditionalFeaturesFunction newInstallConditionalFeaturesFunction) {
   InstallConditionalFeaturesFunction originalFunction =
       s_installConditionalFeaturesFunction;
   s_installConditionalFeaturesFunction = newInstallConditionalFeaturesFunction;
   return originalFunction;
 }
 
 void installConditionalFeatures(const WrapperTypeInfo* type,
                                 const ScriptState* scriptState,
                                 v8::Local<v8::Object> prototypeObject,
                                 v8::Local<v8::Function> interfaceObject) {
   (*s_installConditionalFeaturesFunction)(type, scriptState, prototypeObject,
                                           interfaceObject);
 }
 
+void installPendingConditionalFeaturesOnWindow(const ScriptState* scriptState) {

[Yuki, 2016/11/01 11:37:54]

You might want to CHECK:
    scriptState->context() == scriptState->isolate()->GetCurrentContext()

[iclelland, 2016/11/01 17:06:27]

In what cases is this not going to be true? I think I may have actually run
across situations like that in testing, when calling this from
OriginTrialContext::addTokens. It's actually what led me to fix the scriptstate
issue, to ensure that I was actually using the ScriptState context correctly.

[iclelland, 2016/11/02 13:49:37]

I've added this, now that it's entering a context properly. Thanks.

+  if (!scriptState)
+    return;
+  if (!scriptState->perContextData())

[haraken, 2016/11/01 06:42:41]

Can this be DCHECK(m_scriptState) and DCHECK(scriptState->perContextData())?

[iclelland, 2016/11/01 17:06:27]

Yes, done, thanks.

+    return;
+  (*s_installConditionalFeaturesFunction)(&V8Window::wrapperTypeInfo,
+                                          scriptState, v8::Local<v8::Object>(),
+                                          v8::Local<v8::Function>());

[haraken, 2016/11/01 06:42:41]

Why is it okay to pass in empty prototype and interface objects?

[iclelland, 2016/11/01 17:06:27]

The only thing that we use Origin Trials for on Window are constructor
attributes, which need to be installed with V8COMConfiguration::OnInstance, and
so the prototype and interface objects are never used. We still need to plumb
them all the way through to V8DOMConfiguration::installAttribute, though, since
the code generation isn't clever enough yet to create install* methods with
different signatures.

+}
+
 }  // namespace blink