summaryrefslogtreecommitdiff
path: root/chromium/base
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-304-22/+84
|\ | | | | | | Change-Id: Ie5db510a9470dacbb91c4ab8fa7c73e2dee7d6a1
| * 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>
* | Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-073-11/+99
|\ \ | |/ | | | | Change-Id: I6273ef9e92ca18de70c974fb8435a40218157f8c
| * 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>
* | <chromium> Adjust gyp defines for eLinux.Zeno Albisser2015-06-233-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | <chromium> Add a hook to provide our own icu data file pathJocelyn Turcotte2015-06-232-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>
* | <chromium> Add WebEngineContext to RunLoop's friends.Jocelyn Turcotte2015-06-221-0/+3
|/ | | | | | Change-Id: I2bb2600637ac5a3473273789cd61c257d682b702 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.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