Commit 49047af1 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Migrate CopylessPaste to the new Mojo types

Convert the users of the blink::mojom::CopylessPaste interface.

Bug: 955171, 978694
Change-Id: I20ddda253bce762f6d6dc34bee2e9e5b5b5d0aaf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768769Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#691554}
parent 09aa7228
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/modules/document_metadata/copyless_paste_extractor.h" #include "third_party/blink/renderer/modules/document_metadata/copyless_paste_extractor.h"
...@@ -15,15 +15,16 @@ namespace blink { ...@@ -15,15 +15,16 @@ namespace blink {
CopylessPasteServer::CopylessPasteServer(LocalFrame& frame) : frame_(frame) {} CopylessPasteServer::CopylessPasteServer(LocalFrame& frame) : frame_(frame) {}
void CopylessPasteServer::BindMojoRequest( void CopylessPasteServer::BindMojoReceiver(
LocalFrame* frame, LocalFrame* frame,
mojom::document_metadata::blink::CopylessPasteRequest request) { mojo::PendingReceiver<mojom::document_metadata::blink::CopylessPaste>
receiver) {
DCHECK(frame); DCHECK(frame);
// TODO(wychen): remove bindMojoRequest pattern, and make this a service // TODO(wychen): remove BindMojoReceiver pattern, and make this a service
// associated with frame lifetime. // associated with frame lifetime.
mojo::MakeStrongBinding(std::make_unique<CopylessPasteServer>(*frame), mojo::MakeSelfOwnedReceiver(std::make_unique<CopylessPasteServer>(*frame),
std::move(request)); std::move(receiver));
} }
void CopylessPasteServer::GetEntities(GetEntitiesCallback callback) { void CopylessPasteServer::GetEntities(GetEntitiesCallback callback) {
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_SERVER_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_SERVER_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_SERVER_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_SERVER_H_
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "third_party/blink/public/mojom/document_metadata/copyless_paste.mojom-blink.h" #include "third_party/blink/public/mojom/document_metadata/copyless_paste.mojom-blink.h"
#include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/modules/modules_export.h"
#include "third_party/blink/renderer/platform/heap/persistent.h" #include "third_party/blink/renderer/platform/heap/persistent.h"
...@@ -19,9 +20,9 @@ class MODULES_EXPORT CopylessPasteServer final ...@@ -19,9 +20,9 @@ class MODULES_EXPORT CopylessPasteServer final
public: public:
explicit CopylessPasteServer(LocalFrame&); explicit CopylessPasteServer(LocalFrame&);
static void BindMojoRequest( static void BindMojoReceiver(
LocalFrame*, LocalFrame*,
mojom::document_metadata::blink::CopylessPasteRequest); mojo::PendingReceiver<mojom::document_metadata::blink::CopylessPaste>);
void GetEntities(GetEntitiesCallback) override; void GetEntities(GetEntitiesCallback) override;
......
...@@ -158,7 +158,7 @@ void ModulesInitializer::Initialize() { ...@@ -158,7 +158,7 @@ void ModulesInitializer::Initialize() {
void ModulesInitializer::InitLocalFrame(LocalFrame& frame) const { void ModulesInitializer::InitLocalFrame(LocalFrame& frame) const {
if (frame.IsMainFrame()) { if (frame.IsMainFrame()) {
frame.GetInterfaceRegistry()->AddInterface(WTF::BindRepeating( frame.GetInterfaceRegistry()->AddInterface(WTF::BindRepeating(
&CopylessPasteServer::BindMojoRequest, WrapWeakPersistent(&frame))); &CopylessPasteServer::BindMojoReceiver, WrapWeakPersistent(&frame)));
} }
if (RuntimeEnabledFeatures::FileHandlingEnabled()) { if (RuntimeEnabledFeatures::FileHandlingEnabled()) {
frame.GetInterfaceRegistry()->AddAssociatedInterface(WTF::BindRepeating( frame.GetInterfaceRegistry()->AddAssociatedInterface(WTF::BindRepeating(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment