From 0c2091e2a30d22b57fbef31f852794975d71961f Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 22 Jun 2018 18:24:53 +0200 Subject: Add hack to export our headers to Chromium Add hack to export core headers and move back service_qt to main repo. This change pulls the required change in Chromium Change-Id: I8c73cd20c4358c51911b98b42922e1361bfb28b6 Reviewed-by: Allan Sandfeld Jensen --- src/core/service/service_qt.cpp | 160 ++++++++++++++++++++++++++++++++++++++++ src/core/service/service_qt.h | 75 +++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 src/core/service/service_qt.cpp create mode 100644 src/core/service/service_qt.h (limited to 'src/core/service') diff --git a/src/core/service/service_qt.cpp b/src/core/service/service_qt.cpp new file mode 100644 index 000000000..30ed269e8 --- /dev/null +++ b/src/core/service/service_qt.cpp @@ -0,0 +1,160 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// based on chrome/browser/chrome_service.cc: +// Copyright 2017 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 "service_qt.h" + +#include "base/no_destructor.h" +#include "components/spellcheck/spellcheck_buildflags.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/browser/content_browser_client.h" +#include "services/service_manager/public/cpp/binder_registry.h" +#include "services/service_manager/public/cpp/connector.h" +#include "services/service_manager/public/cpp/service.h" +#include "services/service_manager/public/cpp/service_context.h" + +#if BUILDFLAG(ENABLE_SPELLCHECK) +#include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h" +#endif + +class ServiceQt::IOThreadContext : public service_manager::Service { +public: + IOThreadContext(); + ~IOThreadContext() override = default; + + void BindConnector(service_manager::mojom::ConnectorRequest connector_request); + +private: + void BindConnectorOnIOThread(service_manager::mojom::ConnectorRequest connector_request); + + // service_manager::Service: + void OnStart() override; + void OnBindInterface(const service_manager::BindSourceInfo &remote_info, + const std::string &name, + mojo::ScopedMessagePipeHandle handle) override; + + service_manager::mojom::ConnectorRequest m_connectorRequest; + service_manager::BinderRegistry m_registry; + service_manager::BinderRegistryWithArgs m_registry_with_source_info; + + DISALLOW_COPY_AND_ASSIGN(IOThreadContext); +}; + +ServiceQt::IOThreadContext::IOThreadContext() +{ + scoped_refptr ui_task_runner = + content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI); +#if BUILDFLAG(ENABLE_SPELLCHECK) + m_registry_with_source_info.AddInterface(base::Bind(&SpellCheckHostChromeImpl::Create), ui_task_runner); +#endif +} + +void ServiceQt::IOThreadContext::BindConnector(service_manager::mojom::ConnectorRequest connector_request) +{ + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + + // NOTE: It's not safe to modify |connector_request_| here since it's read + // on the IO thread. Post a task instead. As long as this task is posted + // before any code attempts to connect to the chrome service, there's no + // race. + content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::IO)->PostTask( + FROM_HERE, + base::BindOnce(&IOThreadContext::BindConnectorOnIOThread, + base::Unretained(this), + std::move(connector_request))); +} + +void ServiceQt::IOThreadContext::BindConnectorOnIOThread(service_manager::mojom::ConnectorRequest connector_request) +{ + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + m_connectorRequest = std::move(connector_request); +} + +void ServiceQt::IOThreadContext::OnStart() +{ + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + DCHECK(m_connectorRequest.is_pending()); + context()->connector()->BindConnectorRequest(std::move(m_connectorRequest)); +} + +void ServiceQt::IOThreadContext::OnBindInterface(const service_manager::BindSourceInfo &remote_info, + const std::string &name, + mojo::ScopedMessagePipeHandle handle) +{ + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + content::OverrideOnBindInterface(remote_info, name, &handle); + if (!handle.is_valid()) + return; + + if (!m_registry.TryBindInterface(name, &handle)) + m_registry_with_source_info.TryBindInterface(name, &handle, remote_info); +} + +ServiceQt *ServiceQt::GetInstance() +{ + static base::NoDestructor service; + return service.get(); +} + +service_manager::EmbeddedServiceInfo::ServiceFactory ServiceQt::CreateServiceQtFactory() +{ + return base::BindRepeating(&ServiceQt::CreateServiceQtWrapper, base::Unretained(this)); +} + +ServiceQt::ServiceQt() : m_ioThreadContext(std::make_unique()) +{} + +ServiceQt::~ServiceQt() = default; + +void ServiceQt::InitConnector() +{ + service_manager::mojom::ConnectorRequest request; + m_connector = service_manager::Connector::Create(&request); + m_ioThreadContext->BindConnector(std::move(request)); +} + +std::unique_ptr ServiceQt::CreateServiceQtWrapper() +{ + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + return std::make_unique(m_ioThreadContext.get()); +} diff --git a/src/core/service/service_qt.h b/src/core/service/service_qt.h new file mode 100644 index 000000000..4aa0a3996 --- /dev/null +++ b/src/core/service/service_qt.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef SERVICE_QT_H +#define SERVICE_QT_H + +#include "base/no_destructor.h" +#include "services/service_manager/embedder/embedded_service_info.h" + +namespace service_manager { +class Connector; +class Service; +} // namespace service_manager + +class ServiceQt { +public: + static ServiceQt *GetInstance(); + + void InitConnector(); + service_manager::EmbeddedServiceInfo::ServiceFactory CreateServiceQtFactory(); + service_manager::Connector *connector() { return m_connector.get(); } + +private: + friend class base::NoDestructor; + class IOThreadContext; + + ServiceQt(); + ~ServiceQt(); + + std::unique_ptr CreateServiceQtWrapper(); + + const std::unique_ptr m_ioThreadContext; + + std::unique_ptr m_connector; + + DISALLOW_COPY_AND_ASSIGN(ServiceQt); +}; + +#endif // SERVICE_QT_H -- cgit v1.2.3