Browse Source

Merge pull request #6589 from electron/200-resources

Load a few resources pak added in Chrome 52
Cheng Zhao 8 years ago
parent
commit
4af72617ee
4 changed files with 6 additions and 2 deletions
  1. 2 0
      electron.gyp
  2. 2 0
      script/create-dist.py
  3. 1 1
      script/lib/config.py
  4. 1 1
      vendor/brightray

+ 2 - 0
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',

+ 2 - 0
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',

+ 1 - 1
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',

+ 1 - 1
vendor/brightray

@@ -1 +1 @@
-Subproject commit 61206fc771c936aefd2c871120b5b1dd4e1e6069
+Subproject commit 278143846e66f6ba6a76e3a9c4eb24badc9620f6