summaryrefslogtreecommitdiff
path: root/chromium/base
Commit message (Collapse)AuthorAgeFilesLines
* Fix clang and embedded gcc buildsAllan Sandfeld Jensen2016-07-071-0/+3
| | | | | | | | | | | | Work around two clang issues, one causing a warning in v8 which uses -Werror, and one causing a dependency on libatomic because clang doesn't have internal atomic handling. The latter also affects some embedded gcc builds. Task-number: QTBUG-54426 Change-Id: I7e82ffc2919ea0c5726b3ad11084871917534e4c Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge branch 'upstream-master' into 51-basedAllan Sandfeld Jensen2016-07-011-3/+1
|\ | | | | | | Change-Id: If5884c6f2c448757b2e9a52bb746cac4ebaaad33
| * BASELINE: Update Chromium to 51.0.2704.106Allan Sandfeld Jensen2016-07-011-3/+1
| | | | | | | | | | | | | | Also add a few extra files we might need for future features. Change-Id: I517c35e43221c610976d347c966d070ad44d4c2b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge branch 'upstream-master' into 51-basedAllan Sandfeld Jensen2016-06-021-29/+38
|\ \ | |/ | | | | Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
| * BASELINE: Update Chromium to 51.0.2704.79Allan Sandfeld Jensen2016-06-021-29/+38
| | | | | | | | | | | | | | Also adds a few files for url_parsing in extensions. Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | <chromium> Adjust gyp defines for eLinux.Zeno Albisser2016-05-182-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add Raspberry PI chipset to list of defined platforms. - Make sure to include sources for xdg support. - Do not use pkg-config-wrapper, as our sysroot pkg-config already returns absolute paths. - Use openssl for eLinux. - Use fontconfig and freetype2 for eLinux. Change-Id: Ic5266f818432b4432ed1d8a1ac07f434cb5b86e6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add CommandLine::CreateEmptyJoerg Bornemann2016-05-112-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a static function to create the CommandLine object for the current process without initializing it. Rationale: on Windows we need to initialize the CommandLine differently than Chromium intends. Esp. we want to pass our own arguments instead of relying on GetCommandLineW(). Task-number: QTBUG-51971 Change-Id: I0d1f0aa4eabad470d730f4f0a76cd1535f8f23ce Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix build on OS X Mavericks (10.9)Peter Varga2016-05-111-0/+2
| | | | | | | | | | | | | | | | Define unsupported NSEventModifierFlags type. Change-Id: I96f66c4c0f91bb0c7259909bce788fafbc9fd4a6 Task-number: QTBUG-51350 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Integrate spell checker sources, fix compilation issuesMichal Klocek2016-05-101-1/+2
| | | | | | | | | | | | Change-Id: Idb2b4b4fc746f0c1967f50b7715a94200fbbb009 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Set message loop before creating message pumpAllan Sandfeld Jensen2016-05-101-3/+3
| | | | | | | | | | | | | | | | | | The constructor of MessagePumpForUIQt uses MessageLoopForUI::current() so current must be set before creating the message pump. Change-Id: I58822d0eabf625cae8340778fac54fc7818c46b6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Optionally unbundle third_party librariesAllan Sandfeld Jensen2016-05-101-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Merges gyp files from linux unbundle to third_party so we may optionally link to the system versions of these libraries. This affects: libpng, zlib, minizip, libevent libwebp, flac, snappy, vpx and jsoncpp Change-Id: Ic4f2ff412e43d873cd81d85a9ae639f30b53ec7e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Add a hook to provide our own icu data file pathJocelyn Turcotte2016-05-102-1/+8
| | | | | | | | | | | | | | | | | | | | Qt will always use QLibraryInfo to determine where this file was installed, regardless of the platform. Change-Id: I79374655356d872b2bc766ec8a33fcba343e9c95 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Add WebEngineContext to RunLoop's friends.Jocelyn Turcotte2016-05-091-0/+5
|/ | | | | | | Change-Id: I2bb2600637ac5a3473273789cd61c257d682b702 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 51.0.2704.41Allan Sandfeld Jensen2016-05-09542-18066/+18333
| | | | | | | Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.111Allan Sandfeld Jensen2016-04-016-40/+207
| | | | | Change-Id: I5f8c7bd936a259c7229924aba755ae6064ac9240 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.48Allan Sandfeld Jensen2016-02-111-3/+6
| | | | | Change-Id: I684541113ff518e3a7d51dfd0b31962b06d10af1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.34Allan Sandfeld Jensen2016-02-012-1/+20
| | | | | Change-Id: I89af6c0074347d4415cc1ce35a6d54a3760e6ad2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.23Allan Sandfeld Jensen2016-01-25947-11694/+41827
| | | | | | | Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.71Allan Sandfeld Jensen2015-11-232-1/+23
| | | | | | | | Also adds a few missing spellcheck sources. Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-14392-9462/+13755
| | | | | | | Also adding in sources needed for spellchecking. Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update chromium to 45.0.2454.101upstream-45Allan Sandfeld Jensen2015-09-291-15/+0
| | | | | | | Also adds web_cache component Change-Id: I51238ceea8ee99854cc4989ae70a4fc2fc6bedcb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* BASELINE: Update chromium to 45.0.2454.79Allan Sandfeld Jensen2015-08-263-9/+30
| | | | | | | Also remove third_party trace-viewer and hunspell again. Change-Id: Iee0b3b27abcef9b1e87a0e39b71f6b785d1d19be Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update chromium to 45.0.2454.40Allan Sandfeld Jensen2015-08-14328-6587/+10720
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-294-22/+84
| | | | | | | | Also adds missing compile_test tool, and removed two unused third_party modules. Change-Id: Ie6135c2a57c8c9519aa093eb0a259a605b26a111 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update to chromium 44.0.2403.80Allan Sandfeld Jensen2015-07-073-11/+99
| | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.47Allan Sandfeld Jensen2015-06-18695-21464/+23322
| | | | | Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2014-12-09556-8659/+12244
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-12587-16258/+27035
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-049-26/+24
| | | | | | | | | | | | | | | This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Include atomicops_internals_x86_gcc.cc when compiling for ia32Andras Becsi2014-04-281-0/+5
| | | | | | | | This is needed for the embedded emulators and should be squashed with the corresponding patch on the next update. Change-Id: I9ece131df6ba23045dad741278651399a67639e7 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Adjust gyp defines for eLinux.Zeno Albisser2014-04-233-2/+9
| | | | | | | | | | | | | - Add Raspberry PI chipset to list of defined platforms. - Make sure to include sources for xdg support. - Do not use pkg-config-wrapper, as our sysroot pkg-config already returns absolute paths. - Use openssl for eLinux. - Use fontconfig and freetype2 for eLinux. - Use chacha_vec.c to avoid hard/soft float mismatch. Change-Id: I8dd21c480922f32ac7111ea5582d82c249414caa Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Hide the definition of MessagePumpX11::GetDefaultXDisplayAndras Becsi2014-03-251-0/+3
| | | | | | | This should replace patch 0011 since we do not build GTK code any more. Change-Id: I156f164128b04eee6d5956a576adef3b9d2d18ea Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-20328-6998/+15859
| | | | | | | | | This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-13228-8975/+6415
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2914-181/+188
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Hide the definition of MessagePumpGtk::GetDefaultXDisplay.Jocelyn Turcotte2013-11-061-0/+4
| | | | | Change-Id: I3bcee32bcdaab3fe43dc02a66cac295bb1c6386e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Initial import.Zeno Albisser2013-08-151101-0/+202600
View Lorry Controller Status