summaryrefslogtreecommitdiff
path: root/chromium/content/common
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> Blacklist the skypebuttons pluginJocelyn Turcotte2014-06-041-0/+1
| | | | | | | | | | | | | | | Even though plugins are disabled it happens that the libraries are loaded and cause a crash since skypebuttons pulls Qt4 with it on Linux and creates a dynamic linking error conflicting with Qt5 symbols. Add the plugin library name to the blacklist to avoid it being loaded altogether. We have a similar fix in QtWebKit doing the same thing. Reviewed-by: Andras Becsi <andras.becsi@digia.com> Change-Id: I45abf31c4e94a8b61aff85765a91436dabae1b2e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* <chromium> Add seams to setup GL contexts sharing with QtQuick.Jocelyn Turcotte2014-06-041-1/+7
| | | | | | | | | 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: Zeno Albisser <zeno.albisser@digia.com>
* <chromium> Add accessors for the Qt delegated renderer integration.Jocelyn Turcotte2014-06-041-0/+2
| | | | | | | | This is needed to fetch the MessageLoop, the MailboxManager and the SyncPointManager of the GPU in-process host. Change-Id: I7f38e32b2df11da5b046f16643841d34260c11fb Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* <chromium> Do not modify the child path.Zeno Albisser2014-06-041-1/+1
| | | | | | | | | | We currently only have a single process binary for Qt. Therefore we should not choose a different binary based on required privileges. However, this patch can only be a preliminary solution. May be we should instead implement our own ChildProcessHost. Change-Id: I03af6257c7be04ab09c9828d707d30430961a17c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-045-14/+3
| | | | | | | | | | | | | | | 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-20252-8573/+9373
| | | | | | | | | 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>
* Blacklist the skypebuttons pluginJocelyn Turcotte2014-02-131-0/+1
| | | | | | | | | | | | | | Even though plugins are disabled it happens that the libraries are loaded and cause a crash since skypebuttons pulls Qt4 with it on Linux and creates a dynamic linking error conflicting with Qt5 symbols. Add the plugin library name to the blacklist to avoid it being loaded altogether. We have a similar fix in QtWebKit doing the same thing. Change-Id: I6706d45d1f19252d3b60af7b97c0a3a729dfe8b7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-13143-1355/+6599
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2922-803/+58
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add seams to setup GL contexts sharing with QtQuick.Jocelyn Turcotte2013-11-061-1/+7
| | | | | | | | | 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>
* Add accessors for the Qt delegated renderer integration.Jocelyn Turcotte2013-11-061-0/+2
| | | | | | | | This is needed to fetch the MessageLoop, the MailboxManager and the SyncPointManager of the GPU in-process host. Change-Id: Ide000254dc8525e00388df8fd182f77405f8451c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Initial import.Zeno Albisser2013-08-15329-0/+59906