diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-02 12:35:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-02 09:18:39 +0100 |
| commit | 4f285f7b2a1316bbad6e74258305613933f574c8 (patch) | |
| tree | 5e4cc05334c25dc5a99915c5f314db9e86bb4906 /src/core/renderer | |
| parent | da019632bfc0227e2d0d0cc676a80a352fc27a62 (diff) | |
Adaptations for Chromium 91
Change-Id: Ie0236697615fd67e4f53df3dca013ce39628cc29
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/renderer')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index f52c17dcf..aac6fc430 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -262,7 +262,8 @@ void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame *renderFrame { GetNavigationErrorStringsInternal( renderFrame, httpMethod, - error_page::Error::NetError((GURL)web_error.url(), web_error.reason(), net::ResolveErrorInfo(), web_error.has_copy_in_cache()), + error_page::Error::NetError((GURL)web_error.url(), web_error.reason(), web_error.extended_reason(), + net::ResolveErrorInfo(), web_error.has_copy_in_cache()), errorHtml); } @@ -297,7 +298,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF error_page::LocalizedError::GetPageState( error.reason(), error.domain(), error.url(), isPost, false, error.stale_copy_in_cache(), false, - RenderConfiguration::is_incognito_process(), false, false, false, locale); + RenderConfiguration::is_incognito_process(), false, false, false, locale, false); resourceId = IDR_NET_ERROR_HTML; @@ -566,7 +567,6 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> } auto persistent_license_support = media::EmeSessionTypeSupport::NOT_SUPPORTED; - auto persistent_usage_record_support = media::EmeSessionTypeSupport::NOT_SUPPORTED; // Others. auto persistent_state_support = media::EmeFeatureSupport::REQUESTABLE; @@ -575,8 +575,8 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties( codecs, encryption_schemes, hw_secure_codecs, hw_secure_encryption_schemes, max_audio_robustness, max_video_robustness, - persistent_license_support, persistent_usage_record_support, - persistent_state_support, distinctive_identifier_support)); + persistent_license_support, persistent_state_support, + distinctive_identifier_support)); } #endif // BUILDFLAG(ENABLE_WIDEVINE) #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp index f3604d1ec..15f3e9eff 100644 --- a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp +++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp @@ -61,7 +61,7 @@ gin::WrapperInfo LoadablePluginPlaceholderQt::kWrapperInfo = {gin::kEmbedderNati LoadablePluginPlaceholderQt::LoadablePluginPlaceholderQt(content::RenderFrame* render_frame, const blink::WebPluginParams& params, const std::string& html_data, - const base::string16& title) + const std::u16string& title) : plugins::LoadablePluginPlaceholder(render_frame, params, html_data) {} diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h index 4c3b7ec88..f612cb8ec 100644 --- a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h +++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h @@ -63,7 +63,7 @@ private: LoadablePluginPlaceholderQt(content::RenderFrame* render_frame, const blink::WebPluginParams& params, const std::string& html_data, - const base::string16& title); + const std::u16string& title); ~LoadablePluginPlaceholderQt() override; // content::LoadablePluginPlaceholder overrides. |