Simple adaptations to Chromium 55

The simplest adaptations to API and build changes in Chromium 55

Change-Id: I923fa188690a04902492317807f72f006bcab9c6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 80 insertions, 70 deletions

diff --git a/src/core/qtwebengine_sources.gni b/src/core/qtwebengine_sources.gni
index 2d3503e98..d58e92a55 100644
--- a/src/core/qtwebengine_sources.gni
+++ b/src/core/qtwebengine_sources.gni
@@ -1,3 +1,69 @@
+import("//build/config/features.gni")
+
+source_set("qtwebengine_spellcheck_sources") {
+  sources = [
+    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
+    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
+    "//chrome/browser/spellchecker/spellcheck_factory.cc",
+    "//chrome/browser/spellchecker/spellcheck_factory.h",
+    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
+    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
+    "//chrome/browser/spellchecker/spellcheck_message_filter.cc",
+    "//chrome/browser/spellchecker/spellcheck_message_filter.h",
+    "//chrome/browser/spellchecker/spellcheck_service.cc",
+    "//chrome/browser/spellchecker/spellcheck_service.h",
+    "//chrome/common/common_message_generator.cc",
+    "//components/spellcheck/browser/feedback.cc",
+    "//components/spellcheck/browser/feedback.h",
+    "//components/spellcheck/browser/feedback_sender.cc",
+    "//components/spellcheck/browser/feedback_sender.h",
+    "//components/spellcheck/browser/misspelling.cc",
+    "//components/spellcheck/browser/misspelling.h",
+    "//components/spellcheck/browser/spellcheck_action.cc",
+    "//components/spellcheck/browser/spellcheck_action.h",
+    "//components/spellcheck/browser/spellcheck_host_metrics.cc",
+    "//components/spellcheck/browser/spellcheck_host_metrics.h",
+    "//components/spellcheck/browser/spellcheck_platform_mac.mm",
+    "//components/spellcheck/browser/spelling_service_client.cc",
+    "//components/spellcheck/browser/spelling_service_client.h",
+    "//components/spellcheck/browser/word_trimmer.cc",
+    "//components/spellcheck/browser/word_trimmer.h",
+    "//components/spellcheck/browser/pref_names.cc",
+    "//components/spellcheck/browser/pref_names.h",
+    "//components/spellcheck/common/spellcheck_bdict_language.h",
+    "//components/spellcheck/common/spellcheck_common.cc",
+    "//components/spellcheck/common/spellcheck_common.h",
+    "//components/spellcheck/common/spellcheck_marker.h",
+    "//components/spellcheck/common/spellcheck_messages.h",
+    "//components/spellcheck/common/spellcheck_result.h",
+    "//components/spellcheck/common/spellcheck_switches.cc",
+    "//components/spellcheck/common/spellcheck_switches.h",
+    "//components/spellcheck/renderer/custom_dictionary_engine.cc",
+    "//components/spellcheck/renderer/custom_dictionary_engine.h",
+    "//components/spellcheck/renderer/hunspell_engine.cc",
+    "//components/spellcheck/renderer/hunspell_engine.h",
+    "//components/spellcheck/renderer/spellcheck.cc",
+    "//components/spellcheck/renderer/spellcheck.h",
+    "//components/spellcheck/renderer/spellcheck_language.cc",
+    "//components/spellcheck/renderer/spellcheck_language.h",
+    "//components/spellcheck/renderer/spellcheck_provider.cc",
+    "//components/spellcheck/renderer/spellcheck_provider.h",
+    "//components/spellcheck/renderer/spellcheck_worditerator.cc",
+    "//components/spellcheck/renderer/spellcheck_worditerator.h",
+    "//components/spellcheck/renderer/spelling_engine.h",
+  ]
+  deps = [
+    "//third_party/WebKit/public:blink",
+    "//third_party/hunspell",
+  ]
+  if (is_mac && use_browser_spellchecker) {
+    sources += [
+        "//chrome/browser/spellchecker/spellcheck_message_filter_platform.h",
+        "//chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc",
+    ]
+  }
+}
+
 source_set("qtwebengine_sources") {
   include_dirs = [
     "//skia/config",
@@ -5,9 +71,9 @@ source_set("qtwebengine_sources") {
   ]
   deps = []
   sources = [
-    "//chrome/browser/media/desktop_media_list.h",
-    "//chrome/browser/media/desktop_streams_registry.cc",
-    "//chrome/browser/media/desktop_streams_registry.h",
+    "//chrome/browser/media/webrtc/desktop_media_list.h",
+    "//chrome/browser/media/webrtc/desktop_streams_registry.cc",
+    "//chrome/browser/media/webrtc/desktop_streams_registry.h",
     "//chrome/common/chrome_switches.cc",
     "//chrome/common/chrome_switches.h",
     "//components/prefs/testing_pref_store.cc",
@@ -18,6 +84,17 @@ source_set("qtwebengine_sources") {
     "//extensions/common/url_pattern.h",
   ]
 
+  if (enable_spellcheck) {
+    sources += [
+      "//chrome/common/pref_names.cc",
+      "//chrome/common/pref_names.h",
+    ]
+    deps += [
+      ":qtwebengine_spellcheck_sources",
+      "//chrome/tools/convert_dict",
+    ]
+  }
+
   if (enable_plugins) {
       sources += [
         "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
@@ -34,73 +111,6 @@ source_set("qtwebengine_sources") {
       ]
   }
 
-  if (enable_spellcheck) {
-      sources += [
-        "//chrome/browser/spellchecker/feedback.cc",
-        "//chrome/browser/spellchecker/feedback.h",
-        "//chrome/browser/spellchecker/feedback_sender.cc",
-        "//chrome/browser/spellchecker/feedback_sender.h",
-        "//chrome/browser/spellchecker/misspelling.cc",
-        "//chrome/browser/spellchecker/misspelling.h",
-        "//chrome/browser/spellchecker/spellcheck_action.cc",
-        "//chrome/browser/spellchecker/spellcheck_action.h",
-        "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-        "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-        "//chrome/browser/spellchecker/spellcheck_factory.cc",
-        "//chrome/browser/spellchecker/spellcheck_factory.h",
-        "//chrome/browser/spellchecker/spellcheck_host_metrics.cc",
-        "//chrome/browser/spellchecker/spellcheck_host_metrics.h",
-        "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-        "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-        "//chrome/browser/spellchecker/spellcheck_message_filter.cc",
-        "//chrome/browser/spellchecker/spellcheck_message_filter.h",
-        "//chrome/browser/spellchecker/spellcheck_platform_mac.mm",
-        "//chrome/browser/spellchecker/spellcheck_service.cc",
-        "//chrome/browser/spellchecker/spellcheck_service.h",
-        "//chrome/browser/spellchecker/spelling_service_client.cc",
-        "//chrome/browser/spellchecker/spelling_service_client.h",
-        "//chrome/browser/spellchecker/word_trimmer.cc",
-        "//chrome/browser/spellchecker/word_trimmer.h",
-        "//chrome/common/common_message_generator.cc",
-        "//chrome/common/pref_names.cc",
-        "//chrome/common/pref_names.h",
-        "//chrome/common/spellcheck_bdict_language.h",
-        "//chrome/common/spellcheck_common.cc",
-        "//chrome/common/spellcheck_common.h",
-        "//chrome/common/spellcheck_marker.h",
-        "//chrome/common/spellcheck_messages.h",
-        "//chrome/common/spellcheck_result.h",
-        "//chrome/renderer/spellchecker/custom_dictionary_engine.cc",
-        "//chrome/renderer/spellchecker/custom_dictionary_engine.h",
-        "//chrome/renderer/spellchecker/hunspell_engine.cc",
-        "//chrome/renderer/spellchecker/hunspell_engine.h",
-        "//chrome/renderer/spellchecker/spellcheck.cc",
-        "//chrome/renderer/spellchecker/spellcheck.h",
-        "//chrome/renderer/spellchecker/spellcheck_language.cc",
-        "//chrome/renderer/spellchecker/spellcheck_language.h",
-        "//chrome/renderer/spellchecker/spellcheck_provider.cc",
-        "//chrome/renderer/spellchecker/spellcheck_provider.h",
-        "//chrome/renderer/spellchecker/spellcheck_worditerator.cc",
-        "//chrome/renderer/spellchecker/spellcheck_worditerator.h",
-        "//chrome/renderer/spellchecker/spelling_engine.h",
-      ]
-      include_dirs += [
-        "//third_party/WebKit"
-      ]
-      deps += [
-        "//third_party/icu",
-        "//third_party/hunspell",
-        "//chrome/tools/convert_dict"
-      ]
-
-      if (is_mac && use_browser_spellchecker) {
-        sources += [
-          "//chrome/browser/spellchecker/spellcheck_message_filter_platform.h",
-          "//chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc",
-        ]
-      }
-  }
-
   if (enable_basic_printing || enable_print_preview) {
     sources += [
       "//chrome/browser/printing/printer_query.cc",