summaryrefslogtreecommitdiff
path: root/chromium/ui
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> FIXUP: Fix the build with a GL ES2 configured Qt.Andras Becsi2015-08-172-7/+0
| | | | | | | | | | Explicitly add dependency to khronos.gyp:khronos_headers instead of export_dependent_settings to prevent the in-source khronos path to cascade through to the QtWebEngine core layer, which would break all the code that uses Qt GL includes. Change-Id: I83ac5421f14fe27f7eab420e02652d7b162cb5df Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <chromium> FIXUP Add ifdefs to exclude ATL and accessibility from the buildKai Koehne2015-08-051-3/+5
| | | | | | | | Fix build with Visual Studio Express by disabling the windows backend that requires ATL headers. Change-Id: I332e931d949e2e6e985fb02e0db044535cfa7df2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-308-18/+61
|\ | | | | | | Change-Id: Ie5db510a9470dacbb91c4ab8fa7c73e2dee7d6a1
| * 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>
* | Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-0711-12/+184
|\ \ | |/ | | | | Change-Id: I6273ef9e92ca18de70c974fb8435a40218157f8c
| * 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>
* | <chromium> Move querying EGL extensions out of chromiumAllan Sandfeld Jensen2015-06-241-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>
* | <chromium> Enable localization codepath on OS X and LinuxAndras Becsi2015-06-232-6/+6
| | | | | | | | | | Change-Id: I5471953dbe08ee5afb92d24baeb94863fb8de98e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Disable requesting font family from ResourceBundlePeter Varga2015-06-231-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>
* | <chromium> Make linking against ANGLE libraries optionalKai Koehne2015-06-231-0/+6
| | | | | | | | | | | | Change-Id: I004dc2a75f9ab27939f65cb784b56ca1ef86db28 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | <chromium> Add missing dependency to khronos_headersZeno Albisser2015-06-231-0/+4
| | | | | | | | | | | | | | | | | | This is needed since https://codereview.chromium.org/106503003 and because of our chromium patch that fixes the build with a GL ES2 configured Qt. Change-Id: I2db61760d5c3b810f2ea4bff93ac25fe2037b4ef Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Convert sync points to GL fence syncs.Jocelyn Turcotte2015-06-239-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium is always producing and consuming the textures on the GPU thread, switching the GL context accordingly, and are using sync points to externally know when it is correct to send the consumming GL commands down the pipe of their respective GL context. 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. To prevent this, convert each sync point into a real GL fence sync and allow Qt to communicate the dependency between consuming and producing commands down to GL even across threads. 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. GpuCommandBufferStub::OnRetireSyncPoint is also called as a result of shutdown destruction where there is a race condition between the ramp-down of the GLContext and the DestroyGLFence() and GLFence::CreateWithoutFlush() calls. This would result in sporadic shutdown crashes or asserts when a page is closed while browsing WebGL content like fishgl.com. Avoid the additional calls if there is no current context. Task-number: QTBUG-42295 Change-Id: I5aed0df7adca9c95eda71925399d39fd770fffa1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | <chromium> Update clipboard.h to allow building clipboard_qt.cpp on all ↵Jocelyn Turcotte2015-06-231-1/+8
| | | | | | | | | | | | | | | | platforms Change-Id: I5fecc09e245b75d0fec16756f8d6e6b8f71a143e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | <chromium> Add seams to setup GL contexts sharing with QtQuick.Jocelyn Turcotte2015-06-232-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: Id55337a7b42d25ac084698a23dbfab06cb273505 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Fix the build with a GL ES2 configured Qt.Jocelyn Turcotte2015-06-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Allow overriding GetXDisplayJocelyn Turcotte2015-06-221-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>
* 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