github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixup Make legacy ToV8() helpers private to ScriptPromiseResolver

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/5207474
This commit is contained in:
John Kleinschmidt
2024-01-22 21:42:59 -05:00
parent e60c31dd4f
commit b02108e0c0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/chromium/add_webmessageportconverter_entangleandinjectmessageportchannel.patch
View File

@@ -30,10 +30,18 @@ index 23b17b4a46a31cb005e36bb1bbadba6cc3ea6b3c..b86862dcf5232fc6971293fe2c9f17c9
} // namespace blink
diff --git a/third_party/blink/renderer/core/exported/web_message_port_converter.cc b/third_party/blink/renderer/core/exported/web_message_port_converter.cc
index 6a6cb3d4ef0e454d18cf47cd971240d0dabea9fb..be8e629cedbaf25ca3ce9cc234c9819109b3e61d 100644
index 6a6cb3d4ef0e454d18cf47cd971240d0dabea9fb..bd90d018d5c3e33a41b17b1d015ac25d340f8666 100644
--- a/third_party/blink/renderer/core/exported/web_message_port_converter.cc
+++ b/third_party/blink/renderer/core/exported/web_message_port_converter.cc
@@ -21,4 +21,17 @@ WebMessagePortConverter::DisentangleAndExtractMessagePortChannel(
@@ -6,6 +6,7 @@
#include "third_party/blink/public/common/messaging/message_port_channel.h"
#include "third_party/blink/renderer/bindings/core/v8/script_value.h"
+#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_message_port.h"
#include "third_party/blink/renderer/core/messaging/message_port.h"
@@ -21,4 +22,15 @@ WebMessagePortConverter::DisentangleAndExtractMessagePortChannel(
return port->Disentangle();
}
@@ -45,9 +53,7 @@ index 6a6cb3d4ef0e454d18cf47cd971240d0dabea9fb..be8e629cedbaf25ca3ce9cc234c98191
+ CHECK(execution_context);
+ auto* port = MakeGarbageCollected<MessagePort>(*execution_context);
+ port->Entangle(std::move(port_channel));
+ if (port->Value().IsEmpty())
+ return v8::Undefined(context->GetIsolate());
+ return port->Value().V8Value();
+ return port->ToV8(context->GetIsolate(), context->Global());
+}
+
} // namespace blink