Eagerly install Origin Trial features on window

third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp

Index: third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
diff --git a/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp b/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
index 5213e83fb6f3357c5bcce680b3992a7247b2040c..79d31f5a9584b302568a48e3a9e45887c41d44bf 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
@@ -43,56 +43,52 @@ void installConditionalFeaturesForModules(
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   if (!executionContext)
     return;
-  v8::Isolate* isolate = scriptState->isolate();
-  const DOMWrapperWorld& world = scriptState->world();
   v8::Local<v8::Object> global = scriptState->context()->Global();
   if (wrapperTypeInfo == &V8Navigator::wrapperTypeInfo) {
     if (OriginTrials::webShareEnabled(executionContext)) {
-      V8NavigatorPartial::installWebShare(isolate, world,
-                                          v8::Local<v8::Object>(),
+      V8NavigatorPartial::installWebShare(scriptState, v8::Local<v8::Object>(),
                                           prototypeObject, interfaceObject);
     }
     if (OriginTrials::webUSBEnabled(executionContext)) {
-      V8NavigatorPartial::installWebUSB(isolate, world, v8::Local<v8::Object>(),
+      V8NavigatorPartial::installWebUSB(scriptState, v8::Local<v8::Object>(),
                                         prototypeObject, interfaceObject);
     }
     if (OriginTrials::webVREnabled(executionContext)) {
-      V8NavigatorPartial::installWebVR(isolate, world, global, prototypeObject,
+      V8NavigatorPartial::installWebVR(scriptState, global, prototypeObject,

[Yuki, 2016/11/02 09:21:07]

Hmm, I'm confused.

V8NavigatorPartial::installWebVR is generated from
{{v8_class_or_partial}}::install{{origin_trial_feature.name}} in
interface_base.cpp.tmpl, right?

Then, the function's arguments should be
    scriptState, instance, prototype, interface
where |instance| should be of type Navigator, right?

But you're actually passing |global| of type Window to |instance|, right?

IIUC, installWebVR should take
  instance object of type Navigator,
  prototype object of type Navigator,
  interface object of typeNavigator, and
  global object where the interface object (i.e. constructor) should be exposed.

What do you think?

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

Yes, that is right. I missed this when I reviewed
https://codereview.chromium.org/2385123005

Thank you for catching it; I will fix that.
There is no need for V8NavigatorPartial::installWebVR to take the global object;
it doesn't install any constructors. They are all installed in
V8WindowPartial::installWebVR, and in that method, |instance| is the global
object on which to expose the interface.

                                        interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8Window::wrapperTypeInfo) {
     if (OriginTrials::webUSBEnabled(executionContext)) {
-      V8WindowPartial::installWebUSB(isolate, world, global, prototypeObject,
+      V8WindowPartial::installWebUSB(scriptState, global, prototypeObject,
                                      interfaceObject);
     }
     if (OriginTrials::webVREnabled(executionContext)) {
-      V8WindowPartial::installWebVR(isolate, world, global, prototypeObject,
+      V8WindowPartial::installWebVR(scriptState, global, prototypeObject,
                                     interfaceObject);
     }
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
       V8WindowPartial::installGamepadExtensions(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8ServiceWorkerGlobalScope::wrapperTypeInfo) {
     if (OriginTrials::foreignFetchEnabled(executionContext)) {
       V8ServiceWorkerGlobalScope::installForeignFetch(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8InstallEvent::wrapperTypeInfo) {
     if (OriginTrials::foreignFetchEnabled(executionContext)) {
-      V8InstallEvent::installForeignFetch(isolate, world,
-                                          v8::Local<v8::Object>(),
+      V8InstallEvent::installForeignFetch(scriptState, v8::Local<v8::Object>(),
                                           prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8Gamepad::wrapperTypeInfo) {
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
-      V8Gamepad::installGamepadExtensions(isolate, world, global,
-                                          prototypeObject, interfaceObject);
+      V8Gamepad::installGamepadExtensions(scriptState, global, prototypeObject,
+                                          interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8GamepadButton::wrapperTypeInfo) {
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
       V8GamepadButton::installGamepadExtensions(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   }
 }