From 8f15dc4ff94790d18f4a6567c901cc7a687d9f38 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 25 Feb 2019 17:17:08 +0530 Subject: [PATCH] chore: roll 74.0.3711.0 --- DEPS | 2 +- .../common/chromium/can_create_window.patch | 4 +-- .../disable_detach_webview_frame.patch | 2 +- ...requirement_for_beforeunload_dialogs.patch | 4 +-- .../exclude-a-few-test-files-from-build.patch | 4 +-- .../gin_enable_disable_v8_platform.patch | 2 +- patches/common/v8/add_realloc.patch | 4 +-- patches/common/v8/array_buffer.patch | 4 +-- ...ild-torque-with-x64-toolchain-on-arm.patch | 4 +-- patches/common/v8/dcheck.patch | 8 +++--- ..._detailed_line_info_for_cpu_profiler.patch | 4 +-- ...vide_more_v8_backwards_compatibility.patch | 26 +++++++++---------- ...ot_run_arm_arm64_mksnapshot_binaries.patch | 4 +-- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/DEPS b/DEPS index 500fa476785d..745d1e7d0126 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '74.0.3710.0', + '74.0.3711.0', 'node_version': '5e32b02e3c180c9997d60fe85042d335b6d9a588', diff --git a/patches/common/chromium/can_create_window.patch b/patches/common/chromium/can_create_window.patch index ede24b80c837..82a0287a9405 100644 --- a/patches/common/chromium/can_create_window.patch +++ b/patches/common/chromium/can_create_window.patch @@ -87,10 +87,10 @@ index e961678e73fa6e4555bdc764d77ecab8bbc1bc9c..889cc359a3ddbf914457271af76b4b58 // moved on send. bool is_background_tab = diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc -index cb39a60c51127a3bc9f1601b76bb14ec06db834f..f6f6b2501093aceeed24c1a5405acf237d99cdb9 100644 +index 0d9cd73bbb34e1eee0bb2bbfed46e026779997e7..0e6e147b5068dd82a3dc00952f22676db4278195 100644 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc -@@ -301,6 +301,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -298,6 +298,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, diff --git a/patches/common/chromium/disable_detach_webview_frame.patch b/patches/common/chromium/disable_detach_webview_frame.patch index 18a18c733631..7801999c6c85 100644 --- a/patches/common/chromium/disable_detach_webview_frame.patch +++ b/patches/common/chromium/disable_detach_webview_frame.patch @@ -12,7 +12,7 @@ this patch was introduced in Chrome 66. Update(zcbenz): The bug is still in Chrome 72. diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc -index 6f2d79f8d0cb14ddddd6911fd84f1e4b241e9808..d4f190f8e8ca8ed7b2cb4d5d591ddac06eb743ff 100644 +index 59ce8f3cbb143f97371bba507dc851bcf0fbfe00..5101f19660f3519e74dde7fa6d9533666a2629df 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc @@ -270,6 +270,12 @@ void RenderFrameProxyHost::SetDestructionCallback( diff --git a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch index c8a7b7378503..7c1cea65dbf3 100644 --- a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch +++ b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch @@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch See https://github.com/electron/electron/issues/10754 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 407f07cb60ea3d1b0bf9c7c7f297bd886618216f..338494d624f12e007b9d8b48e9e95b974be5c4a4 100644 +index 79137c8fd5dc6ec797947c686377c67a596d5292..f651c04ec2550fd90a460e74534cdcd7030cc308 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3652,7 +3652,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3661,7 +3661,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, "frame that never had a user gesture since its load. " "https://www.chromestatus.com/feature/5082396709879808"; Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message); diff --git a/patches/common/chromium/exclude-a-few-test-files-from-build.patch b/patches/common/chromium/exclude-a-few-test-files-from-build.patch index 42ab009de2b9..7a3bac698896 100644 --- a/patches/common/chromium/exclude-a-few-test-files-from-build.patch +++ b/patches/common/chromium/exclude-a-few-test-files-from-build.patch @@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68. Remove the patch during the Chromium 69 upgrade. diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 2d9afa281c53924e9a0795e8a7781d9bcb0183c7..6f29a7ec052f85aeb35aad3a6de708ec12d14854 100644 +index ae2ac6f53e8a8b4eaa0558ede73820046cb8daf1..ca3eecd80816de19cebdc84d61ecefb25272c9e1 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1752,7 +1752,7 @@ jumbo_source_set("blink_platform_unittests_sources") { +@@ -1751,7 +1751,7 @@ jumbo_source_set("blink_platform_unittests_sources") { "graphics/paint/drawing_display_item_test.cc", "graphics/paint/drawing_recorder_test.cc", "graphics/paint/float_clip_rect_test.cc", diff --git a/patches/common/chromium/gin_enable_disable_v8_platform.patch b/patches/common/chromium/gin_enable_disable_v8_platform.patch index c3f717213eda..70fe1e639a68 100644 --- a/patches/common/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/common/chromium/gin_enable_disable_v8_platform.patch @@ -36,7 +36,7 @@ index 413e6c5bcc74cd01730c5d4dc66eb92aaf7df8de..6c5d101fef97e880bee20d2f76e4b339 v8::Isolate* isolate() { return isolate_; } diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 0407c6b08571043c0a42ef454d5bc33aa9f8aed1..eb1ab3aa60c8b821f273134d39e1d474249d632c 100644 +index c8baaa5e75582dd60072b5626388950893e70f2b..2ed448852721468124f550e4dc74a8bceeec15ce 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -204,12 +204,14 @@ enum LoadV8FileResult { diff --git a/patches/common/v8/add_realloc.patch b/patches/common/v8/add_realloc.patch index 2fb7123600bf..1ef6dc31b1e0 100644 --- a/patches/common/v8/add_realloc.patch +++ b/patches/common/v8/add_realloc.patch @@ -30,10 +30,10 @@ index dac45b4a645af14bf8cbfb0eb7e662e3fb62c089..da8beb3a50cd766fa77cab2396ed9ce8 * Free the memory block of size |length|, pointed to by |data|. * That memory is guaranteed to be previously allocated by |Allocate|. diff --git a/src/api.cc b/src/api.cc -index 8e2c85677abfb36ba9ab2c4a689f938130ec5335..f9c3f9e55525119359f7d2a1f0978e7acf302775 100644 +index 0457ffdcec0ab5b726eca0192f912ce1acc06ca1..970d4dc270a68076d5131085a13264bd42281809 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -515,6 +515,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { +@@ -516,6 +516,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { i::V8::SetSnapshotBlob(snapshot_blob); } diff --git a/patches/common/v8/array_buffer.patch b/patches/common/v8/array_buffer.patch index 97b3e68765a6..5ce7a51a781c 100644 --- a/patches/common/v8/array_buffer.patch +++ b/patches/common/v8/array_buffer.patch @@ -19,10 +19,10 @@ index da8beb3a50cd766fa77cab2396ed9ce889614b85..16a17739e5396dc7db5b5f483b2fe34c bool InContext(); diff --git a/src/api.cc b/src/api.cc -index f9c3f9e55525119359f7d2a1f0978e7acf302775..b2efe0ee52ca548a5d8d25555c4a6119422efd71 100644 +index 970d4dc270a68076d5131085a13264bd42281809..ddf751106d4e0b2fb6f3c46f065adc6d76eca781 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -7982,6 +7982,13 @@ void Isolate::SetIdle(bool is_idle) { +@@ -7983,6 +7983,13 @@ void Isolate::SetIdle(bool is_idle) { isolate->SetIdle(is_idle); } diff --git a/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch b/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch index 24c00441bf9a..167f283ab1a1 100644 --- a/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch +++ b/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch @@ -6,7 +6,7 @@ Subject: build-torque-with-x64-toolchain-on-arm.patch torque binary has to be run during the build. diff --git a/BUILD.gn b/BUILD.gn -index c08b5cc36ee37599419a08576b7f50fe35da719d..737ca427c8ac595e36aa68ce831db155a9d08e1d 100644 +index 7160d238f2f703bd1dac731d868120fb1f5aad9f..3daec405f90de60baa35001f2a58070689e8663a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -178,7 +178,9 @@ declare_args() { @@ -20,7 +20,7 @@ index c08b5cc36ee37599419a08576b7f50fe35da719d..737ca427c8ac595e36aa68ce831db155 v8_generator_toolchain = "//build/toolchain/linux:clang_x64" } -@@ -3487,7 +3489,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { +@@ -3477,7 +3479,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { } } diff --git a/patches/common/v8/dcheck.patch b/patches/common/v8/dcheck.patch index 082494d4ca38..64f036e6fcc3 100644 --- a/patches/common/v8/dcheck.patch +++ b/patches/common/v8/dcheck.patch @@ -5,10 +5,10 @@ Subject: dcheck.patch diff --git a/src/api.cc b/src/api.cc -index ebbcadedd7dd1f139185d264bcd3bb41ba368696..2ac18fc9327144d15e19546ee2a9075bed55b59e 100644 +index 8e80bbd773b568a05cc7d4a263484566dfe973c2..848a8086f09e8b03a00a467bd1b8b206a19054aa 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -8626,7 +8626,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -8627,7 +8627,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { void Isolate::RunMicrotasks() { @@ -18,10 +18,10 @@ index ebbcadedd7dd1f139185d264bcd3bb41ba368696..2ac18fc9327144d15e19546ee2a9075b isolate->default_microtask_queue()->RunMicrotasks(isolate); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 6550716be13b07a1bfff45c4df0faa4a85eaf360..e0574edfb12538fa636bbfd1335c2d667fd01cb5 100644 +index af48ffb058a1bc923fa20ed36ef83ea5e6b3f2fc..553c341ee17919abfe26c3b6a1ef0fed91787d6f 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -4827,9 +4827,9 @@ void Heap::TearDown() { +@@ -4829,9 +4829,9 @@ void Heap::TearDown() { void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, GCType gc_type, void* data) { DCHECK_NOT_NULL(callback); diff --git a/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch b/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch index ed8482ac671a..c006a062d520 100644 --- a/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch +++ b/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch @@ -20,10 +20,10 @@ Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater diff --git a/src/flag-definitions.h b/src/flag-definitions.h -index 166e689a421ca9e055fbe9ea20eb6fea707b2ca2..b81f6f18e9feb63fa5b548b5de5827baff349e1c 100644 +index 17c38553a08e9b30eeaefb61e92883477cc1d380..bede742b04022032f1b1afa22bb704b517a928e5 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h -@@ -1307,7 +1307,7 @@ DEFINE_BOOL(log_function_events, false, +@@ -1311,7 +1311,7 @@ DEFINE_BOOL(log_function_events, false, DEFINE_BOOL(prof, false, "Log statistical profiling information (implies --log-code).") diff --git a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch index 9a96bc02eed4..b52ad60146ec 100644 --- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch +++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch @@ -175,10 +175,10 @@ index 16a17739e5396dc7db5b5f483b2fe34cc4afbd39..ccbf36c0cb69bdfc0c459eb182bd42be #ifdef V8_ENABLE_CHECKS CheckCast(value); diff --git a/src/api.cc b/src/api.cc -index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41ba368696 100644 +index ddf751106d4e0b2fb6f3c46f065adc6d76eca781..8e80bbd773b568a05cc7d4a263484566dfe973c2 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -2229,6 +2229,10 @@ int PrimitiveArray::Length() const { +@@ -2230,6 +2230,10 @@ int PrimitiveArray::Length() const { return array->length(); } @@ -189,7 +189,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 void PrimitiveArray::Set(Isolate* v8_isolate, int index, Local item) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -2242,6 +2246,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, +@@ -2243,6 +2247,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, array->set(index, *i_item); } @@ -200,7 +200,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { i::Isolate* isolate = reinterpret_cast(v8_isolate); i::Handle array = Utils::OpenHandle(this); -@@ -2947,6 +2955,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { +@@ -2948,6 +2956,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { // --- S t a c k T r a c e --- @@ -211,7 +211,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Local StackTrace::GetFrame(Isolate* v8_isolate, uint32_t index) const { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -3911,6 +3923,36 @@ void v8::RegExp::CheckCast(v8::Value* that) { +@@ -3912,6 +3924,36 @@ void v8::RegExp::CheckCast(v8::Value* that) { } @@ -248,7 +248,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Maybe Value::BooleanValue(Local context) const { i::Isolate* isolate = reinterpret_cast(context->GetIsolate()); return Just(Utils::OpenHandle(this)->BooleanValue(isolate)); -@@ -3999,6 +4041,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { +@@ -4000,6 +4042,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { } @@ -261,7 +261,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Maybe Value::Equals(Local context, Local that) const { i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate(); auto self = Utils::OpenHandle(this); -@@ -5277,6 +5325,10 @@ bool String::ContainsOnlyOneByte() const { +@@ -5278,6 +5326,10 @@ bool String::ContainsOnlyOneByte() const { return helper.Check(*str); } @@ -272,7 +272,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 int String::Utf8Length(Isolate* isolate) const { i::Handle str = Utils::OpenHandle(this); str = i::String::Flatten(reinterpret_cast(isolate), str); -@@ -5429,6 +5481,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, +@@ -5430,6 +5482,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, } } // anonymous namespace @@ -287,7 +287,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity, int* nchars_ref, int options) const { i::Handle str = Utils::OpenHandle(this); -@@ -5469,6 +5529,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, +@@ -5470,6 +5530,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, } @@ -306,7 +306,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { return WriteHelper(reinterpret_cast(isolate), this, buffer, -@@ -6418,6 +6490,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, +@@ -6419,6 +6491,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, return result; } @@ -318,7 +318,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Local v8::String::Concat(Isolate* v8_isolate, Local left, Local right) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -6701,6 +6778,11 @@ bool v8::BooleanObject::ValueOf() const { +@@ -6702,6 +6779,11 @@ bool v8::BooleanObject::ValueOf() const { } @@ -330,7 +330,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); -@@ -8933,6 +9015,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { +@@ -8934,6 +9016,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { return isolate->default_microtask_queue()->IsRunningMicrotasks(); } @@ -340,7 +340,7 @@ index b2efe0ee52ca548a5d8d25555c4a6119422efd71..ebbcadedd7dd1f139185d264bcd3bb41 String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; -@@ -8952,6 +9037,9 @@ String::Utf8Value::~Utf8Value() { +@@ -8953,6 +9038,9 @@ String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } diff --git a/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch b/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch index 35d31c9e069e..7797c6d0e63b 100644 --- a/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch +++ b/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch @@ -10,10 +10,10 @@ Electron does, so this patch makes sure that the build doesn't try to run the mksnapshot binary if it was built for arm or arm64. diff --git a/BUILD.gn b/BUILD.gn -index 7160d238f2f703bd1dac731d868120fb1f5aad9f..c08b5cc36ee37599419a08576b7f50fe35da719d 100644 +index 3daec405f90de60baa35001f2a58070689e8663a..737ca427c8ac595e36aa68ce831db155a9d08e1d 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1299,9 +1299,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) { +@@ -1301,9 +1301,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) { ] public_deps = [ ":natives_blob",