diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /src/core/content_main_delegate_qt.cpp | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'src/core/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 0560c3f6b..ee52dd23e 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -55,6 +55,10 @@ #include "renderer/content_renderer_client_qt.h" #include "web_engine_library_info.h" +#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) +#include "base/cpu.h" +#endif + #include <QLocale> namespace QtWebEngineCore { @@ -69,6 +73,12 @@ static base::StringPiece PlatformResourceProvider(int key) { void ContentMainDelegateQt::PreSandboxStartup() { +#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +#endif + net::NetModule::SetResourceProvider(PlatformResourceProvider); ui::ResourceBundle::InitSharedInstanceWithLocale(WebEngineLibraryInfo::getApplicationLocale(), 0, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |