diff options
Diffstat (limited to 'src/core/common')
-rw-r--r-- | src/core/common/extensions/api/qtwebengine_extensions_features.gni | 25 | ||||
-rw-r--r-- | src/core/common/extensions/extensions_api_provider_qt.cpp | 61 | ||||
-rw-r--r-- | src/core/common/extensions/extensions_api_provider_qt.h | 44 | ||||
-rw-r--r-- | src/core/common/extensions/extensions_client_qt.cpp | 60 | ||||
-rw-r--r-- | src/core/common/extensions/extensions_client_qt.h | 57 | ||||
-rw-r--r-- | src/core/common/qt_ipc_logging.cpp | 48 | ||||
-rw-r--r-- | src/core/common/qt_messages.cpp | 3 | ||||
-rw-r--r-- | src/core/common/qt_messages.h | 96 | ||||
-rw-r--r-- | src/core/common/user_script_data.cpp | 49 | ||||
-rw-r--r-- | src/core/common/user_script_data.h | 74 |
10 files changed, 62 insertions, 455 deletions
diff --git a/src/core/common/extensions/api/qtwebengine_extensions_features.gni b/src/core/common/extensions/api/qtwebengine_extensions_features.gni deleted file mode 100644 index ed7e713c6..000000000 --- a/src/core/common/extensions/api/qtwebengine_extensions_features.gni +++ /dev/null @@ -1,25 +0,0 @@ -import("//tools/json_schema_compiler/json_features.gni") - -json_features("qt_api_features") { - feature_type = "APIFeature" - method_name = "AddQtAPIFeatures" - sources = [ - "//extensions/common/api/_webengine_api_features.json" - ] -} - -json_features("qt_permission_features") { - feature_type = "PermissionFeature" - method_name = "AddQtPermissionFeatures" - sources = [ - "//extensions/common/api/_permission_features.json" - ] -} - -group("qtwebengine_extensions_features") { - public_deps = [ - ":qt_api_features", - ":qt_permission_features", - "//extensions/common/api:extensions_features", - ] -} diff --git a/src/core/common/extensions/extensions_api_provider_qt.cpp b/src/core/common/extensions/extensions_api_provider_qt.cpp index 22154a9d1..1c8e89747 100644 --- a/src/core/common/extensions/extensions_api_provider_qt.cpp +++ b/src/core/common/extensions/extensions_api_provider_qt.cpp @@ -1,44 +1,10 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "extensions_api_provider_qt.h" +#include "chrome/common/extensions/permissions/chrome_api_permissions.h" +#include "chrome/common/extensions/api/generated_schemas.h" #include "chrome/grit/common_resources.h" #include "extensions/common/api/api_features.h" @@ -51,6 +17,7 @@ #include "extensions/common/features/json_feature_provider_source.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/grit/extensions_resources.h" +#include "qtwebengine/common/extensions/api/generated_schemas.h" #include "qt_api_features.h" //#include "qt_behavior_features.h" @@ -85,16 +52,30 @@ void ExtensionsAPIProviderQt::AddPermissionFeatures(FeatureProvider *provider) bool ExtensionsAPIProviderQt::IsAPISchemaGenerated(const std::string &name) { - return api::GeneratedSchemas::IsGenerated(name); + return api::GeneratedSchemas::IsGenerated(name) || + api::ChromeGeneratedSchemas::IsGenerated(name) || + api::QtWebEngineGeneratedSchemas::IsGenerated(name); } base::StringPiece ExtensionsAPIProviderQt::GetAPISchema(const std::string &name) { - return api::GeneratedSchemas::Get(name); + if (!api::GeneratedSchemas::Get(name).empty()) + return api::GeneratedSchemas::Get(name); + + if (!api::ChromeGeneratedSchemas::Get(name).empty()) + return api::ChromeGeneratedSchemas::Get(name); + + if (!api::QtWebEngineGeneratedSchemas::Get(name).empty()) + return api::QtWebEngineGeneratedSchemas::Get(name); + + return ""; } void ExtensionsAPIProviderQt::RegisterPermissions(PermissionsInfo* permissions_info) { + permissions_info->RegisterPermissions( + chrome_api_permissions::GetPermissionInfos(), + chrome_api_permissions::GetPermissionAliases()); } } diff --git a/src/core/common/extensions/extensions_api_provider_qt.h b/src/core/common/extensions/extensions_api_provider_qt.h index 7d8c5f98b..34e8bdd9f 100644 --- a/src/core/common/extensions/extensions_api_provider_qt.h +++ b/src/core/common/extensions/extensions_api_provider_qt.h @@ -1,48 +1,10 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef EXTENSIONS_API_PROVIDER_QT_H #define EXTENSIONS_API_PROVIDER_QT_H #include "extensions/common/extensions_api_provider.h" -#include "base/macros.h" - namespace extensions { class ExtensionsAPIProviderQt : public ExtensionsAPIProvider @@ -64,8 +26,6 @@ public: // Registers permissions for any associated API features. void RegisterPermissions(PermissionsInfo* permissions_info) override; - -DISALLOW_COPY_AND_ASSIGN(ExtensionsAPIProviderQt); }; } diff --git a/src/core/common/extensions/extensions_client_qt.cpp b/src/core/common/extensions/extensions_client_qt.cpp index dd1de1483..9240e6528 100644 --- a/src/core/common/extensions/extensions_client_qt.cpp +++ b/src/core/common/extensions/extensions_client_qt.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // Portions copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -108,18 +72,18 @@ void ExtensionsClientQt::FilterHostPermissions(const URLPatternSet &hosts, { } -// Replaces the scripting whitelist with |whitelist|. Used in the renderer{} +// Replaces the scripting allowlist with |allowlist|. Used in the renderer{} // only used for testing in the browser process. -void ExtensionsClientQt::SetScriptingWhitelist(const ExtensionsClient::ScriptingWhitelist &whitelist) +void ExtensionsClientQt::SetScriptingAllowlist(const ExtensionsClient::ScriptingAllowlist &allowlist) { - scripting_whitelist_ = whitelist; + scripting_allowlist_ = allowlist; } -// Return the whitelist of extensions that can run content scripts on +// Return the allowlist of extensions that can run content scripts on // any origin. -const ExtensionsClient::ScriptingWhitelist &ExtensionsClientQt::GetScriptingWhitelist() const +const ExtensionsClient::ScriptingAllowlist &ExtensionsClientQt::GetScriptingAllowlist() const { - return scripting_whitelist_; + return scripting_allowlist_; } // Get the set of chrome:// hosts that |extension| can run content scripts on. @@ -153,11 +117,17 @@ const GURL &ExtensionsClientQt::GetWebstoreUpdateURL() const // Returns a flag indicating whether or not a given URL is a valid // extension blacklist URL. -bool ExtensionsClientQt::IsBlacklistUpdateURL(const GURL &url) const +bool ExtensionsClientQt::IsBlocklistUpdateURL(const GURL &url) const { return true; } +const GURL &ExtensionsClientQt::GetNewWebstoreBaseURL() const +{ + static GURL dummy; + return dummy; +} + // Returns the set of file paths corresponding to any images within an // extension's contents that may be displayed directly within the browser UI // or WebUI, such as icons or theme images. This set of paths is used by the diff --git a/src/core/common/extensions/extensions_client_qt.h b/src/core/common/extensions/extensions_client_qt.h index e689f76b7..b2d128bf9 100644 --- a/src/core/common/extensions/extensions_client_qt.h +++ b/src/core/common/extensions/extensions_client_qt.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // Portions copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -46,9 +10,7 @@ #include "extensions/common/extensions_client.h" -#include "base/compiler_specific.h" #include "base/lazy_instance.h" -#include "base/macros.h" #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h" #include "extensions/common/features/feature_provider.h" #include "extensions/common/features/json_feature_provider_source.h" @@ -87,13 +49,13 @@ public: URLPatternSet *new_hosts, PermissionIDSet *permissions) const override; - // Replaces the scripting whitelist with |whitelist|. Used in the renderer; + // Replaces the scripting allowlist with |allowlist|. Used in the renderer; // only used for testing in the browser process. - void SetScriptingWhitelist(const ScriptingWhitelist &whitelist) override; + void SetScriptingAllowlist(const ScriptingAllowlist &allowlist) override; - // Return the whitelist of extensions that can run content scripts on + // Return the allowlist of extensions that can run content scripts on // any origin. - const ScriptingWhitelist &GetScriptingWhitelist() const override; + const ScriptingAllowlist &GetScriptingAllowlist() const override; // Get the set of chrome:// hosts that |extension| can run content scripts on. URLPatternSet GetPermittedChromeSchemeHosts(const Extension *extension, @@ -110,7 +72,9 @@ public: // Returns a flag indicating whether or not a given URL is a valid // extension blacklist URL. - bool IsBlacklistUpdateURL(const GURL &url) const override; + bool IsBlocklistUpdateURL(const GURL &url) const override; + + const GURL &GetNewWebstoreBaseURL() const override; // Returns the set of file paths corresponding to any images within an // extension's contents that may be displayed directly within the browser UI @@ -127,11 +91,10 @@ public: static ExtensionsClientQt *GetInstance(); private: - ScriptingWhitelist scripting_whitelist_; + ScriptingAllowlist scripting_allowlist_; const ChromePermissionMessageProvider permission_message_provider_; mutable GURL update_url_; mutable GURL base_url_; - DISALLOW_COPY_AND_ASSIGN(ExtensionsClientQt); }; } // namespace extensions diff --git a/src/core/common/qt_ipc_logging.cpp b/src/core/common/qt_ipc_logging.cpp deleted file mode 100644 index 83eb5a5ad..000000000 --- a/src/core/common/qt_ipc_logging.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ - -#include "ipc/ipc_buildflags.h" // Generated buildflag header - -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED) -#define IPC_MESSAGE_MACROS_LOG_ENABLED -#include "content/public/common/content_ipc_logging.h" -#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ - content::RegisterIPCLogger(msg_id, logger) -#include "common/qt_messages.h" -#endif diff --git a/src/core/common/qt_messages.cpp b/src/core/common/qt_messages.cpp index 2f087d21f..bc3a1560d 100644 --- a/src/core/common/qt_messages.cpp +++ b/src/core/common/qt_messages.cpp @@ -1,6 +1,5 @@ // Copyright (c) 2010 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.Chromium file. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // Get basic type definitions. #define IPC_MESSAGE_IMPL diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index 43f07c9a6..17adcbb0d 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -1,116 +1,46 @@ // Copyright (c) 2012 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.Chromium file. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // Multiply-included file, no traditional include guard. -#include "base/optional.h" #include "content/public/common/common_param_traits.h" -#include "content/public/common/webplugininfo.h" #include "ipc/ipc_message_macros.h" -#include "ppapi/buildflags/buildflags.h" -#include "user_script_data.h" - -IPC_STRUCT_TRAITS_BEGIN(UserScriptData) - IPC_STRUCT_TRAITS_MEMBER(source) - IPC_STRUCT_TRAITS_MEMBER(url) - IPC_STRUCT_TRAITS_MEMBER(injectionPoint) - IPC_STRUCT_TRAITS_MEMBER(injectForSubframes) - IPC_STRUCT_TRAITS_MEMBER(worldId) - IPC_STRUCT_TRAITS_MEMBER(scriptId) - IPC_STRUCT_TRAITS_MEMBER(globs) - IPC_STRUCT_TRAITS_MEMBER(excludeGlobs) - IPC_STRUCT_TRAITS_MEMBER(urlPatterns) -IPC_STRUCT_TRAITS_END() - +#include "ipc/ipc_message_start.h" +#include "url/gurl.h" #define IPC_MESSAGE_START QtMsgStart //----------------------------------------------------------------------------- -// RenderView messages // These are messages sent from the browser to the renderer process. -IPC_MESSAGE_ROUTED1(RenderViewObserverQt_FetchDocumentMarkup, - uint64_t /* requestId */) - -IPC_MESSAGE_ROUTED1(RenderViewObserverQt_FetchDocumentInnerText, - uint64_t /* requestId */) - -IPC_MESSAGE_ROUTED1(RenderViewObserverQt_SetBackgroundColor, - uint32_t /* color */) - -// User scripts messages -IPC_MESSAGE_ROUTED1(RenderFrameObserverHelper_AddScript, - UserScriptData /* script */) -IPC_MESSAGE_ROUTED1(RenderFrameObserverHelper_RemoveScript, - UserScriptData /* script */) -IPC_MESSAGE_ROUTED0(RenderFrameObserverHelper_ClearScripts) - -IPC_MESSAGE_CONTROL1(UserResourceController_AddScript, UserScriptData /* scriptContents */) -IPC_MESSAGE_CONTROL1(UserResourceController_RemoveScript, UserScriptData /* scriptContents */) -IPC_MESSAGE_CONTROL0(UserResourceController_ClearScripts) - -// Tells the renderer whether or not a file system access has been allowed. -IPC_MESSAGE_ROUTED2(QtWebEngineMsg_RequestFileSystemAccessAsyncResponse, +// Tells the renderer whether or not a storage access has been allowed. +IPC_MESSAGE_ROUTED2(QtWebEngineMsg_RequestStorageAccessAsyncResponse, int /* request_id */, bool /* allowed */) - -//----------------------------------------------------------------------------- -// WebContents messages -// These are messages sent from the renderer back to the browser process. - -IPC_MESSAGE_ROUTED2(RenderViewObserverHostQt_DidFetchDocumentMarkup, - uint64_t /* requestId */, - base::string16 /* markup */) - -IPC_MESSAGE_ROUTED2(RenderViewObserverHostQt_DidFetchDocumentInnerText, - uint64_t /* requestId */, - base::string16 /* innerText */) - -IPC_MESSAGE_ROUTED0(RenderViewObserverHostQt_DidFirstVisuallyNonEmptyLayout) - //----------------------------------------------------------------------------- -// Misc messages // These are messages sent from the renderer to the browser process. -// Sent by the renderer process to check whether access to web databases is -// granted by content settings. -IPC_SYNC_MESSAGE_CONTROL3_1(QtWebEngineHostMsg_AllowDatabase, +IPC_SYNC_MESSAGE_CONTROL4_1(QtWebEngineHostMsg_AllowStorageAccess, int /* render_frame_id */, GURL /* origin_url */, GURL /* top origin url */, + int /* storage_type */, bool /* allowed */) -// Sent by the renderer process to check whether access to DOM Storage is -// granted by content settings. -IPC_SYNC_MESSAGE_CONTROL4_1(QtWebEngineHostMsg_AllowDOMStorage, +IPC_SYNC_MESSAGE_CONTROL4_1(QtWebEngineHostMsg_RequestStorageAccessSync, int /* render_frame_id */, GURL /* origin_url */, GURL /* top origin url */, - bool /* if true local storage, otherwise session */, + int /* storage_type */, bool /* allowed */) -// Sent by the renderer process to check whether access to FileSystem is +// Sent by the renderer process to check whether access to storage is // granted by content settings. -IPC_SYNC_MESSAGE_CONTROL3_1(QtWebEngineHostMsg_RequestFileSystemAccessSync, - int /* render_frame_id */, - GURL /* origin_url */, - GURL /* top origin url */, - bool /* allowed */) - -// Sent by the renderer process to check whether access to FileSystem is -// granted by content settings. -IPC_MESSAGE_CONTROL4(QtWebEngineHostMsg_RequestFileSystemAccessAsync, +IPC_MESSAGE_CONTROL5(QtWebEngineHostMsg_RequestStorageAccessAsync, int /* render_frame_id */, int /* request_id */, GURL /* origin_url */, - GURL /* top origin url */) + GURL /* top origin url */, + int /* storage_type */) -// Sent by the renderer process to check whether access to Indexed DB is -// granted by content settings. -IPC_SYNC_MESSAGE_CONTROL3_1(QtWebEngineHostMsg_AllowIndexedDB, - int /* render_frame_id */, - GURL /* origin_url */, - GURL /* top origin url */, - bool /* allowed */) diff --git a/src/core/common/user_script_data.cpp b/src/core/common/user_script_data.cpp deleted file mode 100644 index 6f4b8cb05..000000000 --- a/src/core/common/user_script_data.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ - -#include "user_script_data.h" -#include "base/pickle.h" - -UserScriptData::UserScriptData() : injectionPoint(AfterLoad) - , injectForSubframes(false) - , worldId(1) -{ - static uint64_t idCount = 0; - scriptId = idCount++; -} diff --git a/src/core/common/user_script_data.h b/src/core/common/user_script_data.h deleted file mode 100644 index 8d98890e3..000000000 --- a/src/core/common/user_script_data.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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 USER_SCRIPT_DATA_H -#define USER_SCRIPT_DATA_H - -#include <QtCore/QHash> -#include <string> -#include "ipc/ipc_message_utils.h" -#include "url/gurl.h" - -struct UserScriptData { - enum InjectionPoint { - AfterLoad, - DocumentLoadFinished, - DocumentElementCreation - }; - - UserScriptData(); - - std::string source; - GURL url; - /*InjectionPoint*/uint8_t injectionPoint; - bool injectForSubframes; - uint worldId; - uint64_t scriptId; - std::vector<std::string> globs; - std::vector<std::string> excludeGlobs; - std::vector<std::string> urlPatterns; -}; - -QT_BEGIN_NAMESPACE - -Q_DECLARE_TYPEINFO(UserScriptData, Q_MOVABLE_TYPE); - -QT_END_NAMESPACE - -#endif // USER_SCRIPT_DATA_H |