diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/gin/v8_initializer.cc | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/gin/v8_initializer.cc')
-rw-r--r-- | chromium/gin/v8_initializer.cc | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/chromium/gin/v8_initializer.cc b/chromium/gin/v8_initializer.cc index 41e34e86567..c4d734dfc6a 100644 --- a/chromium/gin/v8_initializer.cc +++ b/chromium/gin/v8_initializer.cc @@ -402,6 +402,20 @@ base::PlatformFile V8Initializer::GetOpenSnapshotFileForChildProcesses( *region_out = opened.second; return opened.first; } + +// static +base::FilePath V8Initializer::GetNativesFilePath(bool abi_32_bit) { + base::FilePath path; + GetV8FilePath(abi_32_bit ? kNativesFileName32 : kNativesFileName64, &path); + return path; +} + +// static +base::FilePath V8Initializer::GetSnapshotFilePath(bool abi_32_bit) { + base::FilePath path; + GetV8FilePath(abi_32_bit ? kSnapshotFileName32 : kSnapshotFileName64, &path); + return path; +} #endif // defined(OS_ANDROID) #endif // defined(V8_USE_EXTERNAL_STARTUP_DATA) @@ -428,6 +442,11 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size())); } + if (base::FeatureList::IsEnabled(features::kV8IgnitionLazy)) { + std::string flag("--no-ignition-eager"); + v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size())); + } + #if defined(V8_USE_EXTERNAL_STARTUP_DATA) v8::StartupData natives; natives.data = reinterpret_cast<const char*>(g_mapped_natives->data()); @@ -470,20 +489,4 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** natives_data_out, } } -#if defined(OS_ANDROID) -// static -base::FilePath V8Initializer::GetNativesFilePath(bool abi_32_bit) { - base::FilePath path; - GetV8FilePath(abi_32_bit ? kNativesFileName32 : kNativesFileName64, &path); - return path; -} - -// static -base::FilePath V8Initializer::GetSnapshotFilePath(bool abi_32_bit) { - base::FilePath path; - GetV8FilePath(abi_32_bit ? kSnapshotFileName32 : kSnapshotFileName64, &path); - return path; -} -#endif // defined(OS_ANDROID) - } // namespace gin |