feat: Upgrade to Chromium 71.0.3578.98 (#15966)

electron · Jan 12, 2019 · 52fe92d02ef94712fc7b19b3f03d3363cfa71a4d · 52fe92d
1 parent 92ddfd0
commit 52fe92d02ef94712fc7b19b3f03d3363cfa71a4d
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,6 @@ spec/.hash
 # Eslint Cache
 .eslintcache
+  
+
+  
+# Generated native addon files
+  
+/spec/fixtures/native-addon/echo/build/
diff --git a/BUILD.gn b/BUILD.gn
@@ -54,17 +54,7 @@ config("branding") {
 }
 npm_action("atom_browserify_sandbox") {
-  
-  deps = [
-  
-    ":atom_js2c_copy",
-  
-  ]
-  
-
-  
-  sandbox_args = [
-  
-    "lib/sandboxed_renderer/init.js",
-  
-    "-r",
-  
-    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-  
-    "-t",
-  
-    "aliasify",
-  
-  ]
+  
+  script = "browserify"
  inputs = [
    # FIXME(zcbenz): The dependencies of these files are not listed here, so
@@ -73,36 +63,40 @@ npm_action("atom_browserify_sandbox") {
    "lib/sandboxed_renderer/init.js",
    "lib/sandboxed_renderer/api/exports/electron.js",
  ]
+  
+
  outputs = [
    "$target_gen_dir/js2c/preload_bundle.js",
  ]
-  
-  script = "browserify"
-  
-  args = sandbox_args + [
-  
-           "-o",
-  
-           rebase_path(outputs[0]),
-  
-         ]
+  
+  args = [
+  
+    "lib/sandboxed_renderer/init.js",
+  
+    "-r",
+  
+    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
+  
+    "-t",
+  
+    "aliasify",
+  
+    "-o",
+  
+    rebase_path(outputs[0]),
+  
+  ]
 }
 npm_action("atom_browserify_isolated") {
-  
-  deps = [
-  
-    ":atom_js2c_copy",
-  
-  ]
+  
+  script = "browserify"
  inputs = [
    "lib/isolated_renderer/init.js",
  ]
+  
+
  outputs = [
    "$target_gen_dir/js2c/isolated_bundle.js",
  ]
-  
-  script = "browserify"
-  
-  args = inputs + [
-  
-           "-t",
-  
-           "aliasify",
-  
-           "-o",
-  
-           rebase_path(outputs[0]),
-  
-         ]
+  
+  args = [
+  
+    "lib/isolated_renderer/init.js",
+  
+    "-t",
+  
+    "aliasify",
+  
+    "-o",
+  
+    rebase_path(outputs[0]),
+  
+  ]
 }
 copy("atom_js2c_copy") {
@@ -122,23 +116,25 @@ action("atom_js2c") {
    ":atom_js2c_copy",
  ]
-  
-  js2c_sources = filenames.js2c_sources
-  
-
  browserify_sources = [
    "$target_gen_dir/js2c/isolated_bundle.js",
    "$target_gen_dir/js2c/preload_bundle.js",
  ]
-  
-  inputs = js2c_sources + browserify_sources
+  
+  sources = browserify_sources + [
+  
+              "$target_gen_dir/js2c/asar.js",
+  
+              "$target_gen_dir/js2c/asar_init.js",
+  
+            ]
+  
+  inputs = sources
  outputs = [
-  
-    "$target_gen_dir/atom_natives.h",
+  
+    "$root_gen_dir/atom_natives.cc",
  ]
  script = "tools/js2c.py"
  args = [ rebase_path("//third_party/electron_node") ] +
         rebase_path(outputs, root_build_dir) +
-  
-         [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
+  
+         rebase_path(sources, root_build_dir)
 }
 asar("js2asar") {
@@ -182,18 +178,30 @@ grit("resources") {
    "electron_resources.pak",
  ]
+  
+  # Mojo manifest overlays are generated.
+  
+  source_is_generated = true
  grit_flags = [
    "-E",
    "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
  ]
  deps = [
+  
+    ":copy_shell_devtools_discovery_page",
    ":electron_content_manifest_overlays",
  ]
  output_dir = "$target_gen_dir"
 }
+  
+copy("copy_shell_devtools_discovery_page") {
+  
+  sources = [
+  
+    "//content/shell/resources/shell_devtools_discovery_page.html",
+  
+  ]
+  
+  outputs = [
+  
+    "$target_gen_dir/shell_devtools_discovery_page.html",
+  
+  ]
+  
+}
+  
+
 if (is_linux) {
  generate_library_loader("libnotify_loader") {
    name = "LibNotifyLoader"
@@ -244,7 +252,6 @@ static_library("electron_lib") {
    "//content/public/browser",
    "//content/public/child",
    "//content/public/common:service_names",
-  
-    "//content/shell:copy_shell_resources",
    "//gin",
    "//media/capture/mojom:video_capture",
    "//media/mojo/interfaces",
@@ -326,8 +333,6 @@ static_library("electron_lib") {
  sources = filenames.lib_sources
  set_sources_assignment_filter(sources_assignment_filter)
-  
-  sources += [ "$target_gen_dir/atom_natives.h" ]
-  
-
  if (is_component_build) {
    defines += [ "NODE_SHARED_MODE" ]
  }
@@ -576,7 +581,7 @@ if (is_mac) {
    }
    info_plist = "atom/common/resources/mac/Info.plist"
-  
-    electron_version = read_file("VERSION", "trim string")
+  
+    electron_version = read_file("ELECTRON_VERSION", "trim string")
    extra_substitutions = [
      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
      "ELECTRON_VERSION=$electron_version",
@@ -897,7 +902,7 @@ group("licenses") {
 copy("electron_version") {
  sources = [
-  
-    "VERSION",
+  
+    "ELECTRON_VERSION",
  ]
  outputs = [
    "$root_build_dir/version",

diff --git a/DEPS b/DEPS
@@ -10,9 +10,9 @@ gclient_gn_args = [
 vars = {
  'chromium_version':
-  
-    '70.0.3538.110',
+  
+    '71.0.3578.98',
  'node_version':
-  
-    '1b192088522d10d126e5bb9316adae2a97add62a',
+  
+    'aeae08cda811ed122918bfd48fd9e56f8204d818',
  'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
  'pyyaml_version': '3.12',

diff --git a/VERSION → ELECTRON_VERSION b/VERSION → ELECTRON_VERSION
diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
@@ -273,4 +273,8 @@ bool AtomMainDelegate::ShouldLockSchemeRegistry() {
  return false;
 }
+  
+bool AtomMainDelegate::ShouldCreateFeatureList() {
+  
+  return false;
+  
+}
+  
+
 }  // namespace atom
diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h
@@ -36,6 +36,7 @@ class AtomMainDelegate : public content::ContentMainDelegate {
  bool DelaySandboxInitialization(const std::string& process_type) override;
 #endif
  bool ShouldLockSchemeRegistry() override;
+  
+  bool ShouldCreateFeatureList() override;
 private:
 #if defined(OS_MACOSX)

diff --git a/atom/browser/api/atom_api_browser_window.cc b/atom/browser/api/atom_api_browser_window.cc
@@ -231,7 +231,7 @@ void BrowserWindow::OnCloseButtonClicked(bool* prevent_default) {
    return;
  if (web_contents()->NeedToFireBeforeUnload())
-  
-    web_contents()->DispatchBeforeUnload();
+  
+    web_contents()->DispatchBeforeUnload(false /* auto_cancel */);
  else
    web_contents()->Close();
 }

diff --git a/atom/browser/api/atom_api_content_tracing.cc b/atom/browser/api/atom_api_content_tracing.cc
@@ -71,20 +71,34 @@ void StopRecording(const base::FilePath& path,
      GetTraceDataEndpoint(path, callback));
 }
+  
+bool GetCategories(
+  
+    const base::RepeatingCallback<void(const std::set<std::string>&)>&
+  
+        callback) {
+  
+  return TracingController::GetInstance()->GetCategories(
+  
+      base::BindOnce(callback));
+  
+}
+  
+
+  
+bool StartTracing(const base::trace_event::TraceConfig& trace_config,
+  
+                  const base::RepeatingCallback<void()>& callback) {
+  
+  return TracingController::GetInstance()->StartTracing(
+  
+      trace_config, base::BindOnce(callback));
+  
+}
+  
+
+  
+bool GetTraceBufferUsage(
+  
+    const base::RepeatingCallback<void(float, size_t)>& callback) {
+  
+  return TracingController::GetInstance()->GetTraceBufferUsage(
+  
+      base::BindOnce(callback));
+  
+}
+  
+
 void Initialize(v8::Local<v8::Object> exports,
                v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context,
                void* priv) {
-  
-  auto controller = base::Unretained(TracingController::GetInstance());
  mate::Dictionary dict(context->GetIsolate(), exports);
-  
-  dict.SetMethod("getCategories",
-  
-                 base::Bind(&TracingController::GetCategories, controller));
-  
-  dict.SetMethod("startRecording",
-  
-                 base::Bind(&TracingController::StartTracing, controller));
+  
+  dict.SetMethod("getCategories", &GetCategories);
+  
+  dict.SetMethod("startRecording", &StartTracing);
  dict.SetMethod("stopRecording", &StopRecording);
-  
-  dict.SetMethod(
-  
-      "getTraceBufferUsage",
-  
-      base::Bind(&TracingController::GetTraceBufferUsage, controller));
+  
+  dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
 }
 }  // namespace

diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
@@ -12,9 +12,11 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+  
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
+  
+#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -136,7 +138,7 @@ inline net::CookieStore* GetCookieStore(
 // Run |callback| on UI thread.
 void RunCallbackInUI(const base::Closure& callback) {
-  
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
+  
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
 }
 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
@@ -270,8 +272,8 @@ void Cookies::Get(const base::DictionaryValue& filter,
  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(filter.Clone()));
  auto* getter = browser_context_->GetRequestContext();
-  
-  content::BrowserThread::PostTask(
-  
-      BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraits(
+  
+      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
                     callback));
 }
@@ -280,8 +282,8 @@ void Cookies::Remove(const GURL& url,
                     const std::string& name,
                     const base::Closure& callback) {
  auto* getter = browser_context_->GetRequestContext();
-  
-  content::BrowserThread::PostTask(
-  
-      BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraits(
+  
+      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(RemoveCookieOnIOThread, base::RetainedRef(getter), url,
                     name, callback));
 }
@@ -291,18 +293,17 @@ void Cookies::Set(const base::DictionaryValue& details,
  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(details.Clone()));
  auto* getter = browser_context_->GetRequestContext();
-  
-  content::BrowserThread::PostTask(
-  
-      BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraits(
+  
+      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
                     callback));
 }
 void Cookies::FlushStore(const base::Closure& callback) {
  auto* getter = browser_context_->GetRequestContext();
-  
-  content::BrowserThread::PostTask(
-  
-      BrowserThread::IO, FROM_HERE,
-  
-      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
-  
-                     callback));
+  
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
+  
+                           base::BindOnce(FlushCookieStoreOnIOThread,
+  
+                                          base::RetainedRef(getter), callback));
 }
 void Cookies::OnCookieChanged(const CookieDetails* details) {

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
@@ -9,6 +9,8 @@
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
+  
+#include "base/task/post_task.h"
+  
+#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
@@ -43,7 +45,7 @@
  auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
                          native_window->GetWeakPtr(), window->weak_map_id(), x,
                          y, positioning_item, callback);
-  
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
+  
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, popup);
 }
 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,

diff --git a/atom/browser/api/atom_api_net_log.cc b/atom/browser/api/atom_api_net_log.cc
@@ -7,6 +7,7 @@
 #include <utility>
 #include "atom/browser/atom_browser_context.h"
+  
+#include "atom/browser/net/system_network_context_manager.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
@@ -27,7 +28,8 @@ NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
    : browser_context_(browser_context) {
  Init(isolate);
-  
-  net_log_writer_ = g_browser_process->net_log()->net_export_file_writer();
+  
+  net_log_writer_ = g_browser_process->system_network_context_manager()
+  
+                        ->GetNetExportFileWriter();
  net_log_writer_->AddObserver(this);
 }

diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
@@ -85,8 +85,8 @@ void Protocol::UnregisterProtocol(const std::string& scheme,
  args->GetNext(&callback);
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
-  
-  content::BrowserThread::PostTaskAndReplyWithResult(
-  
-      content::BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraitsAndReplyWithResult(
+  
+      FROM_HERE, {content::BrowserThread::IO},
      base::BindOnce(&Protocol::UnregisterProtocolInIO,
                     base::RetainedRef(getter), scheme),
      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -107,8 +107,8 @@ void Protocol::IsProtocolHandled(const std::string& scheme,
                                 const BooleanCallback& callback) {
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
-  
-  content::BrowserThread::PostTaskAndReplyWithResult(
-  
-      content::BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraitsAndReplyWithResult(
+  
+      FROM_HERE, {content::BrowserThread::IO},
      base::Bind(&Protocol::IsProtocolHandledInIO, base::RetainedRef(getter),
                 scheme),
      callback);
@@ -127,8 +127,8 @@ void Protocol::UninterceptProtocol(const std::string& scheme,
  args->GetNext(&callback);
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
-  
-  content::BrowserThread::PostTaskAndReplyWithResult(
-  
-      content::BrowserThread::IO, FROM_HERE,
+  
+  base::PostTaskWithTraitsAndReplyWithResult(
+  
+      FROM_HERE, {content::BrowserThread::IO},
      base::BindOnce(&Protocol::UninterceptProtocolInIO,
                     base::RetainedRef(getter), scheme),
      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));