summaryrefslogtreecommitdiff
path: root/chromium/cc
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> Solve conflicts when including both QtOpenGL headers and ↵Jocelyn Turcotte2014-06-046-33/+40
| | | | | | | | | | resource_provider.h If resource_provider.h is going to be used to integrate delegated frame to external compositors, it should avoid conflicting with the system's gl.h. Change-Id: Ie37d6cde263157e6717cc006a0896f0b9ebdaa5d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-047-41/+33
| | | | | | | | | | | | | | | 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>
* Update to new stable branch 1750Andras Becsi2014-03-20375-18857/+25850
| | | | | | | | | 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-13280-8008/+22157
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2942-2073/+548
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Do not forward declare UIResourceRequest, Identity and IdentityKey.Zeno Albisser2013-10-291-1/+1
| | | | | | | | | | Clang / libc++ does not support incomplete types in templates. See: http://clang.llvm.org/compatibility.html#undep_incomplete This patch will be squashed into the next chromium update. Change-Id: I46131d53494007548444bc4d158c2208a012ece4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Solve conflicts when including both QtOpenGL headers and resource_provider.hJocelyn Turcotte2013-09-174-2/+6
| | | | | | | | If resource_provider.h is going to be used to integrate delegated frame to external compositors, it should avoid conflicting with the system's gl.h. Change-Id: Ie37d6cde263157e6717cc006a9896f0b9ebdaa5d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Initial import.Zeno Albisser2013-08-15461-0/+136706
View Lorry Controller Status