BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 43 insertions, 1 deletions

diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index c121d2cf1b6..80bfa75f2e1 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chrome_build.gni")
 import("//build/config/clang/clang.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ -19,6 +20,9 @@ declare_args() {
 
   # Turn this on to have the linker output extra timing information.
   win_linker_timing = false
+
+  # Turn this on to have the compiler output extra timing information.
+  win_compiler_timing = false
 }
 
 # This is included by reference in the //build/config/compiler config that
@@ -120,6 +124,21 @@ config("compiler") {
     # the source file is a no-op.
     "/ignore:4221",
   ]
+
+  if (win_compiler_timing) {
+    if (is_clang) {
+      cflags += [
+        "-Xclang",
+        "-ftime-report",
+      ]
+    } else {
+      cflags += [
+        # "Documented" here:
+        # http://aras-p.info/blog/2017/10/23/Best-unknown-MSVC-flag-d2cgsummary/
+        "/d2cgsummary",
+      ]
+    }
+  }
 }
 
 config("vs_code_analysis") {
@@ -174,10 +193,15 @@ config("runtime_library") {
     "__STD_C",
     "_CRT_RAND_S",
     "_CRT_SECURE_NO_DEPRECATE",
-    "_HAS_EXCEPTIONS=0",
     "_SCL_SECURE_NO_DEPRECATE",
   ]
 
+  if (is_clang) {
+    # Work around Fall Creators Update SDK bug - crbug.com/773476 has details.
+    # https://developercommunity.visualstudio.com/content/problem/131391/154-fails-to-define-deprecatedenumerator-2.html
+    defines += [ "DEPRECATEDENUMERATOR(x)=[[deprecated(x)]]" ]
+  }
+
   # Defines that set up the Windows SDK.
   defines += [
     "_ATL_NO_OPENGL",
@@ -427,3 +451,21 @@ config("target_winrt") {
     "/EHsc",
   ]
 }
+
+# Generating order files -------------------------------------------------------
+
+config("default_cygprofile_instrumentation") {
+  if (generate_order_files) {
+    assert(is_clang, "cygprofile instrumentation only works with clang")
+    assert(is_official_build, "order files should be made w/ official builds")
+    assert(!is_chrome_branded, "order files could leak internal symbol names")
+    configs = [ ":cygprofile_instrumentation" ]
+  }
+}
+
+config("cygprofile_instrumentation") {
+  cflags = [
+    "-Xclang",
+    "-finstrument-functions-after-inlining",
+  ]
+}