From d44b146e694589cf9b666b9e0bb8367e3817d920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Wed, 19 Sep 2018 17:14:38 +0200
Subject: [PATCH] [macOS] Fix building with native spellchecker option
Some files that the native spellchecker feature included were removed
after a reafctoring in Chromium.
Change-Id: I07ab0a235bb2a916b979c1981164f325e5204be5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/content_browser_client_qt.cpp | 6 ------
src/core/qtwebengine_sources.gni | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 771d77d4f..03f5a10fb 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -45,9 +45,6 @@
#include "base/threading/thread_restrictions.h"
#if QT_CONFIG(webengine_spellchecker)
#include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h"
-#if QT_CONFIG(webengine_native_spellchecker)
-#include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
-#endif
#endif
#include "components/network_hints/browser/network_hints_message_filter.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
@@ -439,9 +436,6 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
content::ChildProcessSecurityPolicy::GetInstance()->GrantRequestScheme(id, url::kFileScheme);
static_cast<ProfileQt*>(host->GetBrowserContext())->m_profileAdapter->userResourceController()->renderProcessStartedWithHost(host);
host->AddFilter(new BrowserMessageFilterQt(id, profile));
-#if defined(Q_OS_MACOS) && QT_CONFIG(webengine_spellchecker) && QT_CONFIG(webengine_native_spellchecker)
- host->AddFilter(new SpellCheckMessageFilterPlatform(id));
-#endif
#if QT_CONFIG(webengine_printing_and_pdf)
host->AddFilter(new PrintingMessageFilterQt(host->GetID()));
#endif
diff --git a/src/core/qtwebengine_sources.gni b/src/core/qtwebengine_sources.gni
index d017fad9f..6c1172d63 100644
--- a/src/core/qtwebengine_sources.gni
+++ b/src/core/qtwebengine_sources.gni
@@ -28,7 +28,7 @@ source_set("qtwebengine_spellcheck_sources") {
]
if (is_mac && use_browser_spellchecker) {
sources += [
- "//chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc",
+ "//chrome/browser/spellchecker/spell_check_host_chrome_impl_mac.cc",
]
}
}
--
GitLab