diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/v8/src/startup-data-util.cc | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/v8/src/startup-data-util.cc')
| -rw-r--r-- | chromium/v8/src/startup-data-util.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/v8/src/startup-data-util.cc b/chromium/v8/src/startup-data-util.cc index 4e0ad97a0cf..e20ec218d54 100644 --- a/chromium/v8/src/startup-data-util.cc +++ b/chromium/v8/src/startup-data-util.cc @@ -9,6 +9,7 @@ #include "src/base/logging.h" #include "src/base/platform/platform.h" +#include "src/flags.h" #include "src/utils.h" @@ -107,7 +108,9 @@ void InitializeExternalStartupData(const char* directory_path) { char* natives; char* snapshot; LoadFromFiles(RelativePath(&natives, directory_path, "natives_blob.bin"), - RelativePath(&snapshot, directory_path, "snapshot_blob.bin")); + RelativePath(&snapshot, directory_path, + FLAG_ignition ? "snapshot_blob_ignition.bin" + : "snapshot_blob.bin")); free(natives); free(snapshot); #endif // V8_USE_EXTERNAL_STARTUP_DATA |