summaryrefslogtreecommitdiff
path: root/chromium/webkit
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> Fix the build with a GL ES2 configured Qt.Jocelyn Turcotte2014-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | GLES/gl2.h is included through Qt public headers and the copy of Chromium is used since its include path comes before /usr/include. The problem is that this header is incompatible for some reasons, one of them being that it converts all GL function symbols from gl* to GLES2*. Qt layer code should always need to go through GL directly, so make sure that only GYP targets that depend directly on gpu.gyp, khronos.gyp or webkit_gpu.gyp will have an include path pointing to those headers. Replace all_dependent_settings with direct_dependent_settings and control which target inherits this include_dirs from its dependencies by using export_dependent_settings. Change-Id: I82ae8a5a62f7d968375b971757b2126670a02461 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-041-3/+0
| | | | | | | | | | | | | | | 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-20367-13887/+7351
| | | | | | | | | 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-13267-6280/+5170
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2951-265/+1561
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build with a GL ES2 configured Qt.Jocelyn Turcotte2013-11-011-0/+3
| | | | | | | | | | | | | | | | | | | | | GLES/gl2.h is included through Qt public headers and the copy of Chromium is used since its include path comes before /usr/include. The problem is that this header is incompatible for some reasons, one of them being that it converts all GL function symbols from gl* to GLES2*. Qt layer code should always need to go through GL directly, so make sure that only GYP targets that depend directly on gpu.gyp, khronos.gyp or webkit_gpu.gyp will have an include path pointing to those headers. Replace all_dependent_settings with direct_dependent_settings and control which target inherits this include_dirs from its dependencies by using export_dependent_settings. Change-Id: Id4d98fe22ef8b778b5ba8da300dad28e69507732 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Initial import.Zeno Albisser2013-08-15736-0/+107510