Adaptations for Chromium 87

Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

4 files changed, 49 insertions, 10 deletions

diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index 85781d251..26e6b764a 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -14,24 +14,25 @@ gn_args += \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
-    enable_resource_whitelist_generation=false \
+    enable_resource_allowlist_generation=false \
     enable_swiftshader=false \
+    enable_swiftshader_vulkan=false \
     angle_enable_swiftshader=false \
-    enable_web_auth=true \
     enable_web_speech=false \
     enable_widevine=true \
     forbid_non_component_debug_builds=false \
     has_native_accessibility=false \
     safe_browsing_mode=0 \
+    skia_use_dawn=false \
     toolkit_views=false \
     treat_warnings_as_errors=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
-    use_custom_libcxx=false
+    use_custom_libcxx=false \
+    chrome_pgo_phase=0
 
 # No closure compile supported at this time
 gn_args += \
-    closure_compile=false \
     optimize_webui=false
 
 # We always embed v8 startup data currently
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
index e192f8777..4ba387fc2 100644
--- a/src/buildtools/config/support.pri
+++ b/src/buildtools/config/support.pri
@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
     !qtwebengine_checkForGperf(QtWebEngine):return(false)
     !qtwebengine_checkForBison(QtWebEngine):return(false)
     !qtwebengine_checkForFlex(QtWebEngine):return(false)
-    !qtwebengine_checkForPython2(QtWebengine):return(false)
+    !qtwebengine_checkForPython2(QtWebEngine):return(false)
     !qtwebengine_checkForSanitizer(QtWebEngine):return(false)
     linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
     linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false)
@@ -151,6 +151,15 @@ defineTest(qtwebengine_checkForPython2) {
     return(true)
 }
 
+defineTest(qtwebengine_checkForNodejs) {
+    module = $$1
+    !qtConfig(webengine-nodejs) {
+        qtwebengine_skipBuild("Nodejs is required to build $${module}.")
+        return(false)
+    }
+    return(true)
+}
+
 defineTest(qtwebengine_checkForSanitizer) {
     module = $$1
     sanitizer:!qtConfig(webengine-sanitizer) {
diff --git a/src/buildtools/config/windows.pri b/src/buildtools/config/windows.pri
index bd236e1a5..843d6f2b1 100644
--- a/src/buildtools/config/windows.pri
+++ b/src/buildtools/config/windows.pri
@@ -4,7 +4,6 @@ gn_args += \
     use_sysroot=false \
     enable_session_service=false \
     ninja_use_custom_environment_files=false \
-    is_multi_dll_chrome=false \
     win_linker_timing=true \
     com_init_check_hook_disabled=true \
     heterogeneous_executables=true \
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index f401deb2e..58f3abb4d 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -68,6 +68,12 @@
                 { "type": "pkgConfig", "args": "x11" }
             ]
         },
+        "webengine-xproto-gl": {
+            "label": "xproto (glproto)",
+            "sources": [
+                { "type": "pkgConfig", "args": "glproto" }
+            ]
+        },
         "webengine-glib": {
             "label": "glib-2.0 >= 2.32.0",
             "sources": [
@@ -155,9 +161,9 @@
             ]
         },
         "webengine-icu": {
-            "label": "icu >= 64",
+            "label": "icu >= 65",
             "sources": [
-                { "type": "pkgConfig", "args": "icu-uc >= 64 icu-i18n >= 64" }
+                { "type": "pkgConfig", "args": "icu-uc >= 65 icu-i18n >= 65" }
             ]
         },
         "webengine-webp": {
@@ -238,10 +244,11 @@
                     "vpx_codec_cx_pkt pkt;",
                     "pkt.data.frame.width[0] = 0u;",
                     "pkt.data.frame.height[0] = 0u;",
-                    "auto a = CONSTRAINED_FROM_ABOVE_DROP;"
+                    "auto a = CONSTRAINED_FROM_ABOVE_DROP;",
+                    "auto b = VPX_IMG_FMT_NV12;"
                 ]
             },
-            "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h" ],
+            "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h", "vpx/vpx_image.h" ],
             "sources": [
                 { "type": "pkgConfig", "args": "vpx" },
                 "-lvpx"
@@ -357,6 +364,11 @@
             "label": "linker supports -z noexecstack",
             "type": "linkerSupportsFlag",
             "flag": "-z,noexecstack"
+        },
+        "webengine-nodejs": {
+            "label": "node.js",
+            "type": "detectNodeJS",
+            "log": "version10"
         }
     },
     "features": {
@@ -373,6 +385,7 @@
                          && features.webengine-bison
                          && features.webengine-flex
                          && features.webengine-python2
+                         && features.webengine-nodejs
                          && (!config.sanitizer || features.webengine-sanitizer)
                          && (!config.linux || features.pkg-config)
                          && (!config.linux || features.webengine-host-pkg-config)
@@ -443,6 +456,16 @@
             "condition": "tests.webengine-flex",
             "output": [ "privateFeature" ]
         },
+        "webengine-nodejs": {
+            "label": "node.js",
+            "condition": "tests.webengine-nodejs",
+            "output": [ "privateFeature" ]
+        },
+        "webengine-nodejs10": {
+            "label": "node.js",
+            "condition": "tests.webengine-nodejs && tests.webengine-nodejs.version10",
+            "output": [ "privateFeature" ]
+        },
         "webengine-system-ninja": {
             "label": "Use System Ninja",
             "condition": "tests.webengine-ninja",
@@ -509,6 +532,11 @@
             "condition": "config.unix && libs.webengine-x11",
             "output": [ "privateFeature" ]
         },
+        "webengine-system-xproto-gl" : {
+            "label": "xproto (glproto)",
+            "condition": "config.unix && libs.webengine-xproto-gl",
+            "output": [ "privateFeature" ]
+        },
         "webengine-host-pkg-config": {
             "label": "host-pkg-config",
             "condition": "config.unix && tests.webengine-host-pkg-config",
@@ -525,6 +553,7 @@
                           && features.webengine-system-xcomposite
                           && features.webengine-system-xcursor
                           && features.webengine-system-xi
+                          && features.webengine-system-xproto-gl
                           && features.webengine-system-xtst",
              "output": [ "privateFeature" ]
         },
@@ -781,6 +810,7 @@
                         "webengine-system-xcomposite",
                         "webengine-system-xcursor",
                         "webengine-system-xi",
+                        "webengine-system-xproto-gl",
                         "webengine-system-xtst"
                      ]
                 },