add_webmessageportconverter_entangleandinjectmessageportchannel.patch 2.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Jeremy Apthorp <[email protected]>
  3. Date: Fri, 25 Oct 2019 11:23:03 -0700
  4. Subject: add WebMessagePortConverter::EntangleAndInjectMessagePortChannel
  5. This adds a method to the public Blink API that would otherwise require
  6. accessing Blink internals. Its inverse, which already exists, is used in
  7. Android WebView.
  8. diff --git a/third_party/blink/public/web/web_message_port_converter.h b/third_party/blink/public/web/web_message_port_converter.h
  9. index 23b17b4a46a31cb005e36bb1bbadba6cc3ea6b3c..b86862dcf5232fc6971293fe2c9f17c97008a3a7 100644
  10. --- a/third_party/blink/public/web/web_message_port_converter.h
  11. +++ b/third_party/blink/public/web/web_message_port_converter.h
  12. @@ -12,6 +12,7 @@
  13. namespace v8 {
  14. class Isolate;
  15. class Value;
  16. +class Context;
  17. } // namespace v8
  18. namespace blink {
  19. @@ -24,6 +25,9 @@ class BLINK_EXPORT WebMessagePortConverter {
  20. // neutered, it will return nullopt.
  21. static absl::optional<MessagePortChannel>
  22. DisentangleAndExtractMessagePortChannel(v8::Isolate*, v8::Local<v8::Value>);
  23. +
  24. + BLINK_EXPORT static v8::Local<v8::Value>
  25. + EntangleAndInjectMessagePortChannel(v8::Local<v8::Context>, MessagePortChannel);
  26. };
  27. } // namespace blink
  28. 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
  29. index 6a6cb3d4ef0e454d18cf47cd971240d0dabea9fb..10ea1b43e5caa7c6c0f6c9ff5182a712ca422f9b 100644
  30. --- a/third_party/blink/renderer/core/exported/web_message_port_converter.cc
  31. +++ b/third_party/blink/renderer/core/exported/web_message_port_converter.cc
  32. @@ -6,6 +6,7 @@
  33. #include "third_party/blink/public/common/messaging/message_port_channel.h"
  34. #include "third_party/blink/renderer/bindings/core/v8/script_value.h"
  35. +#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
  36. #include "third_party/blink/renderer/bindings/core/v8/v8_message_port.h"
  37. #include "third_party/blink/renderer/core/messaging/message_port.h"
  38. @@ -21,4 +22,15 @@ WebMessagePortConverter::DisentangleAndExtractMessagePortChannel(
  39. return port->Disentangle();
  40. }
  41. +v8::Local<v8::Value>
  42. +WebMessagePortConverter::EntangleAndInjectMessagePortChannel(
  43. + v8::Local<v8::Context> context,
  44. + MessagePortChannel port_channel) {
  45. + auto* execution_context = ToExecutionContext(context);
  46. + CHECK(execution_context);
  47. + auto* port = MakeGarbageCollected<MessagePort>(*execution_context);
  48. + port->Entangle(std::move(port_channel));
  49. + return ToV8(port, context->Global(), context->GetIsolate());
  50. +}
  51. +
  52. } // namespace blink