diff options
author | Kai Koehne <kai.koehne@qt.io> | 2018-11-08 13:48:48 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-11-14 11:11:53 +0000 |
commit | 86776c4ee93310837e86b80d6b71f85f12228d9d (patch) | |
tree | 99b75d4ddfaaa5ca43ef19494d97d47066acf987 | |
parent | cfe53bce924e40c944850fd0418d53c8ba760dc1 (diff) |
Fix compiler warnings in content_renderer_client_qt.cpp
content_renderer_client_qt.cpp(216): warning C4138: '*/' found outside of comment
content_renderer_client_qt.cpp(455): warning C4189: 'cdm_supports_persistent_license': local variable is initialized but not referenced
content_renderer_client_qt.cpp(427): warning C4189: 'supported_codecs': local variable is initialized but not referenced
Change-Id: Iee9bf8abe57c61b06b0cc2e059e7232b5b6e3d99
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 3eda3993a..403448b91 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -213,8 +213,9 @@ void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::Render errorHtml, errorDescription); } -void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame */*renderFrame*/, const blink::WebURLRequest &failedRequest, const error_page::Error &error, std::string *errorHtml, base::string16 *errorDescription) +void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const blink::WebURLRequest &failedRequest, const error_page::Error &error, std::string *errorHtml, base::string16 *errorDescription) { + Q_UNUSED(renderFrame) const bool isPost = QByteArray::fromStdString(failedRequest.HttpMethod().Utf8()) == QByteArrayLiteral("POST"); if (errorHtml) { @@ -424,8 +425,6 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> return; } - media::SupportedCodecs supported_codecs = media::EME_CODEC_NONE; - // Codecs and encryption schemes. auto codecs = GetSupportedCodecs(capability->video_codecs, /*is_secure=*/false); @@ -452,8 +451,6 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> return; } - bool cdm_supports_persistent_license = - base::ContainsValue(capability->session_types, media::CdmSessionType::kPersistentLicense); auto persistent_license_support = media::EmeSessionTypeSupport::NOT_SUPPORTED; auto persistent_usage_record_support = media::EmeSessionTypeSupport::NOT_SUPPORTED; |