From 8c09a2306e2f16a5f9d47371f36f80d5e7bc8f1e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 10 Mar 2016 10:44:43 +0100 Subject: Flash: Support --ppapi-flash-version argument also for system Flash Task-number: QTBUG-51774 Change-Id: I609cfbd9304a396ab57c1479c7f4d3be8a379b94 Reviewed-by: Andy Shaw Reviewed-by: Allan Sandfeld Jensen --- src/core/content_client_qt.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 3e5b96b41..c10911b0b 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -123,10 +123,11 @@ void AddPepperFlashFromSystem(std::vector* plugins) << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE #endif + std::string flash_version = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kPpapiFlashVersion); for (auto it = pluginPaths.constBegin(); it != pluginPaths.constEnd(); ++it) { if (!QFile::exists(*it)) continue; - plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), std::string())); + plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), flash_version)); } } -- cgit v1.2.3 From 623faac123fbabab5e12cbb6505178586172bdba Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Mon, 15 Feb 2016 08:02:28 +0300 Subject: Initialize lazy base::CPU when IO are allowed We should initialize base::CPU to get it a chance to read /proc/cpuinfo when IO operations are allowed. So it prevents the following error on ARM platform: ``` [0204/071425:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO! If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup. ``` In the same manner it is done in ChromeMainDelegate::PreSandboxStartup. Change-Id: I1facd9d856a8dbfdf03ddbb1ab8d76d2efe69050 Reviewed-by: Allan Sandfeld Jensen --- src/core/content_main_delegate_qt.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/core') diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 0a7233853..e142436bc 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -52,6 +52,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 namespace QtWebEngineCore { @@ -66,6 +70,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); -- cgit v1.2.3 From 2cec9ecc412fdce0ca168778f890231964b8ab7a Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 16 Feb 2016 16:40:07 +0100 Subject: Disable installation of icudt.dat for builds using system ICU Change-Id: I71006b596b985acbfeec883d63de67959d0b8bdb Reviewed-by: Allan Sandfeld Jensen --- src/core/core_module.pro | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/core') diff --git a/src/core/core_module.pro b/src/core/core_module.pro index d489892fd..20f11486d 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -71,9 +71,13 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales resources.CONFIG += no_check_exist resources.path = $$[QT_INSTALL_DATA]/resources - icu.CONFIG += no_check_exist - icu.path = $$[QT_INSTALL_DATA]/resources - INSTALLS += icu locales resources + INSTALLS += locales resources + + !use?(system_icu) { + icu.CONFIG += no_check_exist + icu.path = $$[QT_INSTALL_DATA]/resources + INSTALLS += icu + } } !contains(QT_CONFIG, qt_framework):!force_independent { @@ -81,11 +85,14 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat # Copy essential files to the qtbase build directory for non-prefix builds # - icudt2build.input = icu.files - icudt2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} - icudt2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - icudt2build.name = COPY ${QMAKE_FILE_IN} - icudt2build.CONFIG = no_link no_clean target_predeps + !use?(system_icu) { + icudt2build.input = icu.files + icudt2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + icudt2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + icudt2build.name = COPY ${QMAKE_FILE_IN} + icudt2build.CONFIG = no_link no_clean target_predeps + QMAKE_EXTRA_COMPILERS += icudt2build + } resources2build.input = resources.files resources2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} @@ -93,7 +100,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources2build.name = COPY ${QMAKE_FILE_IN} resources2build.CONFIG = no_link no_clean target_predeps - QMAKE_EXTRA_COMPILERS += icudt2build resources2build + QMAKE_EXTRA_COMPILERS += resources2build } } -- cgit v1.2.3