From 86776c4ee93310837e86b80d6b71f85f12228d9d Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 8 Nov 2018 13:48:48 +0100 Subject: Fix compiler warnings in content_renderer_client_qt.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/core/renderer/content_renderer_client_qt.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/core/renderer/content_renderer_client_qt.cpp') 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> 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> 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; -- cgit v1.2.3