Skip to content

GitLab

T
tangled
Commit 12e346a1 authored by Sharon Yang's avatar Sharon Yang Committed by Commit Bot
Browse files
Options

Revert "[bindings] Define cross-platform NamedMessagePortConnector impl." 

This reverts commit 13c126e3.

Reason for revert: This CL pulls in ui/base and increasing the size of CastRunner. The size increase is breaking the Chromium (into Fuchsia) roller.

Original change's description:
> [bindings] Define cross-platform NamedMessagePortConnector impl.
> 
> Refactors NamedMessagePortConnector into a platform-agnostic component,
> which can be reused across FIDL, in-process, and testing contexts.
> It uses Blink messages and message ports as a common basis for
> message and port transport.
> 
> * Implements some missing portions of the Blink/FIDL MessagePort
>   conversion layer.
> * Adds a Fuchsia implementation of NMPC.
> 
> Bug: 1104369
> Change-Id: I01e86c38963bfb114a7466c6f73b143e5302ad1e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293110
> Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
> Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> Reviewed-by: David Dorwin <ddorwin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#806684}

TBR=ddorwin@chromium.org,kmarshall@chromium.org,jochen@chromium.org,lijiawei@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1104369
Change-Id: Ie5505f33dc2b29ce82fe5d44f8919e985da35102
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414651Reviewed-by: default avatarSharon Yang <yangsharon@chromium.org>
Commit-Queue: Sharon Yang <yangsharon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807575}
parent 2e3ca42a
Hide whitespace changes
Inline Side-by-side
Showing with 292 additions and 647 deletions
components/cast/named_message_port_connector/BUILD.gn deleted 100644 → 0
View file @ 2e3ca42a
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//tools/grit/grit_rule.gni")
source_set("named_message_port_connector") {
sources = [
"named_message_port_connector.cc",
"named_message_port_connector.h",
]
deps = [
"//base",
"//components/cast:export",
]
public_deps = [
":resources",
"//third_party/blink/public/common",
]
}
grit("resources") {
source = "named_message_port_connector_resources.grd"
outputs = [
"grit/named_message_port_connector_resources.h",
"named_message_port_connector_resources.pak",
]
# Allow GRIT to assign IDs using its default set of base IDs.
resource_ids = ""
}
components/cast/named_message_port_connector/DEPS deleted 100644 → 0
View file @ 2e3ca42a
include_rules = [
"+third_party/blink/public/common/messaging",
"+ui/base/resource",
]
components/cast/named_message_port_connector/named_message_port_connector.cc deleted 100644 → 0
View file @ 2e3ca42a
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/cast/named_message_port_connector/named_message_port_connector.h"
#include <string>
#include <utility>
#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
namespace cast_api_bindings {
NamedMessagePortConnector::NamedMessagePortConnector() = default;
NamedMessagePortConnector::~NamedMessagePortConnector() = default;
void NamedMessagePortConnector::RegisterPortHandler(
PortConnectedCallback handler) {
handler_ = std::move(handler);
}
// Receives the MessagePort and forwards ports to their corresponding binding
// handlers.
bool NamedMessagePortConnector::OnMessage(
blink::WebMessagePort::Message message) {
if (message.ports.size() != 1) {
DLOG(FATAL) << "Only one control port should be provided";
return false;
}
// Read the port ID.
base::string16 data_utf16 = std::move(message.data);
std::string binding_id;
if (!base::UTF16ToUTF8(data_utf16.data(), data_utf16.size(), &binding_id))
return false;
return handler_.Run(binding_id, std::move(message.ports[0]));
}
blink::WebMessagePort::Message NamedMessagePortConnector::GetConnectMessage() {
constexpr char kControlPortConnectMessage[] = "cast.master.connect";
// Pass the control message port into the page as an HTML5 MessageChannel
// message.
auto port_pair = blink::WebMessagePort::CreatePair();
control_port_ = std::move(port_pair.first);
control_port_.SetReceiver(this, base::ThreadTaskRunnerHandle::Get());
blink::WebMessagePort::Message connect_message;
connect_message.data = base::UTF8ToUTF16(kControlPortConnectMessage);
connect_message.ports.push_back(std::move(port_pair.second));
return connect_message;
}
} // namespace cast_api_bindings
components/cast/named_message_port_connector/named_message_port_connector.h deleted 100644 → 0
View file @ 2e3ca42a
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef COMPONENTS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_NAMED_MESSAGE_PORT_CONNECTOR_H_
#define COMPONENTS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_NAMED_MESSAGE_PORT_CONNECTOR_H_
#include "base/callback.h"
#include "base/strings/string_piece.h"
#include "third_party/blink/public/common/messaging/web_message_port.h"
namespace cast_api_bindings {
// Injects an API into |frame| through which it can connect MessagePorts to one
// or more services registered by the caller.
// Platform specific details, such as how the script resources are injected, and
// how the connection message is posted to the page, are delegated to the
// caller.
// TODO(crbug.com/1126571): Migrate off Blink::WebMessagePort to a
// platform-agnostic MessagePort abstraction.
class NamedMessagePortConnector
: public blink::WebMessagePort::MessageReceiver {
public:
// Signature of callback to be invoked when a port is connected.
// The callback should return true if the connection request was valid.
using PortConnectedCallback =
base::RepeatingCallback<bool(base::StringPiece, blink::WebMessagePort)>;
NamedMessagePortConnector();
~NamedMessagePortConnector() override;
NamedMessagePortConnector(const NamedMessagePortConnector&) = delete;
NamedMessagePortConnector& operator=(const NamedMessagePortConnector&) =
delete;
// Sets the callback which will be invoked when a port is connected.
void RegisterPortHandler(PortConnectedCallback handler);
// Returns a connection message which should be posted to the page on
// every navigation.
// Calling this method will drop any preexisting connections made to the page.
blink::WebMessagePort::Message GetConnectMessage();
private:
// blink::WebMessagePort::MessageReceiver implementation:
bool OnMessage(blink::WebMessagePort::Message message) override;
PortConnectedCallback handler_;
blink::WebMessagePort control_port_;
};
} // namespace cast_api_bindings
#endif // COMPONENTS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_NAMED_MESSAGE_PORT_CONNECTOR_H_
components/cast/named_message_port_connector/named_message_port_connector.js deleted 100644 → 0
View file @ 2e3ca42a
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
'use strict';
if (!cast) {
// eslint-disable-next-line no-var
var cast = new Object;
}
if (!cast.__platform__) {
cast.__platform__ = new Object;
}
// Creates named HTML5 MessagePorts that are connected to native code.
cast.__platform__.PortConnector = new class {
constructor() {
this.controlPort_ = null;
// A map of ports waiting to be published to the controlPort_, keyed by
// string IDs.
this.pendingPorts_ = {};
this.listener = this.onMessageEvent.bind(this);
window.addEventListener(
'message', this.listener,
true // Let the listener handle events before they hit the DOM tree.
);
}
// Returns a MessagePort whose channel will be passed to the native code.
// The channel can be used immediately after construction. Outgoing messages
// will be automatically buffered until the connection is established.
bind(id) {
const channel = new MessageChannel();
if (this.controlPort_) {
this.sendPort(id, channel.port2);
} else {
this.pendingPorts_[id] = channel.port2;
}
return channel.port1;
}
sendPort(portId, port) {
this.controlPort_.postMessage(portId, [port]);
}
// Receives a control port from native code.
onMessageEvent(e) {
// Only process window.onmessage events which are intended for this class.
if (e.data != 'cast.master.connect') {
return;
}
if (e.ports.length != 1) {
console.error(
'Expected only one MessagePort, got ' + e.ports.length + ' instead.');
for (const i in e.ports) {
e.ports[i].close();
}
return;
}
this.controlPort_ = e.ports[0];
for (const portId in this.pendingPorts_) {
this.sendPort(portId, this.pendingPorts_[portId]);
}
this.pendingPorts_ = null;
e.stopPropagation();
// No need to receive more onmessage events.
window.removeEventListener('message', this.listener);
}
}
();
components/cast/named_message_port_connector/named_message_port_connector_resources.grd deleted 100644 → 0
View file @ 2e3ca42a
<?xml version="1.0" encoding="utf-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/named_message_port_connector_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="named_message_port_connector_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
<include name="IDR_PORT_CONNECTOR_JS" file="named_message_port_connector.js" type="BINDATA" />
</includes>
</release>
</grit>
components/on_load_script_injector/browser/BUILD.gn
View file @ 12e346a1
......@@ -20,4 +20,10 @@ component("browser") {
"//mojo/public/cpp/bindings",
"//third_party/blink/public/common",
]
visibility = [
"//chromecast/bindings:bindings_manager_cast",
"//chromecast/browser:browser",
"//fuchsia/engine:web_engine_core",
]
}
components/on_load_script_injector/renderer/BUILD.gn
View file @ 12e346a1
......@@ -21,4 +21,9 @@ component("renderer") {
"//mojo/public/cpp/bindings",
"//third_party/blink/public/common",
]
visibility = [
"//chromecast/renderer/*",
"//fuchsia/engine:web_engine_core",
]
}
fuchsia/base/message_port.cc
View file @ 12e346a1
......@@ -24,9 +24,6 @@ namespace {
using BlinkMessage = blink::WebMessagePort::Message;
// Converts a fuchsia::web::WebMessage to a BlinkMessage.
// An empty result indicates that conversion was successful.
// Data validation errors are returned as a FrameError.
base::Optional<fuchsia::web::FrameError> BlinkMessageFromFidl(
fuchsia::web::WebMessage fidl_message,
BlinkMessage* blink_message) {
......@@ -53,17 +50,41 @@ base::Optional<fuchsia::web::FrameError> BlinkMessageFromFidl(
blink_message->ports.push_back(
BlinkMessagePortFromFidl(std::move(transferrable.message_port())));
}
} else if (fidl_message.has_incoming_transfer()) {
for (fuchsia::web::IncomingTransferable& incoming :
*fidl_message.mutable_incoming_transfer()) {
blink_message->ports.push_back(
BlinkMessagePortFromFidl(std::move(incoming.message_port())));
}
}
return base::nullopt;
}
base::Optional<fuchsia::web::WebMessage> FidlWebMessageFromBlink(
BlinkMessage blink_message) {
fuchsia::web::WebMessage fidl_message;
if (!blink_message.ports.empty()) {
std::vector<fuchsia::web::IncomingTransferable> transferables;
for (blink::WebMessagePort& port : blink_message.ports) {
fuchsia::web::IncomingTransferable incoming;
incoming.set_message_port(FidlMessagePortFromBlink(std::move(port)));
transferables.push_back(std::move(incoming));
}
fidl_message.set_incoming_transfer(std::move(transferables));
blink_message.ports.clear();
}
base::string16 data_utf16 = std::move(blink_message.data);
std::string data_utf8;
if (!base::UTF16ToUTF8(data_utf16.data(), data_utf16.size(), &data_utf8))
return base::nullopt;
base::STLClearObject(&data_utf16);
fuchsia::mem::Buffer data =
cr_fuchsia::MemBufferFromString(data_utf8, "cr-web-message-from-blink");
if (!data.vmo)
return base::nullopt;
fidl_message.set_data(std::move(data));
return fidl_message;
}
// Defines a MessagePortAdapter, which translates and routes messages between a
// FIDL MessagePort and a blink::WebMessagePort. Every MessagePortAdapter has
// exactly one FIDL MessagePort and one blink::WebMessagePort.
......@@ -108,8 +129,7 @@ class MessagePortAdapter : public blink::WebMessagePort::MessageReceiver {
// blink::WebMessagePort::MessageReceiver implementation:
bool OnMessage(BlinkMessage message) override {
base::Optional<fuchsia::web::WebMessage> message_converted =
FidlWebMessageFromBlink(std::move(message),
TransferableHostType::kLocal);
FidlWebMessageFromBlink(std::move(message));
if (!message_converted) {
DLOG(ERROR) << "Couldn't decode WebMessage from blink::WebMessagePort.";
Destroy();
......@@ -151,10 +171,6 @@ class FidlMessagePortClientAdapter : public MessagePortAdapter {
});
}
fidl::InterfaceRequest<fuchsia::web::MessagePort> NewRequest() {
return port_.NewRequest();
}
private:
~FidlMessagePortClientAdapter() override = default;
......@@ -291,24 +307,12 @@ class FidlMessagePortServerAdapter : public fuchsia::web::MessagePort,
DISALLOW_COPY_AND_ASSIGN(FidlMessagePortServerAdapter);
};
fidl::InterfaceRequest<fuchsia::web::MessagePort>
RemoteFidlMessagePortFromBlink(blink::WebMessagePort blink_port) {
fidl::InterfaceHandle<fuchsia::web::MessagePort> fidl_handle;
auto request = fidl_handle.NewRequest();
new FidlMessagePortClientAdapter(std::move(blink_port),
std::move(fidl_handle));
return request;
}
} // namespace
// Methods for constructing MessagePortAdapters for various port types and
// origins. The adapters manage their own lifetimes and will self-delete when
// either endpoint of their channels are disconnected.
blink::WebMessagePort BlinkMessagePortFromFidl(
fidl::InterfaceRequest<fuchsia::web::MessagePort> fidl_port) {
auto port_pair = blink::WebMessagePort::CreatePair();
// The adapter cleans itself up when either of the associated ports is closed.
new FidlMessagePortServerAdapter(std::move(port_pair.first),
std::move(fidl_port));
return std::move(port_pair.second);
......@@ -317,6 +321,7 @@ blink::WebMessagePort BlinkMessagePortFromFidl(
blink::WebMessagePort BlinkMessagePortFromFidl(
fidl::InterfaceHandle<fuchsia::web::MessagePort> fidl_port) {
auto port_pair = blink::WebMessagePort::CreatePair();
// The adapter cleans itself up when either of the associated ports is closed.
new FidlMessagePortClientAdapter(std::move(port_pair.first),
std::move(fidl_port));
return std::move(port_pair.second);
......@@ -328,49 +333,4 @@ fidl::InterfaceHandle<fuchsia::web::MessagePort> FidlMessagePortFromBlink(
return adapter->NewBinding();
}
base::Optional<fuchsia::web::WebMessage> FidlWebMessageFromBlink(
BlinkMessage blink_message,
TransferableHostType port_type) {
fuchsia::web::WebMessage fidl_message;
if (!blink_message.ports.empty()) {
switch (port_type) {
case TransferableHostType::kLocal:
for (blink::WebMessagePort& port : blink_message.ports) {
fuchsia::web::IncomingTransferable incoming;
incoming.set_message_port(FidlMessagePortFromBlink(std::move(port)));
fidl_message.mutable_incoming_transfer()->push_back(
std::move(incoming));
}
break;
case TransferableHostType::kRemote:
for (blink::WebMessagePort& port : blink_message.ports) {
fuchsia::web::OutgoingTransferable outgoing;
outgoing.set_message_port(
RemoteFidlMessagePortFromBlink(std::move(port)));
fidl_message.mutable_outgoing_transfer()->push_back(
std::move(outgoing));
}
break;
}
blink_message.ports.clear();
}
base::string16 data_utf16 = std::move(blink_message.data);
std::string data_utf8;
if (!base::UTF16ToUTF8(data_utf16.data(), data_utf16.size(), &data_utf8))
return base::nullopt;
base::STLClearObject(&data_utf16);
constexpr char kBufferVmoName[] = "cr-web-message-from-blink";
fuchsia::mem::Buffer data_buffer =
cr_fuchsia::MemBufferFromString(data_utf8, kBufferVmoName);
if (!data_buffer.vmo)
return base::nullopt;
fidl_message.set_data(std::move(data_buffer));
return fidl_message;
}
} // namespace cr_fuchsia
fuchsia/base/message_port.h
View file @ 12e346a1
......@@ -29,21 +29,6 @@ blink::WebMessagePort BlinkMessagePortFromFidl(
fidl::InterfaceHandle<fuchsia::web::MessagePort> FidlMessagePortFromBlink(
blink::WebMessagePort blink_port);
// Specifies the location of the MessagePort FIDL service that handles messages
// sent over the Transferable.
enum class TransferableHostType {
// The MessagePort FIDL service is hosted in-process.
kLocal,
// The MessagePort FIDL service is hosted remotely.
kRemote,
};
// Converts a BlinkMessage to a fuchsia::web::WebMessage.
base::Optional<fuchsia::web::WebMessage> FidlWebMessageFromBlink(
blink::WebMessagePort::Message blink_message,
TransferableHostType port_type);
} // namespace cr_fuchsia
#endif // FUCHSIA_BASE_MESSAGE_PORT_H_
fuchsia/engine/browser/frame_impl.cc
View file @ 12e346a1
......@@ -690,9 +690,11 @@ void FrameImpl::PostMessage(std::string origin,
return;
}
// Convert and pass along any MessagePorts contained in the message.
// Include outgoing MessagePorts in the message.
std::vector<blink::WebMessagePort> message_ports;
if (message.has_outgoing_transfer()) {
// Verify that all the Transferables are valid before we start allocating
// resources to them.
for (const fuchsia::web::OutgoingTransferable& outgoing :
message.outgoing_transfer()) {
if (!outgoing.is_message_port()) {
......
fuchsia/runners/BUILD.gn
View file @ 12e346a1
......@@ -62,21 +62,16 @@ source_set("cast_runner_core") {
"cast/cast_runner.h",
"cast/cast_streaming.cc",
"cast/cast_streaming.h",
"cast/named_message_port_connector_fuchsia.cc",
"cast/named_message_port_connector_fuchsia.h",
"cast/named_message_port_connector.cc",
"cast/named_message_port_connector.h",
"cast/pending_cast_component.cc",
"cast/pending_cast_component.h",
]
data = [
"cast/data/receiver.html",
"${root_gen_dir}/components/cast/named_message_port_connector/named_message_port_connector_resources.pak",
]
data_deps = [ "//chromecast/bindings:named_message_port_connector_resources" ]
data = [ "cast/data" ]
deps = [
"//base",
"//components/cast/named_message_port_connector:named_message_port_connector",
"//components/cast/named_message_port_connector:resources",
"//fuchsia/base",
"//fuchsia/base:message_port",
"//fuchsia/base:modular",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
......@@ -100,10 +95,7 @@ executable("cast_runner_exe") {
":common",
"//base",
"//fuchsia/base",
"//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when MPP lands.
"//ui/base",
]
data_deps = [ ":cast_runner_core" ]
visibility = [ ":*" ]
}
......@@ -165,9 +157,7 @@ test("cast_runner_integration_tests") {
":cast_runner_test_core",
"//base/test:run_all_unittests",
"//base/test:test_support",
"//components/cast/named_message_port_connector:resources",
"//fuchsia/base:test_support",
"//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when MPP lands.
"//net:test_support",
"//testing/gtest",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.camera3",
......@@ -175,9 +165,7 @@ test("cast_runner_integration_tests") {
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//ui/base",
]
data_deps = [ ":cast_runner_core" ]
package_deps = [ [
"//fuchsia/engine:web_engine",
"web_engine",
......@@ -187,7 +175,7 @@ test("cast_runner_integration_tests") {
test("cast_runner_browsertests") {
sources = [
"cast/api_bindings_client_browsertest.cc",
"cast/named_message_port_connector_fuchsia_browsertest.cc",
"cast/named_message_port_connector_browsertest.cc",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
data = [ "cast/testdata" ]
......@@ -198,7 +186,6 @@ test("cast_runner_browsertests") {
"//content/public/browser",
"//content/test:test_support",
"//fuchsia/base",
"//fuchsia/base:message_port",
"//fuchsia/base:test_support",
"//fuchsia/engine:browsertest_core",
"//testing/gmock",
......
fuchsia/runners/cast/DEPS
View file @ 12e346a1
include_rules = [
"+components/cast/named_message_port_connector",
"+content/public/test",
"+mojo/core/embedder",
"+ui/base/resource",
]
]
\ No newline at end of file
fuchsia/runners/cast/api_bindings_client.cc
View file @ 12e346a1
......@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/strings/string_piece.h"
#include "fuchsia/base/message_port.h"
namespace {
......@@ -36,7 +35,7 @@ ApiBindingsClient::ApiBindingsClient(
ApiBindingsClient::~ApiBindingsClient() {
if (connector_ && frame_) {
connector_->RegisterPortHandler({});
connector_->Register({});
// Remove all injected scripts using their automatically enumerated IDs.
for (uint64_t i = 0; i < bindings_->size(); ++i)
......@@ -44,10 +43,9 @@ ApiBindingsClient::~ApiBindingsClient() {
}
}
void ApiBindingsClient::AttachToFrame(
fuchsia::web::Frame* frame,
cast_api_bindings::NamedMessagePortConnector* connector,
base::OnceClosure on_error_callback) {
void ApiBindingsClient::AttachToFrame(fuchsia::web::Frame* frame,
NamedMessagePortConnector* connector,
base::OnceClosure on_error_callback) {
DCHECK(!frame_) << "AttachToFrame() was called twice.";
DCHECK(frame);
DCHECK(connector);
......@@ -64,8 +62,8 @@ void ApiBindingsClient::AttachToFrame(
std::move(on_error_callback).Run();
});
connector_->RegisterPortHandler(base::BindRepeating(
&ApiBindingsClient::OnPortConnected, base::Unretained(this)));
connector_->Register(base::BindRepeating(&ApiBindingsClient::OnPortConnected,
base::Unretained(this)));
// Enumerate and inject all scripts in |bindings|.
uint64_t bindings_id = kBindingsIdStart;
......@@ -89,15 +87,11 @@ bool ApiBindingsClient::HasBindings() const {
return bindings_.has_value();
}
bool ApiBindingsClient::OnPortConnected(base::StringPiece port_name,
blink::WebMessagePort port) {
if (!bindings_service_)
return false;
bindings_service_->Connect(
port_name.as_string(),
cr_fuchsia::FidlMessagePortFromBlink(std::move(port)));
return true;
void ApiBindingsClient::OnPortConnected(
base::StringPiece port_name,
fidl::InterfaceHandle<fuchsia::web::MessagePort> port) {
if (bindings_service_)
bindings_service_->Connect(port_name.as_string(), std::move(port));
}
void ApiBindingsClient::OnBindingsReceived(
......
fuchsia/runners/cast/api_bindings_client.h
View file @ 12e346a1
......@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/optional.h"
#include "components/cast/named_message_port_connector/named_message_port_connector.h"
#include "fuchsia/fidl/chromium/cast/cpp/fidl.h"
#include "fuchsia/runners/cast/named_message_port_connector.h"
// Injects scripts received from the ApiBindings service, and provides connected
// ports to the Agent.
......@@ -31,7 +31,7 @@ class ApiBindingsClient {
// lost connection to the Agent). The callback must remain valid for the
// entire lifetime of |this|.
void AttachToFrame(fuchsia::web::Frame* frame,
cast_api_bindings::NamedMessagePortConnector* connector,
NamedMessagePortConnector* connector,
base::OnceClosure on_error_callback);
// Indicates that the Frame is no longer live, preventing the API bindings
......@@ -45,15 +45,17 @@ class ApiBindingsClient {
// TODO(crbug.com/1082821): Move this method back to private once the Cast
// Streaming Receiver component has been implemented.
// Called when |connector_| has connected a port.
bool OnPortConnected(base::StringPiece port_name, blink::WebMessagePort port);
void OnPortConnected(base::StringPiece port_name,
fidl::InterfaceHandle<fuchsia::web::MessagePort> port);
private:
// Called when ApiBindings::GetAll() has responded.
void OnBindingsReceived(std::vector<chromium::cast::ApiBinding> bindings);
base::Optional<std::vector<chromium::cast::ApiBinding>> bindings_;
fuchsia::web::Frame* frame_ = nullptr;
cast_api_bindings::NamedMessagePortConnector* connector_ = nullptr;
NamedMessagePortConnector* connector_ = nullptr;
chromium::cast::ApiBindingsPtr bindings_service_;
base::OnceClosure on_initialization_complete_;
......
fuchsia/runners/cast/api_bindings_client_browsertest.cc
View file @ 12e346a1
......@@ -5,24 +5,17 @@
#include <fuchsia/web/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
#include "base/barrier_closure.h"
#include "base/base_paths_fuchsia.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/test/bind_test_util.h"
#include "content/public/test/browser_test.h"
#include "fuchsia/base/fit_adapter.h"
#include "fuchsia/base/frame_test_util.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "fuchsia/base/message_port.h"
#include "fuchsia/base/result_receiver.h"
#include "fuchsia/base/test_navigation_listener.h"
#include "fuchsia/engine/test/web_engine_browser_test.h"
#include "fuchsia/runners/cast/api_bindings_client.h"
#include "fuchsia/runners/cast/named_message_port_connector_fuchsia.h"
#include "fuchsia/runners/cast/test_api_bindings.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
......@@ -34,8 +27,6 @@ class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
~ApiBindingsClientTest() override = default;
void SetUp() override { cr_fuchsia::WebEngineBrowserTest::SetUp(); }
protected:
void StartClient() {
base::ScopedAllowBlockingForTesting allow_blocking;
......@@ -50,23 +41,7 @@ class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
frame_ = WebEngineBrowserTest::CreateFrame(&navigation_listener_);
frame_->GetNavigationController(controller_.NewRequest());
static bool g_js_resources_loaded = false;
if (!g_js_resources_loaded) {
base::FilePath pak_file;
bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file);
DCHECK(result);
pak_file = pak_file.Append(
FILE_PATH_LITERAL("components/cast/named_message_port_connector/"
"named_message_port_connector_resources.pak"));
DCHECK(base::PathExists(pak_file));
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
pak_file, ui::ScaleFactor::SCALE_FACTOR_NONE);
g_js_resources_loaded = true;
}
connector_ =
std::make_unique<NamedMessagePortConnectorFuchsia>(frame_.get());
connector_ = std::make_unique<NamedMessagePortConnector>(frame_.get());
client_->AttachToFrame(frame_.get(), connector_.get(),
base::MakeExpectedNotRunClosure(FROM_HERE));
}
......@@ -82,7 +57,7 @@ class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
}
fuchsia::web::FramePtr frame_;
std::unique_ptr<NamedMessagePortConnectorFuchsia> connector_;
std::unique_ptr<NamedMessagePortConnector> connector_;
TestApiBindings api_service_;
fidl::Binding<chromium::cast::ApiBindings> api_service_binding_;
std::unique_ptr<ApiBindingsClient> client_;
......@@ -92,11 +67,7 @@ class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
DISALLOW_COPY_AND_ASSIGN(ApiBindingsClientTest);
};
// Tests API registration, injection, and message IPC.
// Registers a port that echoes messages received over a MessagePort back to the
// sender.
IN_PROC_BROWSER_TEST_F(ApiBindingsClientTest, EndToEnd) {
// Define the injected bindings.
std::vector<chromium::cast::ApiBinding> binding_list;
chromium::cast::ApiBinding echo_binding;
echo_binding.set_before_load_script(cr_fuchsia::MemBufferFromString(
......@@ -104,41 +75,24 @@ IN_PROC_BROWSER_TEST_F(ApiBindingsClientTest, EndToEnd) {
"test"));
binding_list.emplace_back(std::move(echo_binding));
api_service_.set_bindings(std::move(binding_list));
StartClient();
base::RunLoop post_message_responses_loop;
base::RepeatingClosure post_message_response_closure =
base::BarrierClosure(2, post_message_responses_loop.QuitClosure());
// Navigate to a test page that makes use of the injected bindings.
const GURL test_url = embedded_test_server()->GetURL("/echo.html");
EXPECT_TRUE(cr_fuchsia::LoadUrlAndExpectResponse(
controller_.get(), fuchsia::web::LoadUrlParams(), test_url.spec()));
navigation_listener_.RunUntilUrlEquals(test_url);
frame_->PostMessage("*",
std::move(*cr_fuchsia::FidlWebMessageFromBlink(
connector_->GetConnectMessage(),
cr_fuchsia::TransferableHostType::kRemote)),
[&post_message_response_closure](
fuchsia::web::Frame_PostMessage_Result result) {
ASSERT_TRUE(result.is_response());
post_message_response_closure.Run();
});
// Connect to the echo service hosted by the page and send a ping to it.
fuchsia::web::WebMessage message;
message.set_data(cr_fuchsia::MemBufferFromString("ping", "ping-msg"));
connector_->OnPageLoad();
fuchsia::web::MessagePortPtr port =
api_service_.RunUntilMessagePortReceived("echoService").Bind();
fuchsia::web::WebMessage message;
message.set_data(cr_fuchsia::MemBufferFromString("ping", "ping-msg"));
port->PostMessage(std::move(message),
[&post_message_response_closure](
fuchsia::web::MessagePort_PostMessage_Result result) {
ASSERT_TRUE(result.is_response());
post_message_response_closure.Run();
[](fuchsia::web::MessagePort_PostMessage_Result result) {
EXPECT_TRUE(result.is_response());
});
// Handle the ping response.
base::RunLoop response_loop;
cr_fuchsia::ResultReceiver<fuchsia::web::WebMessage> response(
response_loop.QuitClosure());
......@@ -150,9 +104,6 @@ IN_PROC_BROWSER_TEST_F(ApiBindingsClientTest, EndToEnd) {
EXPECT_TRUE(
cr_fuchsia::StringFromMemBuffer(response->data(), &response_string));
EXPECT_EQ("ack ping", response_string);
// Ensure that we've received acks for all messages.
post_message_responses_loop.Run();
}
} // namespace
fuchsia/runners/cast/cast_component.cc
View file @ 12e346a1
......@@ -7,7 +7,6 @@
#include <lib/fidl/cpp/binding.h>
#include <lib/ui/scenic/cpp/view_ref_pair.h>
#include <algorithm>
#include <string>
#include <utility>
#include "base/auto_reset.h"
......@@ -18,7 +17,6 @@
#include "base/task/current_thread.h"
#include "fuchsia/base/agent_manager.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "fuchsia/base/message_port.h"
#include "fuchsia/fidl/chromium/cast/cpp/fidl.h"
#include "fuchsia/runners/cast/cast_runner.h"
#include "fuchsia/runners/cast/cast_streaming.h"
......@@ -80,7 +78,7 @@ void CastComponent::StartComponent() {
WebComponent::StartComponent();
connector_ = std::make_unique<NamedMessagePortConnectorFuchsia>(frame());
connector_ = std::make_unique<NamedMessagePortConnector>(frame());
url_rewrite_rules_provider_.set_error_handler([this](zx_status_t status) {
ZX_LOG_IF(ERROR, status != ZX_OK, status)
......@@ -117,9 +115,8 @@ void CastComponent::StartComponent() {
fuchsia::sys::TerminationReason::INTERNAL_ERROR);
}
});
api_bindings_client_->OnPortConnected(
kCastStreamingMessagePortName,
cr_fuchsia::BlinkMessagePortFromFidl(std::move(message_port)));
api_bindings_client_->OnPortConnected(kCastStreamingMessagePortName,
std::move(message_port));
}
api_bindings_client_->AttachToFrame(
......@@ -169,7 +166,6 @@ void CastComponent::DestroyComponent(int64_t exit_code,
// frame() is about to be destroyed, so there is no need to perform cleanup
// such as removing before-load JavaScripts.
api_bindings_client_->DetachFromFrame(frame());
connector_->DetachFromFrame();
WebComponent::DestroyComponent(exit_code, reason);
}
......@@ -185,18 +181,8 @@ void CastComponent::OnRewriteRulesReceived(
void CastComponent::OnNavigationStateChanged(
fuchsia::web::NavigationState change,
OnNavigationStateChangedCallback callback) {
if (change.has_is_main_document_loaded() &&
change.is_main_document_loaded()) {
// Send the NamedMessagePortConnector handshake to the page.
frame()->PostMessage("*",
*cr_fuchsia::FidlWebMessageFromBlink(
connector_->GetConnectMessage(),
cr_fuchsia::TransferableHostType::kRemote),
[](fuchsia::web::Frame_PostMessage_Result result) {
DCHECK(result.is_response());
});
}
if (change.has_is_main_document_loaded() && change.is_main_document_loaded())
connector_->OnPageLoad();
WebComponent::OnNavigationStateChanged(std::move(change),
std::move(callback));
}
......
fuchsia/runners/cast/cast_component.h
View file @ 12e346a1
......@@ -17,7 +17,7 @@
#include "fuchsia/fidl/chromium/cast/cpp/fidl.h"
#include "fuchsia/runners/cast/api_bindings_client.h"
#include "fuchsia/runners/cast/application_controller_impl.h"
#include "fuchsia/runners/cast/named_message_port_connector_fuchsia.h"
#include "fuchsia/runners/cast/named_message_port_connector.h"
#include "fuchsia/runners/common/web_component.h"
namespace cr_fuchsia {
......@@ -108,7 +108,7 @@ class CastComponent : public WebComponent,
std::vector<fuchsia::web::UrlRequestRewriteRule> initial_url_rewrite_rules_;
bool constructor_active_ = false;
std::unique_ptr<NamedMessagePortConnectorFuchsia> connector_;
std::unique_ptr<NamedMessagePortConnector> connector_;
std::unique_ptr<ApiBindingsClient> api_bindings_client_;
std::unique_ptr<ApplicationControllerImpl> application_controller_;
chromium::cast::ApplicationContextPtr application_context_;
......
fuchsia/runners/cast/cast_runner_integration_test.cc
View file @ 12e346a1
......@@ -16,7 +16,6 @@
#include "base/base_paths_fuchsia.h"
#include "base/callback_helpers.h"
#include "base/files/file_util.h"
#include "base/fuchsia/file_utils.h"
#include "base/fuchsia/filtered_service_directory.h"
#include "base/fuchsia/fuchsia_logging.h"
......@@ -43,11 +42,9 @@
#include "fuchsia/runners/cast/cast_runner.h"
#include "fuchsia/runners/cast/fake_application_config_manager.h"
#include "fuchsia/runners/cast/test_api_bindings.h"
#include "mojo/core/embedder/embedder.h"
#include "net/test/embedded_test_server/default_handlers.h"
#include "net/test/embedded_test_server/http_request.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
......@@ -227,23 +224,6 @@ class CastRunnerIntegrationTest : public testing::Test {
CastRunnerIntegrationTest& operator=(const CastRunnerIntegrationTest&) =
delete;
void SetUp() override {
mojo::core::Init();
static bool g_resources_loaded = false;
if (!g_resources_loaded) {
base::FilePath pak_file;
bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file);
DCHECK(result);
pak_file = pak_file.Append(
FILE_PATH_LITERAL("components/cast/named_message_port_connector/"
"named_message_port_connector_resources.pak"));
DCHECK(base::PathExists(pak_file));
ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
g_resources_loaded = true;
}
}
void TearDown() override {
if (component_controller_)
ShutdownComponent();
......
fuchsia/runners/cast/main.cc
View file @ 12e346a1
......@@ -9,7 +9,6 @@
#include "base/fuchsia/scoped_service_binding.h"
#include "base/message_loop/message_pump_type.h"
#include "base/optional.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
#include "base/values.h"
......@@ -19,8 +18,6 @@
#include "fuchsia/base/init_logging.h"
#include "fuchsia/base/inspect.h"
#include "fuchsia/runners/cast/cast_runner.h"
#include "mojo/core/embedder/embedder.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
......@@ -49,16 +46,6 @@ bool AllowMainContextSharing() {
return false;
}
void LoadResources() {
base::FilePath pak_file;
bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file);
DCHECK(result);
pak_file = pak_file.Append(
FILE_PATH_LITERAL("components/cast_api_bindings/"
"named_message_port_connector_resources.pak"));
ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
} // namespace
int main(int argc, char** argv) {
......@@ -72,10 +59,6 @@ int main(int argc, char** argv) {
*base::CommandLine::ForCurrentProcess()))
<< "Failed to initialize logging.";
mojo::core::Init();
LoadResources();
cr_fuchsia::RegisterFuchsiaDirScheme();
sys::OutgoingDirectory* const outgoing_directory =
......
fuchsia/runners/cast/named_message_port_connector.cc 0 → 100644
View file @ 12e346a1
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "fuchsia/runners/cast/named_message_port_connector.h"
#include <memory>
#include <utility>
#include <vector>
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "fuchsia/runners/cast/cast_platform_bindings_ids.h"
namespace {
const char kBindingsJsPath[] = FILE_PATH_LITERAL(
"chromecast/bindings/resources/named_message_port_connector.js");
const char kControlPortConnectMessage[] = "cast.master.connect";
} // namespace
NamedMessagePortConnector::NamedMessagePortConnector(fuchsia::web::Frame* frame)
: frame_(frame) {
DCHECK(frame_);
// Inject the script providing the connection API into the Frame.
base::FilePath assets_path;
bool path_service_result =
base::PathService::Get(base::DIR_ASSETS, &assets_path);
DCHECK(path_service_result);
fuchsia::mem::Buffer bindings_script_ = cr_fuchsia::MemBufferFromFile(
base::File(assets_path.AppendASCII(kBindingsJsPath),
base::File::FLAG_OPEN | base::File::FLAG_READ));
std::vector<std::string> origins = {"*"};
frame_->AddBeforeLoadJavaScript(
static_cast<uint64_t>(
CastPlatformBindingsId::NAMED_MESSAGE_PORT_CONNECTOR),
std::move(origins),
cr_fuchsia::CloneBuffer(bindings_script_, "cast-bindings-js"),
[](fuchsia::web::Frame_AddBeforeLoadJavaScript_Result result) {
CHECK(result.is_response()) << "Couldn't inject bindings.";
});
}
NamedMessagePortConnector::~NamedMessagePortConnector() {
if (frame_) {
// Don't attempt to remove before-load JavaScript when being deleted because
// the Frame has disconnected.
frame_->RemoveBeforeLoadJavaScript(static_cast<uint64_t>(
CastPlatformBindingsId::NAMED_MESSAGE_PORT_CONNECTOR));
}
}
void NamedMessagePortConnector::Register(DefaultPortConnectedCallback handler) {
default_handler_ = std::move(handler);
}
void NamedMessagePortConnector::OnPageLoad() {
control_port_.Unbind();
fuchsia::web::WebMessage message;
message.set_data(cr_fuchsia::MemBufferFromString(kControlPortConnectMessage,
"cast-connect-message"));
std::vector<fuchsia::web::OutgoingTransferable> outgoing_vector(1);
outgoing_vector[0].set_message_port(control_port_.NewRequest());
message.set_outgoing_transfer(std::move(outgoing_vector));
frame_->PostMessage("*", std::move(message),
[](fuchsia::web::Frame_PostMessage_Result result) {
DCHECK(result.is_response());
});
ReceiveNextConnectRequest();
}
void NamedMessagePortConnector::ReceiveNextConnectRequest() {
DCHECK(control_port_);
control_port_->ReceiveMessage(
fit::bind_member(this, &NamedMessagePortConnector::OnConnectRequest));
}
void NamedMessagePortConnector::OnConnectRequest(
fuchsia::web::WebMessage message) {
std::string port_name;
if (!message.has_data() ||
!cr_fuchsia::StringFromMemBuffer(message.data(), &port_name)) {
LOG(ERROR) << "Couldn't read from message VMO.";
control_port_.Unbind();
return;
}
size_t num_transfers = message.has_incoming_transfer() ?
message.incoming_transfer().size() : 0U;
if (num_transfers != 1) {
LOG(ERROR) << "Expected one Transferable, got " << num_transfers
<< " instead.";
control_port_.Unbind();
return;
}
fuchsia::web::IncomingTransferable& transferable =
(*message.mutable_incoming_transfer())[0];
if (!transferable.is_message_port()) {
LOG(ERROR) << "Transferable is not a MessagePort.";
control_port_.Unbind();
return;
}
DCHECK(default_handler_);
default_handler_.Run(port_name, std::move(transferable.message_port()));
ReceiveNextConnectRequest();
}
fuchsia/runners/cast/named_message_port_connector.h 0 → 100644
View file @ 12e346a1
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_H_
#define FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_H_
#include <fuchsia/web/cpp/fidl.h>
#include <lib/fidl/cpp/interface_handle.h>
#include <map>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
// Injects an API into |frame| through which it can connect MessagePorts to one
// or more services registered by the caller.
class NamedMessagePortConnector {
public:
using DefaultPortConnectedCallback = base::RepeatingCallback<void(
base::StringPiece,
fidl::InterfaceHandle<fuchsia::web::MessagePort>)>;
explicit NamedMessagePortConnector(fuchsia::web::Frame* frame);
~NamedMessagePortConnector();
// Sets the handler that is called for connected ports which aren't
// registered in advance.
void Register(DefaultPortConnectedCallback handler);
// Invoked by the caller after every |frame_| page load.
// Half-connected ports from prior page generations will be discarded.
void OnPageLoad();
private:
// Gets the next port from |control_port_|.
void ReceiveNextConnectRequest();
// Handles a port received from |control_port_|.
void OnConnectRequest(fuchsia::web::WebMessage message);
fuchsia::web::Frame* const frame_;
// Invoked for ports which weren't previously Register()'ed.
DefaultPortConnectedCallback default_handler_;
fuchsia::web::MessagePortPtr control_port_;
DISALLOW_COPY_AND_ASSIGN(NamedMessagePortConnector);
};
#endif // FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_H_
fuchsia/runners/cast/named_message_port_connector_fuchsia_browsertest.cc → fuchsia/runners/cast/named_message_port_connector_browsertest.cc
View file @ 12e346a1
......@@ -9,54 +9,38 @@
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/path_service.h"
#include "base/threading/thread_restrictions.h"
#include "content/public/test/browser_test.h"
#include "fuchsia/base/fit_adapter.h"
#include "fuchsia/base/frame_test_util.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "fuchsia/base/message_port.h"
#include "fuchsia/base/result_receiver.h"
#include "fuchsia/base/test_navigation_listener.h"
#include "fuchsia/engine/test/web_engine_browser_test.h"
#include "fuchsia/runners/cast/named_message_port_connector_fuchsia.h"
#include "fuchsia/runners/cast/named_message_port_connector.h"
#include "testing/gmock/include/gmock/gmock-matchers.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "url/url_constants.h"
class NamedMessagePortConnectorFuchsiaTest
: public cr_fuchsia::WebEngineBrowserTest {
class NamedMessagePortConnectorTest : public cr_fuchsia::WebEngineBrowserTest {
public:
NamedMessagePortConnectorFuchsiaTest() {
NamedMessagePortConnectorTest() {
set_test_server_root(base::FilePath("fuchsia/runners/cast/testdata"));
navigation_listener_.SetBeforeAckHook(base::BindRepeating(
&NamedMessagePortConnectorFuchsiaTest::OnBeforeAckHook,
base::Unretained(this)));
navigation_listener_.SetBeforeAckHook(
base::BindRepeating(&NamedMessagePortConnectorTest::OnBeforeAckHook,
base::Unretained(this)));
}
~NamedMessagePortConnectorFuchsiaTest() override = default;
~NamedMessagePortConnectorTest() override = default;
protected:
// BrowserTestBase implementation.
void SetUpOnMainThread() override {
cr_fuchsia::WebEngineBrowserTest::SetUpOnMainThread();
frame_ = WebEngineBrowserTest::CreateFrame(&navigation_listener_);
static bool g_js_resources_loaded = false;
if (!g_js_resources_loaded) {
base::FilePath pak_file;
bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file);
DCHECK(result);
pak_file = pak_file.Append(
FILE_PATH_LITERAL("components/cast/named_message_port_connector/"
"named_message_port_connector_resources.pak"));
DCHECK(base::PathExists(pak_file));
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
pak_file, ui::ScaleFactor::SCALE_FACTOR_NONE);
g_js_resources_loaded = true;
}
connector_ =
std::make_unique<NamedMessagePortConnectorFuchsia>(frame_.get());
base::ScopedAllowBlockingForTesting allow_blocking;
connector_ = std::make_unique<NamedMessagePortConnector>(frame_.get());
}
// Intercepts the page load event to trigger the injection of |connector_|'s
......@@ -66,15 +50,8 @@ class NamedMessagePortConnectorFuchsiaTest
fuchsia::web::NavigationEventListener::OnNavigationStateChangedCallback
callback) {
if (change.has_is_main_document_loaded() &&
change.is_main_document_loaded()) {
frame_->PostMessage("*",
std::move(*cr_fuchsia::FidlWebMessageFromBlink(
connector_->GetConnectMessage(),
cr_fuchsia::TransferableHostType::kRemote)),
[](fuchsia::web::Frame_PostMessage_Result result) {
DCHECK(result.is_response());
});
}
change.is_main_document_loaded())
connector_->OnPageLoad();
// Allow the TestNavigationListener's usual navigation event processing flow
// to continue.
......@@ -83,42 +60,36 @@ class NamedMessagePortConnectorFuchsiaTest
std::unique_ptr<base::RunLoop> navigate_run_loop_;
fuchsia::web::FramePtr frame_;
std::unique_ptr<NamedMessagePortConnectorFuchsia> connector_;
std::unique_ptr<NamedMessagePortConnector> connector_;
cr_fuchsia::TestNavigationListener navigation_listener_;
DISALLOW_COPY_AND_ASSIGN(NamedMessagePortConnectorFuchsiaTest);
DISALLOW_COPY_AND_ASSIGN(NamedMessagePortConnectorTest);
};
IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorFuchsiaTest, EndToEnd) {
IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorTest, EndToEnd) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL test_url(embedded_test_server()->GetURL("/connector.html"));
fuchsia::web::NavigationControllerPtr controller;
frame_->GetNavigationController(controller.NewRequest());
std::string received_port_name;
fidl::InterfaceHandle<fuchsia::web::MessagePort> received_port;
base::RunLoop receive_port_run_loop;
connector_->RegisterPortHandler(base::BindRepeating(
[](std::string* received_port_name,
fidl::InterfaceHandle<fuchsia::web::MessagePort>* received_port,
base::RunLoop* receive_port_run_loop, base::StringPiece port_name,
blink::WebMessagePort port) -> bool {
*received_port_name = port_name.as_string();
*received_port = cr_fuchsia::FidlMessagePortFromBlink(std::move(port));
connector_->Register(base::BindRepeating(
[](fidl::InterfaceHandle<fuchsia::web::MessagePort>* received_port,
base::RunLoop* receive_port_run_loop, base::StringPiece name,
fidl::InterfaceHandle<fuchsia::web::MessagePort> message_port) {
*received_port = std::move(message_port);
receive_port_run_loop->Quit();
return true;
},
base::Unretained(&received_port_name), base::Unretained(&received_port),
base::Unretained(&received_port),
base::Unretained(&receive_port_run_loop)));
EXPECT_TRUE(cr_fuchsia::LoadUrlAndExpectResponse(
controller.get(), fuchsia::web::LoadUrlParams(), test_url.spec()));
navigation_listener_.RunUntilUrlEquals(test_url);
// The JS code in connector.html should connect to the port "echo".
receive_port_run_loop.Run();
EXPECT_EQ(received_port_name, "echo");
fuchsia::web::MessagePortPtr message_port = received_port.Bind();
......@@ -159,11 +130,9 @@ IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorFuchsiaTest, EndToEnd) {
}
}
// Tests that the NamedMessagePortConnectorFuchsia can receive more than one
// port over its lifetime.
IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorFuchsiaTest, MultiplePorts) {
constexpr size_t kExpectedPortCount = 3;
// Tests that the NamedMessagePortConnector can receive more than one port over
// its lifetime.
IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorTest, MultiplePorts) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL test_url(
embedded_test_server()->GetURL("/connector_multiple_ports.html"));
......@@ -173,18 +142,15 @@ IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorFuchsiaTest, MultiplePorts) {
std::vector<fidl::InterfaceHandle<fuchsia::web::MessagePort>> received_ports;
base::RunLoop receive_ports_run_loop;
connector_->RegisterPortHandler(base::BindRepeating(
connector_->Register(base::BindRepeating(
[](std::vector<fidl::InterfaceHandle<fuchsia::web::MessagePort>>*
received_ports,
base::RunLoop* receive_ports_run_loop, base::StringPiece,
blink::WebMessagePort port) -> bool {
received_ports->push_back(
cr_fuchsia::FidlMessagePortFromBlink(std::move(port)));
base::RunLoop* receive_ports_run_loop, base::StringPiece name,
fidl::InterfaceHandle<fuchsia::web::MessagePort> message_port) {
received_ports->push_back(std::move(message_port));
if (received_ports->size() == kExpectedPortCount)
if (received_ports->size() == 3)
receive_ports_run_loop->Quit();
return true;
},
base::Unretained(&received_ports),
base::Unretained(&receive_ports_run_loop)));
......@@ -192,6 +158,7 @@ IN_PROC_BROWSER_TEST_F(NamedMessagePortConnectorFuchsiaTest, MultiplePorts) {
EXPECT_TRUE(cr_fuchsia::LoadUrlAndExpectResponse(
controller.get(), fuchsia::web::LoadUrlParams(), test_url.spec()));
navigation_listener_.RunUntilUrlEquals(test_url);
receive_ports_run_loop.Run();
for (fidl::InterfaceHandle<fuchsia::web::MessagePort>& message_port :
......
fuchsia/runners/cast/named_message_port_connector_fuchsia.cc deleted 100644 → 0
View file @ 2e3ca42a
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "fuchsia/runners/cast/named_message_port_connector_fuchsia.h"
#include <fuchsia/web/cpp/fidl.h>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "base/logging.h"
#include "components/cast/named_message_port_connector/grit/named_message_port_connector_resources.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
constexpr uint64_t kPortConnectorBindingsId = 1000;
} // namespace
NamedMessagePortConnectorFuchsia::NamedMessagePortConnectorFuchsia(
fuchsia::web::Frame* frame)
: frame_(frame) {
DCHECK(frame_);
std::string bindings_script_string =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
IDR_PORT_CONNECTOR_JS);
DCHECK(!bindings_script_string.empty())
<< "NamedMessagePortConnector resources not loaded.";
// Inject the JS connection API into the Frame.
constexpr char kBindingsScriptVmoName[] = "port-connector-js";
fuchsia::mem::Buffer bindings_script = cr_fuchsia::MemBufferFromString(
std::move(bindings_script_string), kBindingsScriptVmoName);
std::vector<std::string> origins = {"*"};
frame_->AddBeforeLoadJavaScript(
kPortConnectorBindingsId, std::move(origins), std::move(bindings_script),
[](fuchsia::web::Frame_AddBeforeLoadJavaScript_Result result) {
CHECK(result.is_response())
<< "Couldn't inject port connector bindings.";
});
}
NamedMessagePortConnectorFuchsia::~NamedMessagePortConnectorFuchsia() {
// Nothing to do if there is no attached Frame.
if (!frame_)
return;
frame_->RemoveBeforeLoadJavaScript(kPortConnectorBindingsId);
}
void NamedMessagePortConnectorFuchsia::DetachFromFrame() {
frame_ = nullptr;
}
fuchsia/runners/cast/named_message_port_connector_fuchsia.h deleted 100644 → 0
View file @ 2e3ca42a
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_FUCHSIA_H_
#define FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_FUCHSIA_H_
#include "components/cast/named_message_port_connector/named_message_port_connector.h"
namespace fuchsia {
namespace web {
class Frame;
}
} // namespace fuchsia
// Publishes NamedMessagePortConnector services to documents loaded in |frame|.
// OnFrameDisconnect() should be called if the FramePtr is torn down before
// |this|.
class NamedMessagePortConnectorFuchsia
: public cast_api_bindings::NamedMessagePortConnector {
public:
explicit NamedMessagePortConnectorFuchsia(fuchsia::web::Frame* frame);
~NamedMessagePortConnectorFuchsia() override;
NamedMessagePortConnectorFuchsia(const NamedMessagePortConnectorFuchsia&) =
delete;
void operator=(const NamedMessagePortConnectorFuchsia&) = delete;
// Called when the peer Frame connection has terminated.
void DetachFromFrame();
private:
fuchsia::web::Frame* frame_ = nullptr;
};
#endif // FUCHSIA_RUNNERS_CAST_NAMED_MESSAGE_PORT_CONNECTOR_FUCHSIA_H_
fuchsia/runners/cast/testdata/connector.html
View file @ 12e346a1
......@@ -2,7 +2,7 @@
<head><title>bindings</title></head>
<body>
<script>
var testChannel = cast.__platform__.PortConnector.bind('echo');
var testChannel = cast.__platform__.PortConnector.bind('hello');
testChannel.onmessage = function(msg) {
testChannel.postMessage('ack ' + msg.data);
return true;
......
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