From 221f53ab088d14d3b069d850b16a4dc99e43d3e1 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 25 Jul 2016 11:10:53 +0900 Subject: [PATCH 1/2] Load a few more pak files --- script/create-dist.py | 2 ++ script/lib/config.py | 2 +- vendor/brightray | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/script/create-dist.py b/script/create-dist.py index d2862e90f5..ff2f22f409 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -38,8 +38,10 @@ TARGET_BINARIES = { 'libGLESv2.dll', 'ffmpeg.dll', 'node.dll', + 'blink_image_resources_200_percent.pak', 'content_resources_200_percent.pak', 'ui_resources_200_percent.pak', + 'views_resources_200_percent.pak', 'xinput1_3.dll', 'natives_blob.bin', 'snapshot_blob.bin', diff --git a/script/lib/config.py b/script/lib/config.py index 2109c206a5..1b6fb12f66 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = 'f5ff2ac24616e5e059502b98b64f99922c383f53' +LIBCHROMIUMCONTENT_COMMIT = '141739f27054dbe032226a6547ff27a9f5f5626c' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index 61206fc771..278143846e 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 61206fc771c936aefd2c871120b5b1dd4e1e6069 +Subproject commit 278143846e66f6ba6a76e3a9c4eb24badc9620f6 From b013abf8298286e980cf60373e5a76f6c7ab05e9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 25 Jul 2016 12:10:39 +0900 Subject: [PATCH 2/2] Copy a few more files to out dir --- electron.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/electron.gyp b/electron.gyp index 6562b48006..541ed8bfda 100644 --- a/electron.gyp +++ b/electron.gyp @@ -150,9 +150,11 @@ '<(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)/content_shell.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',