Update common/chromium/blink_initialization_order.patch

https://chromium-review.googlesource.com/1030530
This commit is contained in:
Aleksei Kuzmin 2018-09-08 16:37:39 +02:00
Родитель 5863a07005
Коммит 00475d4814
1 изменённых файлов: 3 добавлений и 22 удалений

Просмотреть файл

@ -1,7 +1,7 @@
diff --git a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 33d958fb31ae..47efe62650aa 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -170,11 +170,11 @@ void LocalWindowProxy::Initialize() {
GetFrame()->IsMainFrame());
MainThreadDebugger::Instance()->ContextCreated(script_state_.get(),
@ -16,22 +16,3 @@ index 33d958fb31ae..47efe62650aa 100644
if (World().IsMainWorld()) {
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
}
diff --git a/third_party/WebKit/Source/controller/BlinkInitializer.cpp b/third_party/WebKit/Source/controller/BlinkInitializer.cpp
index bcb85bad6605..ef4da3e40a02 100644
--- a/third_party/WebKit/Source/controller/BlinkInitializer.cpp
+++ b/third_party/WebKit/Source/controller/BlinkInitializer.cpp
@@ -102,11 +102,12 @@ void Initialize(Platform* platform, service_manager::BinderRegistry* registry) {
#endif // !defined(ARCH_CPU_X86_64) && !defined(ARCH_CPU_ARM64) &&
// defined(OS_WIN)
+ // BlinkInitializer::Initialize() must be called before InitializeMainThread
+ GetBlinkInitializer().Initialize();
+
V8Initializer::InitializeMainThread(
V8ContextSnapshotExternalReferences::GetTable());
- GetBlinkInitializer().Initialize();
-
GetBlinkInitializer().RegisterInterfaces(*registry);
// currentThread is null if we are running on a thread without a message loop.