Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Commit

Permalink
Update common/chromium/blink_initialization_order.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeykuzmin committed Sep 11, 2018
1 parent 5863a07 commit 00475d4
Showing 1 changed file with 3 additions and 22 deletions.
25 changes: 3 additions & 22 deletions patches/common/chromium/blink_initialization_order.patch
Original file line number Diff line number Diff line change
@@ -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(),
Expand All @@ -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.

0 comments on commit 00475d4

Please sign in to comment.