Commit 62d140e5 authored by Marshall Greenblatt's avatar Marshall Greenblatt
Browse files

Update to Chromium version 74.0.3729.6

parent 725ed885
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/74.0.3729.0' 'chromium_checkout': 'refs/tags/74.0.3729.6'
} }
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index f8dfe8e20824..ec6fc42d11de 100644 index 880d2fdcd2dd..7479901c306e 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -8,6 +8,7 @@ import("//build/config/features.gni")
...@@ -10,7 +10,7 @@ index f8dfe8e20824..ec6fc42d11de 100644 ...@@ -10,7 +10,7 @@ index f8dfe8e20824..ec6fc42d11de 100644
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni") import("//components/feature_engagement/features.gni")
import("//components/feed/features.gni") import("//components/feed/features.gni")
@@ -1812,6 +1813,7 @@ jumbo_split_static_library("browser") { @@ -1814,6 +1815,7 @@ jumbo_split_static_library("browser") {
"//base:i18n", "//base:i18n",
"//base/allocator:buildflags", "//base/allocator:buildflags",
"//cc", "//cc",
...@@ -18,7 +18,7 @@ index f8dfe8e20824..ec6fc42d11de 100644 ...@@ -18,7 +18,7 @@ index f8dfe8e20824..ec6fc42d11de 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2109,6 +2111,10 @@ jumbo_split_static_library("browser") { @@ -2111,6 +2113,10 @@ jumbo_split_static_library("browser") {
] ]
} }
...@@ -29,7 +29,7 @@ index f8dfe8e20824..ec6fc42d11de 100644 ...@@ -29,7 +29,7 @@ index f8dfe8e20824..ec6fc42d11de 100644
if (is_android) { if (is_android) {
sources += [ sources += [
"after_startup_task_utils_android.cc", "after_startup_task_utils_android.cc",
@@ -3858,7 +3864,7 @@ jumbo_split_static_library("browser") { @@ -3860,7 +3866,7 @@ jumbo_split_static_library("browser") {
] ]
} }
......
...@@ -984,7 +984,7 @@ index 6955858281e7..045dee3185bf 100644 ...@@ -984,7 +984,7 @@ index 6955858281e7..045dee3185bf 100644
"buffer_manager.cc", "buffer_manager.cc",
"buffer_manager.h", "buffer_manager.h",
diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc
index d7197fe6455c..bfb072283725 100644 index 9f11a25c7ea9..67c119e2400e 100644
--- gpu/command_buffer/service/gles2_cmd_decoder.cc --- gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment