From bdc334d797de8de97acdd8cb6ef2d298f04743c3 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 29 Nov 2016 17:01:34 +0900 Subject: [PATCH] Update brightray and libchromiumcontent to Chrome 54 --- atom/common/chrome_version.h | 2 +- electron.gyp | 10 +++++----- script/lib/config.py | 2 +- vendor/brightray | 2 +- vendor/crashpad | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h index 9fbacf4e737..b63be36202f 100644 --- a/atom/common/chrome_version.h +++ b/atom/common/chrome_version.h @@ -8,7 +8,7 @@ #ifndef ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_ -#define CHROME_VERSION_STRING "53.0.2785.143" +#define CHROME_VERSION_STRING "54.0.2840.51" #define CHROME_VERSION "v" CHROME_VERSION_STRING #endif // ATOM_COMMON_CHROME_VERSION_H_ diff --git a/electron.gyp b/electron.gyp index da563f3316d..7672f26eee1 100644 --- a/electron.gyp +++ b/electron.gyp @@ -147,15 +147,15 @@ 'destination': '<(PRODUCT_DIR)', 'files': [ '<@(copied_libraries)', - # '<(libchromiumcontent_dir)/locales', + '<(libchromiumcontent_dir)/locales', '<(libchromiumcontent_dir)/libEGL.dll', '<(libchromiumcontent_dir)/libGLESv2.dll', '<(libchromiumcontent_dir)/icudtl.dat', - # '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', - # '<(libchromiumcontent_dir)/content_resources_200_percent.pak', + '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', + '<(libchromiumcontent_dir)/content_resources_200_percent.pak', '<(libchromiumcontent_dir)/content_shell.pak', - # '<(libchromiumcontent_dir)/ui_resources_200_percent.pak', - # '<(libchromiumcontent_dir)/views_resources_200_percent.pak', + '<(libchromiumcontent_dir)/ui_resources_200_percent.pak', + '<(libchromiumcontent_dir)/views_resources_200_percent.pak', '<(libchromiumcontent_dir)/natives_blob.bin', '<(libchromiumcontent_dir)/snapshot_blob.bin', 'external_binaries/d3dcompiler_47.dll', diff --git a/script/lib/config.py b/script/lib/config.py index fa4427ab1d0..481e3c86ea5 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -9,7 +9,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ - '97e32dafa4a1112f14eef61a663cf39a03ed4c97' + '9578c02202a6050e3fd48dddd5433fbb48089337' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index 5333d0e64b8..fe2bf5dcaab 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 5333d0e64b897c8584cee85bfcf7c045a7ca1e66 +Subproject commit fe2bf5dcaabbcc9f9ae878f5fce48081292057b1 diff --git a/vendor/crashpad b/vendor/crashpad index 51f78aefa87..c58712f9984 160000 --- a/vendor/crashpad +++ b/vendor/crashpad @@ -1 +1 @@ -Subproject commit 51f78aefa872211022ae2d44260cbfd07a6aeb6a +Subproject commit c58712f998445983dfea73da6478194b6c52c3cb