Commit b921591d authored by Yutaka Hirano's avatar Yutaka Hirano Committed by Commit Bot

Move websocket.mojom from third_party/WebKit to services/network

As a preparation to integrate websocket with the network service, this
CL moves the mojom file to /services/network.

Bug: 721400
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I1284cbd9dd3292c41d1acba34835c6c6d44d48a3
Reviewed-on: https://chromium-review.googlesource.com/961173Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543632}
parent 13856378
......@@ -125,9 +125,9 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind(&ForwardServiceRequest<device::mojom::VibrationManager>,
device::mojom::kServiceName));
parameterized_binder_registry_.AddInterface(
base::Bind([](blink::mojom::WebSocketRequest request,
RenderProcessHost* host, const url::Origin& origin) {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](network::mojom::WebSocketRequest request, RenderProcessHost* host,
const url::Origin& origin) {
WebSocketManager::CreateWebSocketWithOrigin(
host->GetID(), origin, std::move(request), MSG_ROUTING_NONE);
}));
......
# WebSocket service
This directory contains the blink::mojom::WebSocket implementation. It hosts
This directory contains the network::mojom::WebSocket implementation. It hosts
the WebSocket API implementations in Blink over Mojo, and exports the WebSocket
protocol implementation in net/websockets/ as a service.
......@@ -44,38 +44,38 @@ namespace {
typedef net::WebSocketEventInterface::ChannelState ChannelState;
// Convert a blink::mojom::WebSocketMessageType to a
// Convert a network::mojom::WebSocketMessageType to a
// net::WebSocketFrameHeader::OpCode
net::WebSocketFrameHeader::OpCode MessageTypeToOpCode(
blink::mojom::WebSocketMessageType type) {
DCHECK(type == blink::mojom::WebSocketMessageType::CONTINUATION ||
type == blink::mojom::WebSocketMessageType::TEXT ||
type == blink::mojom::WebSocketMessageType::BINARY);
network::mojom::WebSocketMessageType type) {
DCHECK(type == network::mojom::WebSocketMessageType::CONTINUATION ||
type == network::mojom::WebSocketMessageType::TEXT ||
type == network::mojom::WebSocketMessageType::BINARY);
typedef net::WebSocketFrameHeader::OpCode OpCode;
// These compile asserts verify that the same underlying values are used for
// both types, so we can simply cast between them.
static_assert(
static_cast<OpCode>(blink::mojom::WebSocketMessageType::CONTINUATION) ==
static_cast<OpCode>(network::mojom::WebSocketMessageType::CONTINUATION) ==
net::WebSocketFrameHeader::kOpCodeContinuation,
"enum values must match for opcode continuation");
static_assert(
static_cast<OpCode>(blink::mojom::WebSocketMessageType::TEXT) ==
static_cast<OpCode>(network::mojom::WebSocketMessageType::TEXT) ==
net::WebSocketFrameHeader::kOpCodeText,
"enum values must match for opcode text");
static_assert(
static_cast<OpCode>(blink::mojom::WebSocketMessageType::BINARY) ==
static_cast<OpCode>(network::mojom::WebSocketMessageType::BINARY) ==
net::WebSocketFrameHeader::kOpCodeBinary,
"enum values must match for opcode binary");
return static_cast<OpCode>(type);
}
blink::mojom::WebSocketMessageType OpCodeToMessageType(
network::mojom::WebSocketMessageType OpCodeToMessageType(
net::WebSocketFrameHeader::OpCode opCode) {
DCHECK(opCode == net::WebSocketFrameHeader::kOpCodeContinuation ||
opCode == net::WebSocketFrameHeader::kOpCodeText ||
opCode == net::WebSocketFrameHeader::kOpCodeBinary);
// This cast is guaranteed valid by the static_assert() statements above.
return static_cast<blink::mojom::WebSocketMessageType>(opCode);
return static_cast<network::mojom::WebSocketMessageType>(opCode);
}
} // namespace
......@@ -257,12 +257,12 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnStartOpeningHandshake(
if (!should_send)
return WebSocketEventInterface::CHANNEL_ALIVE;
blink::mojom::WebSocketHandshakeRequestPtr request_to_pass(
blink::mojom::WebSocketHandshakeRequest::New());
network::mojom::WebSocketHandshakeRequestPtr request_to_pass(
network::mojom::WebSocketHandshakeRequest::New());
request_to_pass->url.Swap(&request->url);
net::HttpRequestHeaders::Iterator it(request->headers);
while (it.GetNext()) {
blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New());
network::mojom::HttpHeaderPtr header(network::mojom::HttpHeader::New());
header->name = it.name();
header->value = it.value();
request_to_pass->headers.push_back(std::move(header));
......@@ -289,15 +289,15 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnFinishOpeningHandshake(
if (!should_send)
return WebSocketEventInterface::CHANNEL_ALIVE;
blink::mojom::WebSocketHandshakeResponsePtr response_to_pass(
blink::mojom::WebSocketHandshakeResponse::New());
network::mojom::WebSocketHandshakeResponsePtr response_to_pass(
network::mojom::WebSocketHandshakeResponse::New());
response_to_pass->url.Swap(&response->url);
response_to_pass->status_code = response->status_code;
response_to_pass->status_text = response->status_text;
size_t iter = 0;
std::string name, value;
while (response->headers->EnumerateHeaderLines(&iter, &name, &value)) {
blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New());
network::mojom::HttpHeaderPtr header(network::mojom::HttpHeader::New());
header->name = name;
header->value = value;
response_to_pass->headers.push_back(std::move(header));
......@@ -362,7 +362,7 @@ void WebSocketImpl::WebSocketEventHandler::SSLErrorHandlerDelegate::
}
WebSocketImpl::WebSocketImpl(Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int child_id,
int frame_id,
url::Origin origin,
......@@ -392,7 +392,7 @@ void WebSocketImpl::AddChannelRequest(
const std::vector<std::string>& requested_protocols,
const GURL& site_for_cookies,
const std::string& user_agent_override,
blink::mojom::WebSocketClientPtr client) {
network::mojom::WebSocketClientPtr client) {
DVLOG(3) << "WebSocketImpl::AddChannelRequest @"
<< reinterpret_cast<void*>(this) << " socket_url=\"" << socket_url
<< "\" requested_protocols=\""
......@@ -425,7 +425,7 @@ void WebSocketImpl::AddChannelRequest(
}
void WebSocketImpl::SendFrame(bool fin,
blink::mojom::WebSocketMessageType type,
network::mojom::WebSocketMessageType type,
const std::vector<uint8_t>& data) {
DVLOG(3) << "WebSocketImpl::SendFrame @"
<< reinterpret_cast<void*>(this) << " fin=" << fin
......
......@@ -16,7 +16,7 @@
#include "base/time/time.h"
#include "content/common/content_export.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "third_party/WebKit/public/platform/modules/websockets/websocket.mojom.h"
#include "services/network/public/mojom/websocket.mojom.h"
#include "url/origin.h"
class GURL;
......@@ -29,7 +29,7 @@ class WebSocketChannel;
namespace content {
// Host of net::WebSocketChannel.
class CONTENT_EXPORT WebSocketImpl : public blink::mojom::WebSocket {
class CONTENT_EXPORT WebSocketImpl : public network::mojom::WebSocket {
public:
class Delegate {
public:
......@@ -41,7 +41,7 @@ class CONTENT_EXPORT WebSocketImpl : public blink::mojom::WebSocket {
};
WebSocketImpl(Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int child_id,
int frame_id,
url::Origin origin,
......@@ -52,14 +52,14 @@ class CONTENT_EXPORT WebSocketImpl : public blink::mojom::WebSocket {
// This function is virtual for testing.
virtual void GoAway();
// blink::mojom::WebSocket methods:
// network::mojom::WebSocket methods:
void AddChannelRequest(const GURL& url,
const std::vector<std::string>& requested_protocols,
const GURL& site_for_cookies,
const std::string& user_agent_override,
blink::mojom::WebSocketClientPtr client) override;
network::mojom::WebSocketClientPtr client) override;
void SendFrame(bool fin,
blink::mojom::WebSocketMessageType type,
network::mojom::WebSocketMessageType type,
const std::vector<uint8_t>& data) override;
void SendFlowControl(int64_t quota) override;
void StartClosingHandshake(uint16_t code, const std::string& reason) override;
......@@ -77,9 +77,9 @@ class CONTENT_EXPORT WebSocketImpl : public blink::mojom::WebSocket {
const std::string& user_agent_override);
Delegate* delegate_;
mojo::Binding<blink::mojom::WebSocket> binding_;
mojo::Binding<network::mojom::WebSocket> binding_;
blink::mojom::WebSocketClientPtr client_;
network::mojom::WebSocketClientPtr client_;
// The channel we use to send events to the network.
std::unique_ptr<net::WebSocketChannel> channel_;
......
......@@ -58,7 +58,7 @@ class WebSocketManager::Handle : public base::SupportsUserData::Data,
void WebSocketManager::CreateWebSocketForFrame(
int process_id,
int frame_id,
blink::mojom::WebSocketRequest request) {
network::mojom::WebSocketRequest request) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// ForFrame() implies a frame: DCHECK this pre-condition.
......@@ -73,7 +73,7 @@ void WebSocketManager::CreateWebSocketForFrame(
void WebSocketManager::CreateWebSocketWithOrigin(
int process_id,
url::Origin origin,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int frame_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
......@@ -138,20 +138,20 @@ WebSocketManager::~WebSocketManager() {
void WebSocketManager::DoCreateWebSocket(
int frame_id,
url::Origin origin,
blink::mojom::WebSocketRequest request) {
network::mojom::WebSocketRequest request) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (num_pending_connections_ >= kMaxPendingWebSocketConnections) {
// Too many websockets!
request.ResetWithReason(
blink::mojom::WebSocket::kInsufficientResources,
network::mojom::WebSocket::kInsufficientResources,
"Error in connection establishment: net::ERR_INSUFFICIENT_RESOURCES");
return;
}
if (context_destroyed_) {
request.ResetWithReason(
blink::mojom::WebSocket::kInsufficientResources,
network::mojom::WebSocket::kInsufficientResources,
"Error in connection establishment: net::ERR_UNEXPECTED");
return;
}
......@@ -202,7 +202,7 @@ void WebSocketManager::ThrottlingPeriodTimerCallback() {
WebSocketImpl* WebSocketManager::CreateWebSocketImpl(
WebSocketImpl::Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int child_id,
int frame_id,
url::Origin origin,
......
......@@ -30,14 +30,15 @@ class CONTENT_EXPORT WebSocketManager
// Called on the UI thread: create a websocket for a frame.
static void CreateWebSocketForFrame(int process_id,
int frame_id,
blink::mojom::WebSocketRequest request);
network::mojom::WebSocketRequest request);
// Called on the UI thread: create a websocket for a worker. Web workers of
// any type (dedicated, shared, service worker) do not have a frame.
static void CreateWebSocketWithOrigin(int process_id,
url::Origin origin,
blink::mojom::WebSocketRequest request,
int frame_id = MSG_ROUTING_NONE);
static void CreateWebSocketWithOrigin(
int process_id,
url::Origin origin,
network::mojom::WebSocketRequest request,
int frame_id = MSG_ROUTING_NONE);
// net::URLRequestContextGetterObserver implementation.
void OnContextShuttingDown() override;
......@@ -54,14 +55,14 @@ class CONTENT_EXPORT WebSocketManager
~WebSocketManager() override;
void DoCreateWebSocket(int frame_id,
url::Origin origin,
blink::mojom::WebSocketRequest request);
network::mojom::WebSocketRequest request);
base::TimeDelta CalculateDelay() const;
void ThrottlingPeriodTimerCallback();
// This is virtual to support testing.
virtual WebSocketImpl* CreateWebSocketImpl(
WebSocketImpl::Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int child_id,
int frame_id,
url::Origin origin,
......
......@@ -22,7 +22,7 @@ static const int kMagicRenderProcessId = 506116062;
class TestWebSocketImpl : public WebSocketImpl {
public:
TestWebSocketImpl(Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int process_id,
int frame_id,
url::Origin origin,
......@@ -61,14 +61,14 @@ class TestWebSocketManager : public WebSocketManager {
num_previous_succeeded_connections_;
}
void DoCreateWebSocket(blink::mojom::WebSocketRequest request) {
void DoCreateWebSocket(network::mojom::WebSocketRequest request) {
WebSocketManager::DoCreateWebSocket(MSG_ROUTING_NONE, url::Origin(),
std::move(request));
}
private:
WebSocketImpl* CreateWebSocketImpl(WebSocketImpl::Delegate* delegate,
blink::mojom::WebSocketRequest request,
network::mojom::WebSocketRequest request,
int process_id,
int frame_id,
url::Origin origin,
......@@ -102,14 +102,14 @@ class WebSocketManagerTest : public ::testing::Test {
void AddMultipleChannels(int number_of_channels) {
for (int i = 0; i < number_of_channels; ++i) {
blink::mojom::WebSocketPtr websocket;
network::mojom::WebSocketPtr websocket;
websocket_manager_->DoCreateWebSocket(mojo::MakeRequest(&websocket));
}
}
void AddAndCancelMultipleChannels(int number_of_channels) {
for (int i = 0; i < number_of_channels; ++i) {
blink::mojom::WebSocketPtr websocket;
network::mojom::WebSocketPtr websocket;
websocket_manager_->DoCreateWebSocket(mojo::MakeRequest(&websocket));
websocket_manager_->sockets().back()->SimulateConnectionError();
}
......@@ -127,7 +127,7 @@ TEST_F(WebSocketManagerTest, Construct) {
}
TEST_F(WebSocketManagerTest, CreateWebSocket) {
blink::mojom::WebSocketPtr websocket;
network::mojom::WebSocketPtr websocket;
websocket_manager()->DoCreateWebSocket(mojo::MakeRequest(&websocket));
......@@ -135,13 +135,13 @@ TEST_F(WebSocketManagerTest, CreateWebSocket) {
}
TEST_F(WebSocketManagerTest, SendFrameButNotConnectedYet) {
blink::mojom::WebSocketPtr websocket;
network::mojom::WebSocketPtr websocket;
websocket_manager()->DoCreateWebSocket(mojo::MakeRequest(&websocket));
// This should not crash.
std::vector<uint8_t> data;
websocket->SendFrame(true, blink::mojom::WebSocketMessageType::TEXT, data);
websocket->SendFrame(true, network::mojom::WebSocketMessageType::TEXT, data);
}
TEST_F(WebSocketManagerTest, DelayFor4thPendingConnectionIsZero) {
......
......@@ -153,7 +153,6 @@
"blink::mojom::TextSuggestionHost",
"blink::mojom::UnhandledTapNotifier",
"blink::mojom::WebBluetoothService",
"blink::mojom::WebSocket",
// TODO(beng): figure out how to overlay test interfaces like this.
"content::mojom::BrowserTarget",
......@@ -182,6 +181,7 @@
"media::mojom::RemoterFactory",
"media::mojom::Renderer",
"network::mojom::RestrictedCookieManager",
"network::mojom::WebSocket",
"password_manager::mojom::CredentialManager",
"payments::mojom::PaymentManager",
"payments::mojom::PaymentRequest",
......@@ -221,8 +221,8 @@
"blink::mojom::NotificationService",
"blink::mojom::PermissionService",
"blink::mojom::QuotaDispatcherHost",
"blink::mojom::WebSocket",
"network::mojom::RestrictedCookieManager",
"network::mojom::WebSocket",
"payments::mojom::PaymentManager",
"shape_detection::mojom::BarcodeDetection",
"shape_detection::mojom::FaceDetectionProvider",
......@@ -238,7 +238,7 @@
"blink::mojom::NotificationService",
"blink::mojom::PermissionService",
"blink::mojom::QuotaDispatcherHost",
"blink::mojom::WebSocket",
"network::mojom::WebSocket",
"payments::mojom::PaymentManager",
"shape_detection::mojom::BarcodeDetection",
"shape_detection::mojom::FaceDetectionProvider",
......
......@@ -73,6 +73,7 @@ mojom("mojom") {
"tcp_socket.mojom",
"url_loader.mojom",
"url_loader_factory.mojom",
"websocket.mojom",
]
public_deps = [
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
module blink.mojom;
module network.mojom;
import "url/mojom/url.mojom";
......
......@@ -5,4 +5,5 @@ include_rules = [
"+modules/ModulesExport.h",
"+modules/websockets",
"+mojo/public/cpp/bindings",
"+services/network/public/mojom/websocket.mojom-blink.h",
]
......@@ -200,9 +200,10 @@ DocumentWebSocketChannel::~DocumentWebSocketChannel() {
DCHECK(!blob_loader_);
}
bool DocumentWebSocketChannel::Connect(const KURL& url,
const String& protocol,
mojom::blink::WebSocketPtr socket_ptr) {
bool DocumentWebSocketChannel::Connect(
const KURL& url,
const String& protocol,
network::mojom::blink::WebSocketPtr socket_ptr) {
NETWORK_DVLOG(1) << this << " Connect()";
if (!handle_)
return false;
......@@ -286,7 +287,7 @@ bool DocumentWebSocketChannel::Connect(const KURL& url,
bool DocumentWebSocketChannel::Connect(const KURL& url,
const String& protocol) {
mojom::blink::WebSocketPtr socket_ptr;
network::mojom::blink::WebSocketPtr socket_ptr;
auto socket_request = mojo::MakeRequest(&socket_ptr);
if (GetDocument() && GetDocument()->GetFrame()) {
GetDocument()->GetFrame()->GetInterfaceProvider().GetInterface(
......
......@@ -51,7 +51,7 @@
#include "platform/wtf/text/CString.h"
#include "platform/wtf/text/WTFString.h"
#include "public/platform/WebCallbacks.h"
#include "public/platform/modules/websockets/websocket.mojom-blink.h"
#include "services/network/public/mojom/websocket.mojom-blink.h"
namespace blink {
......@@ -91,7 +91,9 @@ class MODULES_EXPORT DocumentWebSocketChannel final
// Allows the caller to provide the Mojo pipe through which the socket is
// connected, overriding the interface provider of the Document.
bool Connect(const KURL&, const String& protocol, mojom::blink::WebSocketPtr);
bool Connect(const KURL&,
const String& protocol,
network::mojom::blink::WebSocketPtr);
// WebSocketChannel functions.
bool Connect(const KURL&, const String& protocol) override;
......
......@@ -82,8 +82,8 @@ class MockWebSocketHandle : public WebSocketHandle {
~MockWebSocketHandle() override = default;
MOCK_METHOD1(DoInitialize, void(mojom::blink::WebSocketPtr*));
void Initialize(mojom::blink::WebSocketPtr websocket) override {
MOCK_METHOD1(DoInitialize, void(network::mojom::blink::WebSocketPtr*));
void Initialize(network::mojom::blink::WebSocketPtr websocket) override {
DoInitialize(&websocket);
}
......
......@@ -35,7 +35,7 @@
#include "base/single_thread_task_runner.h"
#include "platform/wtf/Forward.h"
#include "platform/wtf/Vector.h"
#include "public/platform/modules/websockets/websocket.mojom-blink.h"
#include "services/network/public/mojom/websocket.mojom-blink.h"
namespace blink {
......@@ -60,7 +60,7 @@ class WebSocketHandle {
virtual ~WebSocketHandle() = default;
virtual void Initialize(mojom::blink::WebSocketPtr) = 0;
virtual void Initialize(network::mojom::blink::WebSocketPtr) = 0;
virtual void Connect(const KURL&,
const Vector<String>& protocols,
const KURL& site_for_cookies,
......
......@@ -34,7 +34,8 @@ WebSocketHandleImpl::~WebSocketHandleImpl() {
websocket_->StartClosingHandshake(kAbnormalShutdownOpCode, g_empty_string);
}
void WebSocketHandleImpl::Initialize(mojom::blink::WebSocketPtr websocket) {
void WebSocketHandleImpl::Initialize(
network::mojom::blink::WebSocketPtr websocket) {
NETWORK_DVLOG(1) << this << " initialize(...)";
DCHECK(!websocket_);
......@@ -57,7 +58,7 @@ void WebSocketHandleImpl::Connect(const KURL& url,
DCHECK(client);
client_ = client;
mojom::blink::WebSocketClientPtr client_proxy;
network::mojom::blink::WebSocketClientPtr client_proxy;
client_binding_.Bind(mojo::MakeRequest(&client_proxy, task_runner));
websocket_->AddChannelRequest(
url, protocols, site_for_cookies,
......@@ -71,16 +72,16 @@ void WebSocketHandleImpl::Send(bool fin,
size_t size) {
DCHECK(websocket_);
mojom::blink::WebSocketMessageType type_to_pass;
network::mojom::blink::WebSocketMessageType type_to_pass;
switch (type) {
case WebSocketHandle::kMessageTypeContinuation:
type_to_pass = mojom::blink::WebSocketMessageType::CONTINUATION;
type_to_pass = network::mojom::blink::WebSocketMessageType::CONTINUATION;
break;
case WebSocketHandle::kMessageTypeText:
type_to_pass = mojom::blink::WebSocketMessageType::TEXT;
type_to_pass = network::mojom::blink::WebSocketMessageType::TEXT;
break;
case WebSocketHandle::kMessageTypeBinary:
type_to_pass = mojom::blink::WebSocketMessageType::BINARY;
type_to_pass = network::mojom::blink::WebSocketMessageType::BINARY;
break;
default:
NOTREACHED();
......@@ -124,7 +125,8 @@ void WebSocketHandleImpl::OnConnectionError(uint32_t custom_reason,
// Our connection to the WebSocket was dropped. This could be due to
// exceeding the maximum number of concurrent websockets from this process.
String failure_message;
if (custom_reason == mojom::blink::WebSocket::kInsufficientResources) {
if (custom_reason ==
network::mojom::blink::WebSocket::kInsufficientResources) {
failure_message =
description.empty()
? "Insufficient resources"
......@@ -149,14 +151,14 @@ void WebSocketHandleImpl::OnFailChannel(const String& message) {
}
void WebSocketHandleImpl::OnStartOpeningHandshake(
mojom::blink::WebSocketHandshakeRequestPtr request) {
network::mojom::blink::WebSocketHandshakeRequestPtr request) {
NETWORK_DVLOG(1) << this << " OnStartOpeningHandshake("
<< request->url.GetString() << ")";
scoped_refptr<WebSocketHandshakeRequest> request_to_pass =
WebSocketHandshakeRequest::Create(request->url);
for (size_t i = 0; i < request->headers.size(); ++i) {
const mojom::blink::HttpHeaderPtr& header = request->headers[i];
const network::mojom::blink::HttpHeaderPtr& header = request->headers[i];
request_to_pass->AddHeaderField(AtomicString(header->name),
AtomicString(header->value));
}
......@@ -165,7 +167,7 @@ void WebSocketHandleImpl::OnStartOpeningHandshake(
}
void WebSocketHandleImpl::OnFinishOpeningHandshake(
mojom::blink::WebSocketHandshakeResponsePtr response) {
network::mojom::blink::WebSocketHandshakeResponsePtr response) {
NETWORK_DVLOG(1) << this << " OnFinishOpeningHandshake("
<< response->url.GetString() << ")";
......@@ -173,7 +175,7 @@ void WebSocketHandleImpl::OnFinishOpeningHandshake(
response_to_pass.SetStatusCode(response->status_code);
response_to_pass.SetStatusText(response->status_text);
for (size_t i = 0; i < response->headers.size(); ++i) {
const mojom::blink::HttpHeaderPtr& header = response->headers[i];
const network::mojom::blink::HttpHeaderPtr& header = response->headers[i];
response_to_pass.AddHeaderField(AtomicString(header->name),
AtomicString(header->value));
}
......@@ -193,9 +195,10 @@ void WebSocketHandleImpl::OnAddChannelResponse(const String& protocol,
// |this| can be deleted here.
}
void WebSocketHandleImpl::OnDataFrame(bool fin,
mojom::blink::WebSocketMessageType type,
const Vector<uint8_t>& data) {
void WebSocketHandleImpl::OnDataFrame(
bool fin,
network::mojom::blink::WebSocketMessageType type,
const Vector<uint8_t>& data) {
NETWORK_DVLOG(1) << this << " OnDataFrame(" << fin << ", " << type << ", "
<< "(data size = " << data.size() << "))";
if (!client_)
......@@ -204,13 +207,13 @@ void WebSocketHandleImpl::OnDataFrame(bool fin,
WebSocketHandle::MessageType type_to_pass =
WebSocketHandle::kMessageTypeContinuation;
switch (type) {
case mojom::blink::WebSocketMessageType::CONTINUATION:
case network::mojom::blink::WebSocketMessageType::CONTINUATION:
type_to_pass = WebSocketHandle::kMessageTypeContinuation;
break;
case mojom::blink::WebSocketMessageType::TEXT:
case network::mojom::blink::WebSocketMessageType::TEXT:
type_to_pass = WebSocketHandle::kMessageTypeText;
break;
case mojom::blink::WebSocketMessageType::BINARY:
case network::mojom::blink::WebSocketMessageType::BINARY:
type_to_pass = WebSocketHandle::kMessageTypeBinary;
break;
}
......
......@@ -33,17 +33,17 @@
#include "modules/websockets/WebSocketHandle.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "public/platform/modules/websockets/websocket.mojom-blink.h"
#include "services/network/public/mojom/websocket.mojom-blink.h"
namespace blink {
class WebSocketHandleImpl : public WebSocketHandle,
public mojom::blink::WebSocketClient {
public network::mojom::blink::WebSocketClient {
public:
WebSocketHandleImpl();
~WebSocketHandleImpl() override;
void Initialize(mojom::blink::WebSocketPtr) override;
void Initialize(network::mojom::blink::WebSocketPtr) override;
void Connect(const KURL&,
const Vector<String>& protocols,
const KURL& site_for_cookies,
......@@ -59,16 +59,16 @@ class WebSocketHandleImpl : public WebSocketHandle,
void OnConnectionError(uint32_t custom_reason,
const std::string& description);
// mojom::blink::WebSocketClient methods:
// network::mojom::blink::WebSocketClient methods:
void OnFailChannel(const String& reason) override;
void OnStartOpeningHandshake(
mojom::blink::WebSocketHandshakeRequestPtr) override;
network::mojom::blink::WebSocketHandshakeRequestPtr) override;
void OnFinishOpeningHandshake(
mojom::blink::WebSocketHandshakeResponsePtr) override;
network::mojom::blink::WebSocketHandshakeResponsePtr) override;
void OnAddChannelResponse(const String& selected_protocol,
const String& extensions) override;
void OnDataFrame(bool fin,
mojom::blink::WebSocketMessageType,
network::mojom::blink::WebSocketMessageType,
const Vector<uint8_t>& data) override;
void OnFlowControl(int64_t quota) override;
void OnDropChannel(bool was_clean,
......@@ -78,8 +78,8 @@ class WebSocketHandleImpl : public WebSocketHandle,
WebSocketHandleClient* client_;
mojom::blink::WebSocketPtr websocket_;
mojo::Binding<mojom::blink::WebSocketClient> client_binding_;
network::mojom::blink::WebSocketPtr websocket_;
mojo::Binding<network::mojom::blink::WebSocketClient> client_binding_;
};
} // namespace blink
......
......@@ -184,9 +184,10 @@ bool MainChannelClient::Initialize(std::unique_ptr<SourceLocation> location,
return true;
}
bool MainChannelClient::Connect(const KURL& url,
const String& protocol,
mojom::blink::WebSocketPtr socket_ptr) {
bool MainChannelClient::Connect(
const KURL& url,
const String& protocol,
network::mojom::blink::WebSocketPtr socket_ptr) {
DCHECK(IsMainThread());
if (!main_channel_)
return false;
......@@ -382,7 +383,7 @@ void Bridge::ConnectOnMainThread(
WorkerThreadLifecycleContext* worker_thread_lifecycle_context,
const KURL& url,
const String& protocol,
mojom::blink::WebSocketPtrInfo socket_ptr_info,
network::mojom::blink::WebSocketPtrInfo socket_ptr_info,
WebSocketChannelSyncHelper* sync_helper) {
DCHECK(IsMainThread());
DCHECK(!main_channel_client_);
......@@ -412,7 +413,7 @@ bool Bridge::Connect(std::unique_ptr<SourceLocation> location,
// document and so can make requests using that context. In the case of
// https://crbug.com/760708 for example this is necessary to apply the user's
// SSL interstitial decision to WebSocket connections from the worker.
mojom::blink::WebSocketPtrInfo socket_ptr_info;
network::mojom::blink::WebSocketPtrInfo socket_ptr_info;
if (!worker_global_scope_->IsDedicatedWorkerGlobalScope()) {
worker_global_scope_->GetInterfaceProvider()->GetInterface(
mojo::MakeRequest(&socket_ptr_info));
......
......@@ -46,7 +46,7 @@
#include "platform/wtf/Forward.h"
#include "platform/wtf/Vector.h"
#include "platform/wtf/text/WTFString.h"
#include "public/platform/modules/websockets/websocket.mojom-blink.h"
#include "services/network/public/mojom/websocket.mojom-blink.h"
namespace blink {
......@@ -115,7 +115,7 @@ class WorkerWebSocketChannel final : public WebSocketChannel {
bool Connect(const KURL&,
const String& protocol,
mojom::blink::WebSocketPtr);
network::mojom::blink::WebSocketPtr);
void SendTextAsCharVector(std::unique_ptr<Vector<char>>);
void SendBinaryAsCharVector(std::unique_ptr<Vector<char>>);
void SendBlob(scoped_refptr<BlobDataHandle>);
......@@ -182,7 +182,7 @@ class WorkerWebSocketChannel final : public WebSocketChannel {
WorkerThreadLifecycleContext*,
const KURL&,
const String& protocol,
mojom::blink::WebSocketPtrInfo,
network::mojom::blink::WebSocketPtrInfo,
WebSocketChannelSyncHelper*);
// Returns null when |disconnect| has already been called.
......
......@@ -769,7 +769,6 @@ mojom("mojo_bindings") {
"platform/modules/presentation/presentation.mojom",
"platform/modules/webauth/authenticator.mojom",
"platform/modules/webdatabase/web_database.mojom",
"platform/modules/websockets/websocket.mojom",
"platform/oom_intervention.mojom",
"platform/referrer.mojom",
"platform/reporting.mojom",
......
yhirano@chromium.org
ricea@chromium.org
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
# TEAM: blink-network-dev@chromium.org
# COMPONENT: Blink>Network>WebSockets
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