summaryrefslogtreecommitdiff
path: root/chromium/ui
Commit message (Collapse)AuthorAgeFilesLines
* Disable ResourceBundle functions for enabling QtWebEngine implementationPeter Varga2016-07-061-2/+2
| | | | | | Change-Id: Ia78a97eea564ed8b8c50ebbdea2eaf7a8dbe6e1f Task-number: QTBUG-53000 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge branch 'upstream-master' into 51-basedAllan Sandfeld Jensen2016-07-011-1/+1
|\ | | | | | | Change-Id: If5884c6f2c448757b2e9a52bb746cac4ebaaad33
| * BASELINE: Update Chromium to 51.0.2704.106Allan Sandfeld Jensen2016-07-011-1/+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-0234-358/+570
|\ \ | |/ | | | | Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
| * BASELINE: Update Chromium to 51.0.2704.79Allan Sandfeld Jensen2016-06-0234-358/+570
| | | | | | | | | | | | | | Also adds a few files for url_parsing in extensions. Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge branch 'upstream-master' into 51-basedAllan Sandfeld Jensen2016-05-123-0/+10
|\ \ | |/ | | | | Change-Id: I163a70592012b4c78989ae3ce39dcef140c486ae
| * BASELINE: Update Chromium to 51.0.2704.47Allan Sandfeld Jensen2016-05-123-0/+10
| | | | | | | | | | | | | | And adds in a few missing files. Change-Id: Id0d85c81f5efc1b1c8cf9cb3241da26bf7245026 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add POD TransferableFenceJocelyn Turcotte2016-05-109-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt is consuming those textures in a different thread, synchronizing when commands are handed down to GL isn't always enough. The GL driver could decide to do additional scheduling and end up executing Qt's consuming GL commands before Chromium's producing ones even if they were sent to their respective context in the right order. gfx::GLFence can now be converted to a POD TransferableFence to allow waiting for or destroying the sync using a QOpenGLContext, which gl_fence.cc wouldn't be able to use through Chromium's GL function table. Task-number: QTBUG-42295 Change-Id: I5aed0df7adca9c95eda71925399d39fd770fffa1 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix conflicting GL headersAllan Sandfeld Jensen2016-05-102-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | <chromium> Get rid of the gtk/pango/cairo dependencyAndras Becsi2016-05-102-3/+3
| | | | | | | | | | | | | | | | | | This also removes the aura dependency to chrome resources since we repack the needed resources ourselves. Change-Id: I0368bb36948ba9612040ed869ef818d4b8471b9b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Move querying EGL extensions out of chromiumAllan Sandfeld Jensen2016-05-101-1/+2
| | | | | | | | | | | | | | | | | | We need to query the EGL extension in qtwebenginecore to avoid directly accessing EGL methods that may not be linked directly. Change-Id: Iddd1df70d2dd37964bb0cba70c2a3aa4c67d8002 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Enable localization codepath on OS X and LinuxAndras Becsi2016-05-102-6/+6
| | | | | | | | | | | | Change-Id: I5471953dbe08ee5afb92d24baeb94863fb8de98e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix dependencies on ANGLEAllan Sandfeld Jensen2016-05-103-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | Removes dependency on libEGL and libGLESv2 on both Windows and X11, and links to the Qt versions on windows if doing an ANGLE build. Technically we don't need ANGLE in that case either because we disable GPU acceleration when Qt is using ANGLE, but since it is runtime disabled it still need to be there at compile and link time. Change-Id: I866442d7172609b81eaf83fdba3d8d85cc848cf2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Disable requesting font family from ResourceBundlePeter Varga2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The PlatformFont support is not implemented in QtWebEngine yet. Thus without disabling in case of requesting navigation error string (eg. default message for error page) accessing PlatformFont triggers an assert. Change-Id: I9a2b3035e03ecc5c43a50013886ff340f37d8806 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Add ifdefs to exclude ATL and accessibility from the buildAllan Sandfeld Jensen2016-05-101-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ATL currently isn't distributed with MSVS Express, only with the Professional version. Chromium requires downloading the WDK iso for express users just to be able to use the ATL version that was shipped with it. We can avoid the extra dependency for now by cutting off all the accessibility code, which is currently the only part of the content layer depending on ATL. We will use the Qt accessibility code anyway. Change-Id: Iec25231250ccfc9405fdf342752733814888f348 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add accessors and seams for the Qt delegated renderer integration.Jocelyn Turcotte2016-05-102-2/+8
| | | | | | | | | | | | | | | | | | | | This is needed to fetch the MessageLoop, the MailboxManager and the SyncPointManager of the GPU in-process host. And fetch the right shared context for the in GPU thread. Change-Id: I7f38e32b2df11da5b046f16643841d34260c11fb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | <chromium> Update clipboard.h to allow building clipboard_qt.cpp on all ↵Jocelyn Turcotte2016-05-101-1/+8
| | | | | | | | | | | | | | | | | | platforms Change-Id: I5fecc09e245b75d0fec16756f8d6e6b8f71a143e 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> Allow overriding GetXDisplayJocelyn Turcotte2016-05-091-0/+8
|/ | | | | | | | | | | This allows Chromium to fetch the XDisplay owned by Qt instead of a new one. We were previously overriding MessagePumpForUI::GetDefaultXDisplay but this was removed along with the switch to Aura. Change-Id: I9fb53c8cc955f124d88ad0e6ca690f88e816847e 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-091207-20504/+36737
| | | | | | | 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-48/+54
| | | | | Change-Id: I5f8c7bd936a259c7229924aba755ae6064ac9240 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.91Allan Sandfeld Jensen2016-03-0838-290/+556
| | | | | | | And adds sources hunspell dictionary convertion tool. Change-Id: Ifb016b018e7b7cc5a2c56d8e4c1b1b563bd5eaed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.48Allan Sandfeld Jensen2016-02-118-45/+230
| | | | | Change-Id: I684541113ff518e3a7d51dfd0b31962b06d10af1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.34Allan Sandfeld Jensen2016-02-016-57/+11
| | | | | Change-Id: I89af6c0074347d4415cc1ce35a6d54a3760e6ad2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.23Allan Sandfeld Jensen2016-01-252323-21233/+51340
| | | | | | | Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.109Allan Sandfeld Jensen2016-01-056-153/+237
| | | | | | | Also adds sources for CDM. Change-Id: Id1c834411de135c71deb23b884f2dce902190136 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.71Allan Sandfeld Jensen2015-11-2317-53/+94
| | | | | | | | 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-2724-28/+194
| | | | | Change-Id: Ie8863b493c7ff19eb46478935dfe7602679b227e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-141330-21072/+31438
| | | | | | | 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-2913-49/+130
| | | | | | | 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-26115-9002/+9257
| | | | | | | 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-142022-20753/+21981
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-298-18/+61
| | | | | | | | 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-0711-12/+184
| | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.47Allan Sandfeld Jensen2015-06-182292-53302/+127799
| | | | | 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-091996-36499/+80645
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-122907-123681/+141349
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-049-32/+87
| | | | | | | | | | | | | | | 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>
* Get rid of the gtk/pango/cairo dependencyAndras Becsi2014-03-251-1/+0
| | | | | | | | This also removes the aura dependency to chrome resources since we repack the needed resources ourselves. Change-Id: I8180d5668334540cfd88ade449f3f0c966b989ce Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add missing files for ozoneAndras Becsi2014-03-222-0/+73
| | | | | | | | | These files are needed by the ozone.gyp file and were excluded from the snapshot. Change-Id: I91a8e9ca88b9aa7ce307d434300de8bcf88fe3c4 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-201617-19824/+49566
| | | | | | | | | 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 clipboard.h to allow building clipboard_qt.cpp on all platformsJocelyn Turcotte2014-02-281-1/+6
| | | | | | | Note: This does not build on Windows yet. Change-Id: Ife754b2fcb1c1a535565facdbab615c07b8c4935 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix the Mac debug buildJocelyn Turcotte2014-02-201-2/+12
| | | | | | | | event.cc was added to the build to get ui::TouchEvent and ui::GestureEvent but this file is not built on Mac by Chromium itself and thus fails to build. Change-Id: Ib7bb4fb1fc8692df1b8151c3d159de3d0f73c76f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-131087-15631/+19086
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-29164-759/+6334
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add seams to setup GL contexts sharing with QtQuick.Jocelyn Turcotte2013-11-062-2/+8
| | | | | | | | | This will allow us to know right before the first GL context is instantiated by Chromium so that we can install those contexts to be shared with QtQuick GL contexts as well. Change-Id: Ia2de987edb5a87097c2b29bedd8a1f908141d8ee Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Initial import.Zeno Albisser2013-08-152991-0/+344794
View Lorry Controller Status