summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Backport] mac: Update knowledge of CFAllocator internals for 10.1360-basedAllan Sandfeld Jensen2017-10-203-8/+43
| | | | | | | | | | | | | | | | | | For each new major OS version, we need to poke at the internals of CFAllocator to enable the out-of-memory killer for the default CFAllocator implementations. This update is for macOS 10.13 ("High Sierra"), whose CFAllocator internals are unchanged from 10.12 (and in fact from 10.7). It also updates the base::mac::IsOS*() family of functions for this new OS version. BUG=45650 TEST=base_unittests OutOfMemoryDeathTest.CFAllocator*,MacUtilTest.IsOSEllipsis Change-Id: I2cab74c57cb75e4aebc2cb13d6844f0c77dbd54f Reviewed-on: https://chromium-review.googlesource.com/565467 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use basic collection info only on linuxMichal Klocek2017-10-181-1/+1
| | | | | | | | It fails on windows and mac and requires investigation. Task-number: QTBUG-41242 Change-Id: I4dba0e9db0180f2b3a87ddc1473a03ab392c08f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* FIXUP: Fix build with GCC 7.0Allan Sandfeld Jensen2017-10-172-14/+20
| | | | | | | Reinstate warning fix lost in original cherry-pick Change-Id: Id3a4c25a4648c88681f3312d2b73312a5884a5c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix Chromium built with X11 running withoutAllan Sandfeld Jensen2017-10-158-16/+25
| | | | | | | | Handles cases where gfx::GetXDisplay() returns null at least for Qt. Task-number: QTBUG-55384 Change-Id: Ie57c57d7189c279cb5c702325b450f9fb964ac60 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Do not export .gitignore and .gitattributesAllan Sandfeld Jensen2017-10-121-0/+2
| | | | | | | | Copied from standard code in .gitattributes in other qt modules. Task-number: QTBUG-62952 Change-Id: I48739086536fc56abe610f7e36112283d6d1b73a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix not working bug black listsMichal Klocek2017-10-041-1/+6
| | | | | | | | | | Use basic collected data for gpu when running gl collection data otherwise vendor_id and device_id are lost and most of black listed bugs do not match. Task-number: QTBUG-41242 Change-Id: I0624d5899f91d1504e6548e71438583a6693ab06 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* FIXUP: Fixup Chrome WebUI sources to work with Qtv5.10.0-beta2Allan Sandfeld Jensen2017-09-201-0/+8
| | | | | | | | Remove more references to remote frontend paths we are not using, and which gets optimized away in release builds anyway. Change-Id: I49e2c822dbc193bbb6936201823fb9ffdd877f8e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* FIXUP: Optionally link with system ffmpegAllan Sandfeld Jensen2017-09-201-8/+10
| | | | | | | Switch to buildflags instead of direct defines. Change-Id: I347450db42eeab46930798905bb7ea32ee4db3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix improper boolean valuesViktor Engelmann2017-09-201-5/+5
| | | | | | | | | | | | jpeg_codec.cc contained some implicit conversions to boolean, which is apparently problematic for some versions of libjpeg. Patch taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191 but not backported, since it has not been accepted into chromium yet. Task-Number: QTBUG-58482 Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Do not assert on PPAPI resources we do not support.Allan Sandfeld Jensen2017-09-191-0/+6
| | | | | Change-Id: I54b6571549d3c646e359df8ecda85af27f2ea7e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* FIXUP: Fixup Chrome WebUI sources to work with QtAllan Sandfeld Jensen2017-09-187-13/+56
| | | | | | | | Move the few browser_resources we need to a separate file to avoid including to much we do not need. Change-Id: I0c46e60f440a6c93e254ea9bf0879eff137cdcb9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* [Windows] Disable warning about mf.dll being need for encodingAlexandru Croitor2017-09-151-0/+2
| | | | | | | | This disables the warning message "mf.dll is required for encoding" upon application startup. Change-Id: Ie33a53944867ca93ab8adc9fcaeef81da3b334c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Support using software GL implementation opengl32sw.dll on WindowsAlexandru Croitor2017-09-143-0/+32
| | | | | | | | If Qt reports the usage of opengl32sw.dll, make sure Chromium also uses it for rendering. Change-Id: I61fc0c5a8fa40911d9402a93234b33a735465f38 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support GN on MIPS64 hostsAllan Sandfeld Jensen2017-09-123-0/+20
| | | | | | Task-number: QTBUG-62655 Change-Id: Ifac9cae54e61c2458ca6e1a11e44552d718fe976 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Unbundle re2Michal Klocek2017-09-121-1/+30
| | | | | Change-Id: Ide616b1356d35ae24745fd08c528171386a76f05 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fixup Chrome WebUI sources to work with QtAllan Sandfeld Jensen2017-09-125-9/+30
| | | | | | | Disable resources, headers and bindings we don't have and don't need. Change-Id: Ib8c218c49dba5e3580bea6eff5232fac2b1a0e9d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/upstream-master' into 60-basedAllan Sandfeld Jensen2017-09-121018-1049/+162124
|\ | | | | | | Change-Id: Iee310947bb07d96ec7339c2f8c113d1d255dc93b
| * BASELINE: Update Chromium to 60.0.3112.116 and Ninja to 1.8.2Allan Sandfeld Jensen2017-09-121018-1050/+162125
| | | | | | | | | | | | | | Also adds a few devtools and webui files needed for new features. Change-Id: I431976cc9f4c209d062a925ab6a5d63ec61abcfe Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix resolving of freetype symbolsMichal Klocek2017-09-071-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of build with chromium's harfbuzz, a bootstrap of harfbuzz was exporting freetype symbols based on the chromium's freetype library. However, qt core is also built against system freetype. Fix ambiguous freetype symbols loading by explicitly linking harfbuzz against system freetype and skip the bootstrap of freetype lib. This will also fix freetype sybmols export. This requires also check on new configure system, chormium 60-based requires at least 2.7.1 freetype. Change-Id: I3c1e043468dd1b45c0dc46312e8e0f81f9329fd2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix headers for libpng in skiaMichal Klocek2017-09-074-4/+4
| | | | | | | | | | | | | | | | Make proper headers in case libpng is bundled. Change-Id: Idadd55d17e5196ecd3022223e3d1213a2651effd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | [Backport] Reject getUserMedia calls in builds with WebRTC disabled.Guido Urdaneta2017-09-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | BUG=740099 Change-Id: I14bd58d22bc5cfbadd0428836bc2a01dd45e121a Reviewed-on: https://chromium-review.googlesource.com/593658 Reviewed-by: Philip Jägenstedt <foolip@chromium.org> Commit-Queue: Guido Urdaneta <guidou@chromium.org> Cr-Commit-Position: refs/heads/master@{#491706} (cherry picked from commit 69d36111b9879bd1de6b379ac6d9560af4321fe5) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix unbundling of libevent when cross-compilingMichal Klocek2017-09-011-2/+8
| | | | | | | | | | | | | | | | | | Currently we only support unbundling for target However for host build this can fail if there is no libevent on host system. Change-Id: If14a03364b097dab8cb6dad022e5df650933c29b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Windows: Fix incorrect relative path when linking .natvis filesAlexandru Croitor2017-08-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The previous rebase_path calls used the generated BUILD.gn path as the base path (so e.g. src/core/Debug/) but link.exe is executed from src/core directory, which resulted in the .natvis files not to be found. Generate absolute system paths instead. Change-Id: I0c6414387137ae425c1cbc76fcd0b1e0bf6cbc46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix gcc 4.8.5 compiler issueMichal Klocek2017-08-301-2/+2
| | | | | | | | | | | | | | This is required for coin's LinuxopenSUSE_42_1x86_64 Change-Id: I10a17f288b58b69364dd1ffd4e6a0abc94e68faf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | [Backport] ozone: drm: Remove the debug details when dmabuf mmap fails.Peter Varga2017-08-301-24/+3
| | | | | | | | | | | | | | | | | | | | | | As we fixed mmap failure, remove the redundant crash reports. The CL adding the info: crrev.com/2710183005 BUG=629521 Change-Id: Ibf500bca4ea231c9504c2b2fb36513d62b443ed0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/565805 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | [Backport] Add a .gitattributes file to force LF line-endings in .pins files.martijn2017-08-302-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This change forces the pins files to use LF line-endings and adds a check to detect CRLF line-endings that outputs a more helpful error message. BUG=729553 Change-Id: I9a470c1d07dcacabcae1ce9029f35323cd86b4d2 Review-Url: https://codereview.chromium.org/2941543002 Cr-Commit-Position: refs/heads/master@{#485165} Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add switch option for using OpenGL Core Profile in ChromiumAlexandru Croitor2017-08-293-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | By default the Core Profile is only used on macOS if no --use-gl command line argument is passed. Depending on this behavior is a bit risky, thus a new switch option called "opengl_core_profile" is introduced to allow explicitly using the core profile, for example when a default QSurfaceFormat is set. Task-number: QTBUG-60605 Change-Id: Ie927432ab555f0cf4b35c74326c53d0232f98f6a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix build with Xcode 8.2.1Alexandru Croitor2017-08-281-1/+1
| | | | | | | | | | | | | | | | | | The clang compiler shipped with Xcode 8.2.1 does not handle properly deleted function templates in conjunction with explicit specialization of the deleted function template. Change-Id: Iceb7f1209bd1931ee102c0a40588df11547c5a78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | [FIXUP] Fix GN bootstrapAlexandru Croitor2017-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | The TOOLKIT_QT define has to be explicitly passed on macOS, because the use_qt GN argument is not used when building the temporary GN executable in the first phase. This leads to a compilation error in sys_info_mac.mm due to it including sdk_forward_declarations.h, which has a preprocessor TOOLKIT_QT condition. Change-Id: I092d6c95917481ae31c6b648e8152e91c635cd77 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | FIXUP: Unbundle Linux system libraries for GNAllan Sandfeld Jensen2017-08-113-3/+29
| | | | | | | | | | | | | | | | | | | | Reinstate unbundling of generic zlib module. The argument there was conflicting with the new argument in pdfium, which had to be renamed. Ideally the two defines should be merged somewhere. Change-Id: Ic824ef83d490a7f271893a03fd51f8938335da90 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | [Windows] Disable warning about mf.dll not being found on WindowsAlexandru Croitor2017-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when building a debug configuration of QtWebEngine with proprietary codecs enabled, running an application will display a "mf.dll is required for hardware video decoding" warning. This is due to the fact that the "DXVAVideoDecodeAccelerator::PreSandboxInitialization" method which loads the respective shared library is not called at all. The only call site is in ContentSandboxHelper::PreSandboxStartup, which is not called by Qt code, because we do not use a separate GPU process, and the in-process-gpu-thread code lacks the sandbox initialization. In Qt's case, adding the missing code to the in-process-gpu thread does not make sense due to the following reasons: 1) The DXVA accelarator depends on DirectX API being available via ANGLE / EGL extensions. When running in Desktop OpenGL mode, ANGLE is not available, and thus initialization of DXVA fails. 2) When running in ANGLE mode, Qt disables GPU rendering completely, because ANGLE does not support multi-threaded access to OpenGL contexts. Because GPU rendering is disabled, so is DXVA support. Thus this change simply removes the warning output, so as to not confuse users that something is misconfigured with their QtWebEngine build. Change-Id: Ib91f6e4753aa811d366c741cf17220d2892cef2d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | FIXUP: Enable using gnu thin archives on LinuxAlexandru Croitor2017-08-111-2/+7
| | | | | | | | | | | | | | GN failed due to extra_arflags flag not being used Change-Id: I24e95f62bdb670b529b827da42b57d6c0674661b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add spellcheck as exposed interfaceAllan Sandfeld Jensen2017-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | We need this for the spellchecker to be allowed to be connected to. In theory we should have this in a manifest overlay instead of patching it here, but that would be more code, and these manifests are already pointless overhead. Change-Id: I678df81477cb8d66dab2a51ce2028870bd07d519 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Do not launch zygote processes in single-process modeAllan Sandfeld Jensen2017-08-111-0/+3
| | | | | | | | | | | | Change-Id: I7a969600852ee08cca4591242d6d6c2f5f0ab432 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Enable minimal optimizations when debug-symbols are disabledAllan Sandfeld Jensen2017-08-117-0/+32
| | | | | | | | | | | | | | | | | | | | Restores building Blink with -Os when debug-systems are stripped anyway. We did this previously in gyp, but didn't port it to GN before now. Change-Id: Ia22b1de1ba63423c22f1ecb5c173b7cab13a1af3 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Enable using gnu thin archives on LinuxAllan Sandfeld Jensen2017-08-112-1/+11
| | | | | | | | | | | | | | | | | | | | The thin archives just references the object files and thus saves disk space when building. Change-Id: Ica315de6c39456e2801e5f2cc96242997dd1c454 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Silence gcc -Waddress warnings in logging.hAllan Sandfeld Jensen2017-08-111-0/+9
| | | | | | | | | | | | | | | | We were getting too many of these, poisoning our compile output. Change-Id: Ic7e41e2bb538bf69a873e32217f87fd369317a20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix building without git installedAllan Sandfeld Jensen2017-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is only needed for 'gn --version' which we don't care about and which would be meaningless anyway. Task-number: QTBUG-61111 Change-Id: Ia30276a9e812f09f442f2ab42f7621422f9780ec Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Do not export c memory handling functionsMichal Klocek2017-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to export dummy symbols to keep C-ABI Unfortuinately symbol version assembly does not work if these symbols get redefined here. These extra allocations are checking and logging "Out of memory" Task-number: QTBUG-61521 Change-Id: Iea8c7cbf873cee40921000720451653842b03c07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Carry over user-agent override when opening new windowsAllan Sandfeld Jensen2017-08-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows opened by blink instead of the requested by the user has no opportunity to set user-agent override. RenderFrameImpl will try to set it based on the last request on the frame, but when a new window is opened there is only a blank last request where override has not been set. This patch will set the user-agent override on the initial blank request on a new frame based on the setting of opener. Task-number: QTBUG-50876 Task-number: QTBUG-61174 Change-Id: I8ec0163bbdeebdbd0a7d8a42ef089b14b4f8803c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | FIXUP: Unbundle Linux system libraries for GNAllan Sandfeld Jensen2017-08-111-2/+2
| | | | | | | | | | | | | | Chromium now also uses libwebpmux Change-Id: I831dee3d922297c19922af96ebb9a5d0b5479a6c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix building with precompiled headers on windowsAllan Sandfeld Jensen2017-08-103-4/+4
| | | | | | | | | | | | | | Without this change the precompiled headers are not found on windows. Change-Id: I5362e926d4bfee2e1fd5211b0f54229986998f30 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Disable termination on out of memory.Allan Sandfeld Jensen2017-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | By default chromium installs a new_handler that calls exit() when new/malloc fail to allocate memory. While this is a reasonable thing to do for a browser, a library should leave the decision to the user. Task-number: QTBUG-45459 Change-Id: Ice5ff8a3347a9df836fb298fed1e80bf21e6b7dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | FIXUP: Fix false dependency on mus, tracing and mojo_runnerAllan Sandfeld Jensen2017-08-101-1/+0
| | | | | | | | | | | | | | | | Nothing to fix, we only need to avoid compiling the code in, and there is no #if defined(USE_AURA) here. Change-Id: I4778344ec897e023a306d033961516a7fddfb75b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix Renderer and GPU threads on windowsPeter Varga2017-08-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | These threads are using the UI message loop on Windows per default. This won't work since the UI message loop is handled by Qt and the Renderer and GPU threads won't work with it properly. Force these threads for using the default message loop as they use it on Linux platform. Change-Id: I8b04ba9070912378cf1d13173ddff48e98f9a49b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/upstream-master' into 60-basedAllan Sandfeld Jensen2017-08-10710-41766/+59916
|\ \ | |/ | | | | Change-Id: I72f29cf7f5f3050150b678a59a8ea00708285168
| * BASELINE: Update Chromium to 60.0.3112.96Allan Sandfeld Jensen2017-08-09551-45901/+24766
| | | | | | | | | | Change-Id: I8fa4120b6b8153b5be2520e57cf76c8d210bc2b5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * BASELINE: Update Chromium to 60.0.3112.78Alexandru Croitor2017-08-011039-62500/+101788
| | | | | | | | | | Change-Id: I58f9d14bddb9104a666b6ef869944111ee7eadb8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Do not build swiftshader when it is disabledAllan Sandfeld Jensen2017-08-084-14/+23
| | | | | | | | | | Change-Id: Id51f271047aa03d5480e93835c90a7b0b91bd516 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | [Backport] Roll libxml to 3939178e4cb797417ff033b1e04ab4b038e224d9Dominic Cooney2017-08-0733-882/+902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes a few patches fixed upstream: https://git.gnome.org/browse/libxml2/commit/?id=e26630548e7d138d2c560844c43820b6767251e3 https://git.gnome.org/browse/libxml2/commit/?id=94691dc884d1a8ada39f073408b4bb92fe7fe882 Stops using the NOXXE flag which was reverted upstream: https://git.gnome.org/browse/libxml2/commit/?id=030b1f7a27c22f9237eddca49ec5e620b6258d7d Changes the patch to uri.c to not add limits.h, which is included upstream. Bug: 722079 Change-Id: I097671040cdd694f615b56b63360c3df82c33872 Reviewed-on: https://chromium-review.googlesource.com/535233 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
View Lorry Controller Status