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 edada54b4d3a554001d01677200f49bb29245970..5cf2dfc25fd8095b6388c3d98203950f1a13ab29 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" |
@@ -275,6 +276,10 @@ bool WindowProxy::initialize() { |
frame->loader().client()->didCreateScriptContext( |
context, m_world->extensionGroup(), m_world->worldId()); |
} |
+ // If conditional features for window have been queued before the V8 context |
+ // was ready, then inject them into the context now |
+ installPendingConditionalFeaturesOnWindow(m_scriptState.get()); |
+ |
return true; |
} |