summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mkspecs/features/gn_generator.prf8
m---------src/3rdparty0
-rw-r--r--src/core/content_browser_client_qt.cpp2
-rw-r--r--src/core/core_chromium.pri2
-rw-r--r--src/core/core_gn_config.pri1
-rw-r--r--src/core/qtwebengine_sources.gni3
-rw-r--r--src/core/service/service_qt.cpp160
-rw-r--r--src/core/service/service_qt.h75
8 files changed, 248 insertions, 3 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index efb8a65a1..b1f04e570 100644
--- a/mkspecs/features/gn_generator.prf
+++ b/mkspecs/features/gn_generator.prf
@@ -222,6 +222,14 @@ GN_CONTENTS += " \":generate_cpp_mocs\","
GN_CONTENTS += " ]"
GN_CONTENTS += " }"
GN_CONTENTS += "}"
+GN_CONTENTS += " if (!defined(core_include_dirs)) {"\
+ " core_include_dirs = []"\
+ " }"
+!isEmpty(GN_CORE_INCLUDE_DIRS) {
+ GN_CONTENTS += "core_include_dirs += ["
+ for (inc, GN_CORE_INCLUDE_DIRS): GN_CONTENTS += " \"$$inc\","
+ GN_CONTENTS += "]"
+}
!isEmpty(GN_INCLUDES) {
for (inc, GN_INCLUDES): GN_CONTENTS += $$cat($$inc,lines)
}
diff --git a/src/3rdparty b/src/3rdparty
-Subproject ae30ba94d1c9ceb608dd699acf7e7f8a62d41df
+Subproject 4ee7f364b5ccdcd98e6ff34e7a82ef937c07c91
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 5a67cfa5d..7ae6bb5a5 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -86,7 +86,7 @@
#include "ui/gl/gl_share_group.h"
#include "ui/gl/gpu_timing.h"
-#include "qtwebengine/browser/service_qt.h"
+#include "service/service_qt.h"
#include "qtwebengine/grit/qt_webengine_resources.h"
#include "browser_context_adapter.h"
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 67cbd64c7..0b1eba5dd 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -110,6 +110,7 @@ SOURCES = \
renderer_host/web_channel_ipc_transport_host.cpp \
resource_bundle_qt.cpp \
resource_context_qt.cpp \
+ service/service_qt.cpp \
type_conversion.cpp \
user_script.cpp \
visited_links_manager_qt.cpp \
@@ -202,6 +203,7 @@ HEADERS = \
renderer_host/web_channel_ipc_transport_host.h \
request_controller.h \
resource_context_qt.h \
+ service/service_qt.h \
type_conversion.h \
user_script.h \
visited_links_manager_qt.h \
diff --git a/src/core/core_gn_config.pri b/src/core/core_gn_config.pri
index fb671ddb2..9b0145dfc 100644
--- a/src/core/core_gn_config.pri
+++ b/src/core/core_gn_config.pri
@@ -5,6 +5,7 @@ GN_FIND_MOCABLES_SCRIPT = $$shell_path($$QTWEBENGINE_ROOT/tools/scripts/gn_find_
GN_RUN_BINARY_SCRIPT = $$shell_path($$QTWEBENGINE_ROOT/tools/scripts/gn_run_binary.py)
GN_IMPORTS = $$PWD/qtwebengine.gni
GN_INCLUDES = $$PWD/qtwebengine_sources.gni $$PWD/qtwebengine_resources.gni
+GN_CORE_INCLUDE_DIRS = $$PWD/service
GN_CREATE_PRI = true
QMAKE_INTERNAL_INCLUDED_FILES = $$GN_IMPORTS $$GN_INCLUDES $$GN_FILE
diff --git a/src/core/qtwebengine_sources.gni b/src/core/qtwebengine_sources.gni
index a8108f1a4..be73cb81f 100644
--- a/src/core/qtwebengine_sources.gni
+++ b/src/core/qtwebengine_sources.gni
@@ -6,6 +6,7 @@ import("//ppapi/buildflags/buildflags.gni")
import("//printing/buildflags/buildflags.gni")
source_set("qtwebengine_spellcheck_sources") {
+ include_dirs = core_include_dirs
sources = [
"//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
"//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
@@ -81,8 +82,6 @@ source_set("qtwebengine_sources") {
"//extensions/common/constants.h",
"//extensions/common/url_pattern.cc",
"//extensions/common/url_pattern.h",
- "//qtwebengine/browser/service_qt.cc",
- "//qtwebengine/browser/service_qt.h",
]
if (is_linux) {
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<const service_manager::BindSourceInfo&> m_registry_with_source_info;
+
+ DISALLOW_COPY_AND_ASSIGN(IOThreadContext);
+};
+
+ServiceQt::IOThreadContext::IOThreadContext()
+{
+ scoped_refptr<base::SingleThreadTaskRunner> 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<ServiceQt> 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<IOThreadContext>())
+{}
+
+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<service_manager::Service> ServiceQt::CreateServiceQtWrapper()
+{
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ return std::make_unique<service_manager::ForwardingService>(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<ServiceQt>;
+ class IOThreadContext;
+
+ ServiceQt();
+ ~ServiceQt();
+
+ std::unique_ptr<service_manager::Service> CreateServiceQtWrapper();
+
+ const std::unique_ptr<IOThreadContext> m_ioThreadContext;
+
+ std::unique_ptr<service_manager::Connector> m_connector;
+
+ DISALLOW_COPY_AND_ASSIGN(ServiceQt);
+};
+
+#endif // SERVICE_QT_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 18:57:51 +0000