Index: third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
index 6e8dbc7ca9c56d4b19ff438aa396fe8e1ff3c2c9..386e5baa70b4fc8137ce0d4b2d1627ffb676e827 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
@@ -30,6 +30,7 @@ |
#include "bindings/core/v8/WindowProxy.h" |
+#include "bindings/core/v8/ConditionalFeatures.h" |
#include "bindings/core/v8/DOMWrapperWorld.h" |
#include "bindings/core/v8/ScriptController.h" |
#include "bindings/core/v8/V8Binding.h" |
@@ -58,6 +59,7 @@ |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/ScriptForbiddenScope.h" |
#include "platform/TraceEvent.h" |
+#include "platform/feature_policy/FeaturePolicy.h" |
#include "platform/heap/Handle.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "public/platform/Platform.h" |
@@ -275,6 +277,7 @@ bool WindowProxy::initialize() |
if (m_world->isMainWorld()) { |
ExecutionContext* executionContext = m_scriptState->getExecutionContext(); |
if (executionContext) { |
+ initializeConditionalFeatures(executionContext); |
OriginTrialContext* originTrialContext = OriginTrialContext::from(executionContext); |
if (originTrialContext) |
originTrialContext->initializePendingFeatures(); |