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 35 matching lines @@
     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) {

[haraken, 2016/11/03 16:02:17]

Add DCHECK(scriptState->world()->isMainWorld()).

[iclelland, 2016/11/03 16:43:04]

I can't do that here -- that would require deeper changes, since this is called
as part of V8PerContextData::constructorForTypeSlowCase(), even though it will
not add any origin trial attributes in the case of isolated worlds.

(I just tried, and it crashed as soon as I entered extension code, so I removed
that patch. I'll re-upload it with just the other DCHECK)

   (*s_installConditionalFeaturesFunction)(type, scriptState, prototypeObject,
                                           interfaceObject);
 }
 
+void installPendingConditionalFeaturesOnWindow(const ScriptState* scriptState) {
+  DCHECK(scriptState);
+  DCHECK(scriptState->context() == scriptState->isolate()->GetCurrentContext());
+  DCHECK(scriptState->perContextData());

[haraken, 2016/11/03 16:02:17]

Add DCHECK(scriptState->world()->isMainWorld()).

[iclelland, 2016/11/03 16:43:04]

Done. This one is safe (and correct :) )

+  (*s_installConditionalFeaturesFunction)(&V8Window::wrapperTypeInfo,
+                                          scriptState, v8::Local<v8::Object>(),
+                                          v8::Local<v8::Function>());
+}
+
 }  // namespace blink