diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-25 15:33:01 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:02 +0000 |
commit | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (patch) | |
tree | 546386ed2957dfc39725180a992191745dbef177 /src/core/content_browser_client_qt.cpp | |
parent | 5ab157588214bfbbc1d1f258a461b1cab4cc3991 (diff) |
Adaptations for Chromium 62
Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 5689a4fb8..7a53e28c7 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -72,7 +72,7 @@ #include "net/ssl/client_cert_identity.h" #include "services/service_manager/public/cpp/bind_source_info.h" #include "services/service_manager/public/cpp/binder_registry.h" -#include "third_party/WebKit/public/platform/modules/sensitive_input_visibility/sensitive_input_visibility_service.mojom.h" +#include "third_party/WebKit/public/platform/modules/insecure_input/insecure_input_service.mojom.h" #include "ui/base/ui_base_switches.h" #include "ui/display/screen.h" #include "ui/gl/gl_context.h" @@ -358,6 +358,14 @@ public: { return nullptr; } + const gl::ExtensionSet& GetExtensions() override + { + static const gl::ExtensionSet s_emptySet; + return s_emptySet; + } + void ResetExtensions() override + { + } private: void *m_handle; @@ -413,7 +421,7 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost* const int id = host->GetID(); content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(id, url::kFileScheme); static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userResourceController()->renderProcessStartedWithHost(host); -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) host->AddFilter(new BrowserMessageFilterQt(id)); #endif #if defined(Q_OS_MACOS) && BUILDFLAG(ENABLE_SPELLCHECK) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) @@ -512,7 +520,7 @@ void ContentBrowserClientQt::GetAdditionalViewSourceSchemes(std::vector<std::str } #if defined(Q_OS_LINUX) -void ContentBrowserClientQt::GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::FileDescriptorInfo* mappings) +void ContentBrowserClientQt::GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) { const std::string &locale = GetApplicationLocale(); const base::FilePath &locale_file_path = ui::ResourceBundle::GetSharedInstance().GetLocaleFilePath(locale, true); @@ -542,7 +550,7 @@ content::DevToolsManagerDelegate* ContentBrowserClientQt::GetDevToolsManagerDele // This is a really complicated way of doing absolutely nothing, but Mojo demands it: class ServiceDriver - : public blink::mojom::SensitiveInputVisibilityService + : public blink::mojom::InsecureInputService , public content::WebContentsUserData<ServiceDriver> { public: @@ -561,38 +569,38 @@ public: return nullptr; return FromWebContents(web_contents); } - static void BindSensitiveInputVisibilityService(blink::mojom::SensitiveInputVisibilityServiceRequest request, - content::RenderFrameHost* render_frame_host) + static void BindInsecureInputService(blink::mojom::InsecureInputServiceRequest request, content::RenderFrameHost *render_frame_host) { CreateForRenderFrameHost(render_frame_host); ServiceDriver *driver = FromRenderFrameHost(render_frame_host); if (driver) - driver->BindSensitiveInputVisibilityServiceRequest(std::move(request)); + driver->BindInsecureInputServiceRequest(std::move(request)); } - void BindSensitiveInputVisibilityServiceRequest(blink::mojom::SensitiveInputVisibilityServiceRequest request) + void BindInsecureInputServiceRequest(blink::mojom::InsecureInputServiceRequest request) { - m_sensitiveInputVisibilityBindings.AddBinding(this, std::move(request)); + m_insecureInputServiceBindings.AddBinding(this, std::move(request)); } - // blink::mojom::SensitiveInputVisibility: + // blink::mojom::InsecureInputService: void PasswordFieldVisibleInInsecureContext() override { } void AllPasswordFieldsInInsecureContextInvisible() override { } + void DidEditFieldInInsecureContext() override + { } private: explicit ServiceDriver(content::WebContents* /*web_contents*/) { } friend class content::WebContentsUserData<ServiceDriver>; - mojo::BindingSet<blink::mojom::SensitiveInputVisibilityService> m_sensitiveInputVisibilityBindings; - + mojo::BindingSet<blink::mojom::InsecureInputService> m_insecureInputServiceBindings; }; void ContentBrowserClientQt::InitFrameInterfaces() { m_frameInterfaces = base::MakeUnique<service_manager::BinderRegistry>(); m_frameInterfacesParameterized = base::MakeUnique<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>>(); - m_frameInterfacesParameterized->AddInterface(base::Bind(&ServiceDriver::BindSensitiveInputVisibilityService)); + m_frameInterfacesParameterized->AddInterface(base::Bind(&ServiceDriver::BindInsecureInputService)); } void ContentBrowserClientQt::BindInterfaceRequestFromFrame(content::RenderFrameHost* render_frame_host, |