Index: third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp |
index 3929759df25e58c445070c7e2ccebb37abb477e4..e7d04fb22027a15fed1e4901049cddb1d231caee 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.cpp |
@@ -30,8 +30,8 @@ void installConditionalFeaturesCore(const WrapperTypeInfo* wrapperTypeInfo, |
(originTrialContext && |
originTrialContext->isTrialEnabled("ForeignFetch"))) { |
V8HTMLLinkElement::installLinkServiceWorker( |
- scriptState->isolate(), scriptState->world(), v8::Local<v8::Object>(), |
- prototypeObject, interfaceObject); |
+ scriptState, v8::Local<v8::Object>(), prototypeObject, |
+ interfaceObject); |
} |
} |
} |
@@ -58,4 +58,14 @@ void installConditionalFeatures(const WrapperTypeInfo* type, |
interfaceObject); |
} |
+void installPendingConditionalFeaturesOnWindow(const ScriptState* scriptState) { |
Yuki
2016/11/01 11:37:54
You might want to CHECK:
scriptState->context(
iclelland
2016/11/01 17:06:27
In what cases is this not going to be true? I thin
iclelland
2016/11/02 13:49:37
I've added this, now that it's entering a context
|
+ if (!scriptState) |
+ return; |
+ if (!scriptState->perContextData()) |
haraken
2016/11/01 06:42:41
Can this be DCHECK(m_scriptState) and DCHECK(scrip
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 inte
iclelland
2016/11/01 17:06:27
The only thing that we use Origin Trials for on Wi
|
+} |
+ |
} // namespace blink |