summaryrefslogtreecommitdiff
path: root/chromium/ppapi
Commit message (Collapse)AuthorAgeFilesLines
* Fix conflicting GL headersAllan Sandfeld Jensen2016-05-101-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 several 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 ensure former indirect dependencies are made direct. This patch collapses several patches by Jocelyn Turcotte and Andras Becsi Change-Id: I82ae8a5a62f7d968375b971757b2126670a02461 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 51.0.2704.41Allan Sandfeld Jensen2016-05-09175-1742/+1130
| | | | | | | 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.34Allan Sandfeld Jensen2016-02-011-3/+2
| | | | | Change-Id: I89af6c0074347d4415cc1ce35a6d54a3760e6ad2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.23Allan Sandfeld Jensen2016-01-25585-1971/+4414
| | | | | | | 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-0/+6
| | | | | | | | 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.34 and Ninja to 1.6.0Allan Sandfeld Jensen2015-10-271-0/+12
| | | | | Change-Id: Ie8863b493c7ff19eb46478935dfe7602679b227e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-14116-828/+2465
| | | | | | | 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.40Allan Sandfeld Jensen2015-08-14137-2747/+714
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update to chromium 44.0.2403.80Allan Sandfeld Jensen2015-07-075-11/+60
| | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.47Allan Sandfeld Jensen2015-06-18449-13851/+12599
| | | | | 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-09367-4864/+9347
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-12653-32131/+64265
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-20261-5468/+6455
| | | | | | | | | 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-13247-5803/+6120
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-297-81/+19
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Initial import.Zeno Albisser2013-08-151319-0/+193142