diff options
author | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2020-02-13 15:34:08 +0100 |
---|---|---|
committer | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2020-03-05 17:24:05 +0100 |
commit | 0bc9942e744d8c7cb3af2707232f2d79ad9bb40b (patch) | |
tree | b374bdb23c281450dd0a4fcff709b0c7df5c1b3d /src | |
parent | ae4915fb3dd0de205a26ff05f9ec7be353930bcd (diff) |
Add plugin placeholder when ppapi can't be loaded
Task-number: QTBUG-82012
Change-Id: I66f70f879203e8fba585caa472256dde06984a04
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/core_chromium.pri | 4 | ||||
-rw-r--r-- | src/core/qtwebengine_sources.gni | 1 | ||||
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 33 | ||||
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 16 | ||||
-rw-r--r-- | src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp | 103 | ||||
-rw-r--r-- | src/core/renderer/plugins/loadable_plugin_placeholder_qt.h | 84 | ||||
-rw-r--r-- | src/core/renderer/plugins/plugin_placeholder_qt.cpp | 75 | ||||
-rw-r--r-- | src/core/renderer/plugins/plugin_placeholder_qt.h | 78 |
8 files changed, 394 insertions, 0 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 6eca808fc..b7180070b 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -119,6 +119,8 @@ SOURCES = \ renderer/render_view_observer_qt.cpp \ renderer/render_thread_observer_qt.cpp \ renderer/user_resource_controller.cpp \ + renderer/plugins/loadable_plugin_placeholder_qt.cpp \ + renderer/plugins/plugin_placeholder_qt.cpp \ renderer_host/render_view_observer_host_qt.cpp \ renderer_host/user_resource_controller_host.cpp \ resource_bundle_qt.cpp \ @@ -231,6 +233,8 @@ HEADERS = \ renderer/render_view_observer_qt.h \ renderer/render_thread_observer_qt.h \ renderer/user_resource_controller.h \ + renderer/plugins/loadable_plugin_placeholder_qt.h \ + renderer/plugins/plugin_placeholder_qt.h \ renderer_host/render_view_observer_host_qt.h \ renderer_host/user_resource_controller_host.h \ request_controller.h \ diff --git a/src/core/qtwebengine_sources.gni b/src/core/qtwebengine_sources.gni index c9d0da8ba..9facb98f0 100644 --- a/src/core/qtwebengine_sources.gni +++ b/src/core/qtwebengine_sources.gni @@ -49,6 +49,7 @@ source_set("qtwebengine_sources") { "//build:branding_buildflags", "//chrome/common:buildflags", "//components/nacl/common:buildflags", + "//components/plugins/renderer/", "//extensions/buildflags:buildflags", "//third_party/blink/public/mojom:mojom_platform", ] diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index aa6038723..f7c8a497b 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -95,6 +95,12 @@ #include "extensions/extensions_renderer_client_qt.h" #endif //ENABLE_EXTENSIONS +#if BUILDFLAG(ENABLE_PLUGINS) +#include "plugins/loadable_plugin_placeholder_qt.h" +#include "plugins/plugin_placeholder_qt.h" +#include "content/common/frame_messages.h" +#endif // ENABLE_PLUGINS + #include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/service_binding.h" @@ -324,9 +330,36 @@ bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_ if (!ExtensionsRendererClientQt::GetInstance()->OverrideCreatePlugin(render_frame, params)) return false; #endif //ENABLE_EXTENSIONS + +#if BUILDFLAG(ENABLE_PLUGINS) + chrome::mojom::PluginInfoPtr plugin_info = chrome::mojom::PluginInfo::New(); + content::WebPluginInfo info; + std::string mime_type; + bool found = false; + + render_frame->Send(new FrameHostMsg_GetPluginInfo(render_frame->GetRoutingID(), params.url, + render_frame->GetWebFrame()->Top()->GetSecurityOrigin(), + params.mime_type.Utf8(), &found, &info, &mime_type)); + if (!found) { + *plugin = CreatePlugin(render_frame, params, *plugin_info); + return true; + } +#endif // BUILDFLAG(ENABLE_PLUGINS) return content::ContentRendererClient::OverrideCreatePlugin(render_frame, params, plugin); } +#if BUILDFLAG(ENABLE_PLUGINS) +// static +blink::WebPlugin* ContentRendererClientQt::CreatePlugin(content::RenderFrame* render_frame, + const blink::WebPluginParams& original_params, + const chrome::mojom::PluginInfo& plugin_info) +{ + // If the browser plugin is to be enabled, this should be handled by the + // renderer, so the code won't reach here due to the early exit in OverrideCreatePlugin. + return LoadablePluginPlaceholderQt::CreateLoadableMissingPlugin(render_frame, original_params)->plugin(); +} +#endif //BUILDFLAG(ENABLE_PLUGINS) + content::BrowserPluginDelegate *ContentRendererClientQt::CreateBrowserPluginDelegate(content::RenderFrame *render_frame, const content::WebPluginInfo &info, const std::string &mime_type, diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 46504d606..da70d29a8 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -44,6 +44,12 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/local_interface_provider.h" +#include "ppapi/buildflags/buildflags.h" + +#if BUILDFLAG(ENABLE_PLUGINS) +#include "qtwebengine/browser/plugin.mojom.h" +#include "third_party/blink/public/web/web_plugin_params.h" +#endif #include <QScopedPointer> @@ -67,6 +73,10 @@ class WebCacheImpl; class SpellCheck; #endif +namespace content { +struct WebPluginInfo; +} + namespace QtWebEngineCore { class RenderThreadObserverQt; @@ -121,6 +131,12 @@ public: void BindReceiverOnMainThread(mojo::GenericPendingReceiver receiver) override; +#if BUILDFLAG(ENABLE_PLUGINS) + static blink::WebPlugin* CreatePlugin(content::RenderFrame* render_frame, + const blink::WebPluginParams& params, + const chrome::mojom::PluginInfo& plugin_info); +#endif + private: #if BUILDFLAG(ENABLE_SPELLCHECK) void InitSpellCheck(); diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp new file mode 100644 index 000000000..b43d9a24b --- /dev/null +++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 2015 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 "loadable_plugin_placeholder_qt.h" +#include "qtwebenginecoreglobal_p.h" + +#include "content/public/renderer/render_frame.h" +#include "components/strings/grit/components_strings.h" +#include "chrome/grit/renderer_resources.h" +#include "gin/handle.h" +#include "gin/wrappable.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/jstemplate_builder.h" + +namespace QtWebEngineCore { + +// static +gin::WrapperInfo LoadablePluginPlaceholderQt::kWrapperInfo = {gin::kEmbedderNativeGin}; + +LoadablePluginPlaceholderQt::LoadablePluginPlaceholderQt(content::RenderFrame* render_frame, + const blink::WebPluginParams& params, + const std::string& html_data, + const base::string16& title) + : plugins::LoadablePluginPlaceholder(render_frame, params, html_data) + , context_menu_request_id_(0) +{} + +LoadablePluginPlaceholderQt::~LoadablePluginPlaceholderQt() +{ + if (context_menu_request_id_ && render_frame()) + render_frame()->CancelContextMenu(context_menu_request_id_); +} + +// TODO(bauerb): Move this method to NonLoadablePluginPlaceholder? +// static +LoadablePluginPlaceholderQt* LoadablePluginPlaceholderQt::CreateLoadableMissingPlugin(content::RenderFrame* render_frame, + const blink::WebPluginParams& params) +{ + const base::StringPiece template_html(ui::ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_BLOCKED_PLUGIN_HTML)); + + base::DictionaryValue values; + values.SetString("name", ""); + values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_NOT_SUPPORTED)); + + const std::string html_data = webui::GetI18nTemplateHtml(template_html, &values); + + // Will destroy itself when its WebViewPlugin is going away. + return new LoadablePluginPlaceholderQt(render_frame, params, html_data, params.mime_type.Utf16()); +} + +blink::WebPlugin* LoadablePluginPlaceholderQt::CreatePlugin() +{ + QT_NOT_YET_IMPLEMENTED + return nullptr; +} + +v8::Local<v8::Value> LoadablePluginPlaceholderQt::GetV8Handle(v8::Isolate* isolate) +{ + return gin::CreateHandle(isolate, this).ToV8(); +} + +} // namespace QtWebEngineCore diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h new file mode 100644 index 000000000..7bcad2d96 --- /dev/null +++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 2015 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 LOADALBLE_PLUGIN_PLACEHOLDER_QT_H +#define LOADALBLE_PLUGIN_PLACEHOLDER_QT_H + +#include "base/macros.h" +#include "components/plugins/renderer/loadable_plugin_placeholder.h" + +namespace QtWebEngineCore { + +class LoadablePluginPlaceholderQt final : public plugins::LoadablePluginPlaceholder + , public gin::Wrappable<LoadablePluginPlaceholderQt> +{ +public: + static gin::WrapperInfo kWrapperInfo; + + // Creates a new WebViewPlugin with a MissingPlugin as a delegate. + static LoadablePluginPlaceholderQt* CreateLoadableMissingPlugin(content::RenderFrame* render_frame, + const blink::WebPluginParams& params); + +private: + LoadablePluginPlaceholderQt(content::RenderFrame* render_frame, + const blink::WebPluginParams& params, + const std::string& html_data, + const base::string16& title); + ~LoadablePluginPlaceholderQt() override; + + // content::LoadablePluginPlaceholder overrides. + blink::WebPlugin* CreatePlugin() override; + void OnBlockedContent(content::RenderFrame::PeripheralContentStatus status, + bool is_same_origin) override {} + + // WebViewPlugin::Delegate (via PluginPlaceholder) methods: + v8::Local<v8::Value> GetV8Handle(v8::Isolate* isolate) override; + + int context_menu_request_id_; // Nonzero when request pending. + + DISALLOW_COPY_AND_ASSIGN(LoadablePluginPlaceholderQt); +}; + +} // namespace QtWebEngineCore + +#endif // LOADALBLE_PLUGIN_PLACEHOLDER_QT_H diff --git a/src/core/renderer/plugins/plugin_placeholder_qt.cpp b/src/core/renderer/plugins/plugin_placeholder_qt.cpp new file mode 100644 index 000000000..a72c29873 --- /dev/null +++ b/src/core/renderer/plugins/plugin_placeholder_qt.cpp @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 2013 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 "plugin_placeholder_qt.h" + +#include "content/public/renderer/render_frame.h" +#include "content/public/renderer/v8_value_converter.h" +#include "gin/object_template_builder.h" + +namespace QtWebEngineCore { + +// static +gin::WrapperInfo PluginPlaceholderQt::kWrapperInfo = {gin::kEmbedderNativeGin}; + +PluginPlaceholderQt::PluginPlaceholderQt(content::RenderFrame* render_frame, + const blink::WebPluginParams& params, + const std::string& html_data) + : PluginPlaceholderBase(render_frame, params, html_data) +{} + +PluginPlaceholderQt::~PluginPlaceholderQt() {} + +v8::Local<v8::Value> PluginPlaceholderQt::GetV8Handle(v8::Isolate* isolate) +{ + return gin::CreateHandle(isolate, this).ToV8(); +} + +gin::ObjectTemplateBuilder PluginPlaceholderQt::GetObjectTemplateBuilder(v8::Isolate* isolate) +{ + return gin::Wrappable<PluginPlaceholderQt>::GetObjectTemplateBuilder(isolate) + .SetMethod<void (QtWebEngineCore::PluginPlaceholderQt::*)()>( + "hide", &PluginPlaceholderQt::HideCallback); +} + +} // namespace QtWebEngineCore diff --git a/src/core/renderer/plugins/plugin_placeholder_qt.h b/src/core/renderer/plugins/plugin_placeholder_qt.h new file mode 100644 index 000000000..a99c0d045 --- /dev/null +++ b/src/core/renderer/plugins/plugin_placeholder_qt.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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 2013 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 PLUGIN_PLACEHOLDER_QT_H +#define PLUGIN_PLACEHOLDER_QT_H + +#include "base/macros.h" +#include "components/plugins/renderer/plugin_placeholder.h" +#include "gin/handle.h" +#include "gin/wrappable.h" +#include "third_party/blink/public/web/web_plugin_params.h" + +namespace QtWebEngineCore { + +// A basic placeholder that supports only hiding. +class PluginPlaceholderQt final : public plugins::PluginPlaceholderBase + , public gin::Wrappable<PluginPlaceholderQt> +{ +public: + static gin::WrapperInfo kWrapperInfo; + + PluginPlaceholderQt(content::RenderFrame* render_frame, + const blink::WebPluginParams& params, + const std::string& html_data); + ~PluginPlaceholderQt() override; + +private: + // WebViewPlugin::Delegate methods: + v8::Local<v8::Value> GetV8Handle(v8::Isolate* isolate) final; + + // gin::Wrappable method: + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + v8::Isolate* isolate) override; +}; + +} // namespace QtWebEngineCore + +#endif // PLUGIN_PLACEHOLDER_QT_H |