diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-22 14:49:28 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-24 12:40:10 +0000 |
| commit | 3f0c78f0f688458fa1aac448dcfbb672ed3d066e (patch) | |
| tree | 486ce1f0d103625af0ff79cd1ac0c99d8935fe66 /src/core/renderer | |
| parent | 0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (diff) | |
Mark qrc:// as a secure scheme
This avoids deprecation warnings when using e.g. WebRTC (see also
https://goo.gl/rStTGz ).
Task-number: QTBUG-48272
Change-Id: Ib3d076ccc9eff0344d60f82b7671b047c0b3d423
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/renderer')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 8f239fc73..72ca29be9 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -44,8 +44,10 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "net/base/net_errors.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" #include "content/public/common/web_preferences.h" @@ -60,6 +62,7 @@ namespace QtWebEngineCore { static const char kHttpErrorDomain[] = "http"; +static const char kQrcSchemeQt[] = "qrc"; ContentRendererClientQt::ContentRendererClientQt() { @@ -76,6 +79,9 @@ void ContentRendererClientQt::RenderThreadStarted() m_visitedLinkSlave.reset(new visitedlink::VisitedLinkSlave); renderThread->AddObserver(m_visitedLinkSlave.data()); renderThread->AddObserver(UserScriptController::instance()); + + // mark qrc as a secure scheme (avoids deprecation warnings) + blink::WebSecurityPolicy::registerURLSchemeAsSecure(blink::WebString::fromLatin1(kQrcSchemeQt)); } void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view) |