diff options
Diffstat (limited to 'www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc')
| -rw-r--r-- | www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc index 5753c3696617..868fc376dfe8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -99,7 +99,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,34 +9,25 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - ->Clone(); +@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + if (RenderThreadImpl::current()) { + io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); - blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get()); - SkFontConfigInterface::SetGlobal(font_loader_); + mojo::PendingRemote<font_service::mojom::FontService> font_service; + RenderThreadImpl::current()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif -@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - connector_ = service_manager::Connector::Create(&request); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (g_sandbox_enabled && sandboxEnabled()) { + if (sandboxEnabled()) { #if defined(OS_MACOSX) - sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( - } - - void RendererBlinkPlatformImpl::Shutdown() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // SandboxSupport contains a map of OutOfProcessFont objects, which hold - // WebStrings and WebVectors, which become invalidated when blink is shut - // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto + sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); +@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -45,7 +36,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { |