Commit 14d41329 authored by Miyoung Shin's avatar Miyoung Shin Committed by Commit Bot

Convert FontUniqueNameLookup to new Mojo types

This CL converts FontUniqueNameLookupPtr in blink and
FontUniqueNameLookupRequest in content to the new Mojo types.

Bug: 955171, 978694
Change-Id: Icbd653cc33242172aca2dd77f37c8adc5d26ac7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1781909Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#692967}
parent e29d97d9
......@@ -13,7 +13,7 @@
#include "content/browser/font_unique_name_lookup/font_unique_name_lookup.h"
#include "content/public/common/content_features.h"
#include "mojo/public/cpp/bindings/callback_helpers.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
namespace content {
......@@ -26,9 +26,9 @@ FontUniqueNameLookupService::~FontUniqueNameLookupService() {}
// static
void FontUniqueNameLookupService::Create(
blink::mojom::FontUniqueNameLookupRequest request) {
mojo::MakeStrongBinding(std::make_unique<FontUniqueNameLookupService>(),
std::move(request));
mojo::PendingReceiver<blink::mojom::FontUniqueNameLookup> receiver) {
mojo::MakeSelfOwnedReceiver(std::make_unique<FontUniqueNameLookupService>(),
std::move(receiver));
}
// static
......
......@@ -7,7 +7,7 @@
#include "base/files/file_path.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom.h"
namespace content {
......@@ -19,7 +19,7 @@ class FontUniqueNameLookupService : public blink::mojom::FontUniqueNameLookup {
FontUniqueNameLookupService();
~FontUniqueNameLookupService() override;
static void Create(blink::mojom::FontUniqueNameLookupRequest);
static void Create(mojo::PendingReceiver<blink::mojom::FontUniqueNameLookup>);
static scoped_refptr<base::SequencedTaskRunner> GetTaskRunner();
......
......@@ -87,7 +87,7 @@ void FontUniqueNameLookupAndroid::EnsureServiceConnected() {
return;
Platform::Current()->GetInterfaceProvider()->GetInterface(
mojo::MakeRequest(&service_));
service_.BindNewPipeAndPassReceiver());
}
void FontUniqueNameLookupAndroid::ReceiveReadOnlySharedMemoryRegion(
......
......@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_ANDROID_FONT_UNIQUE_NAME_LOOKUP_ANDROID_H_
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_ANDROID_FONT_UNIQUE_NAME_LOOKUP_ANDROID_H_
#include "mojo/public/cpp/bindings/remote.h"
#include "third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h"
#include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
#include "third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h"
......@@ -32,7 +33,7 @@ class FontUniqueNameLookupAndroid : public FontUniqueNameLookup {
void ReceiveReadOnlySharedMemoryRegion(
base::ReadOnlySharedMemoryRegion shared_memory_region);
mojom::blink::FontUniqueNameLookupPtr service_;
mojo::Remote<mojom::blink::FontUniqueNameLookup> service_;
WTF::Deque<NotifyFontUniqueNameLookupReady> pending_callbacks_;
base::Optional<bool> sync_available_;
......
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