From 72d921e453ddb9d0c979d2af1cf3fbf48160c4cc Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 28 Jul 2020 20:34:26 -0700
Subject: [PATCH] fix: wrap OnWindowMessage w/ handlescope (#24769)

* fix: wrap OnWindowMessage w/ handlescope (#24716)

* Update electron_api_top_level_window.cc
---
 shell/browser/api/electron_api_top_level_window.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shell/browser/api/electron_api_top_level_window.cc b/shell/browser/api/electron_api_top_level_window.cc
index cf01d4bfb7676..8ccec89f8c125 100644
--- a/shell/browser/api/electron_api_top_level_window.cc
+++ b/shell/browser/api/electron_api_top_level_window.cc
@@ -14,6 +14,7 @@
 #include "shell/browser/api/electron_api_menu.h"
 #include "shell/browser/api/electron_api_view.h"
 #include "shell/browser/api/electron_api_web_contents.h"
+#include "shell/browser/javascript_environment.h"
 #include "shell/common/color_util.h"
 #include "shell/common/gin_converters/callback_converter.h"
 #include "shell/common/gin_converters/file_path_converter.h"
@@ -290,6 +291,8 @@ void TopLevelWindow::OnWindowMessage(UINT message,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   if (IsWindowMessageHooked(message)) {
+    v8::Locker locker(isolate());
+    v8::HandleScope scope(isolate());
     messages_callback_map_[message].Run(
         ToBuffer(isolate(), static_cast<void*>(&w_param), sizeof(WPARAM)),
         ToBuffer(isolate(), static_cast<void*>(&l_param), sizeof(LPARAM)));