summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/qt
Commit message (Collapse)AuthorAgeFilesLines
* Integrate QWebChannel with QtWebKit.Milian Wolff2014-08-164-76/+199
| | | | | | | | | | | | | | | | | | | | | | | | WebView.experimental gets a new webChannel property. By default, this is initialized to a QQmlWebChannel internal to the WebView. By setting it from the outside, it is possible to share the same WebChannel between different WebViews. The webChannel property can be set to null to disable this new feature. For IPC, a navigator.qtWebChannelTransport property is added, which is essentially a copy of navigator.qt. This is required to be able to use both independently. The transport is implicitly connected to the WebView's webChannel. On the JavaScript client side, some manual boiler plate code is still required. Potentially, this can be adapted in the future to preload the qwebchannel.js. Furthermore, we might be able to instantiate and initialize the QWebChannel before we emit window.onload. A basic test is added which verifies that this basic integration works. Change-Id: I5eb0389e6edd6d0c978917e441365e11a02b5c3f Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* 8 bytes memory leaks in WebProcessMainQt.cpp when proxy is initializedMinju Kim2014-02-071-2/+2
| | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118515 Patch by Minju Kim <pmuarteo@gmail.com> on 2013-09-25 Reviewed by Christophe Dumez. * WebProcess/qt/WebProcessMainQt.cpp: (WebKit::initializeProxy): Handled EnvHttpProxyFactory by using OwnPtr to avoid memory leak when it isn't handled by NetworkProxyFactory Change-Id: I51833871d8e11441ffe60d51629814e64f77d792 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156449 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Import Qt5x2 branch of QtWebkit for Qt 5.2Allan Sandfeld Jensen2013-09-197-112/+256
| | | | | | | Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 ↵Simon Hausmann2012-10-221-1/+1
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets
* Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 ↵Simon Hausmann2012-09-261-0/+1
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@129610) New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)
* Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d ↵Simon Hausmann2012-09-103-6/+12
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot
* Imported WebKit commit a5ae8a56a48e44ebfb9b81aaa5488affaffdb175 ↵Simon Hausmann2012-08-232-6/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@126420) New snapshot with OS X 10.6 build fix
* Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 ↵Simon Hausmann2012-08-121-2/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
* Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e ↵Simon Hausmann2012-07-241-0/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@123477) New snapshot that adapts to latest Qt API changes
* Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 ↵Simon Hausmann2012-07-231-7/+5
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@123308) New snapshot with better configure tests
* Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 ↵Simon Hausmann2012-07-111-0/+7
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@122325) New snapshot that should work with the latest Qt build system changes
* Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 ↵Simon Hausmann2012-06-201-4/+79
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes
* Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 ↵Simon Hausmann2012-05-251-0/+1
| | | | (http://svn.webkit.org/repository/webkit/trunk@118516)
* Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 ↵Simon Hausmann2012-05-181-0/+1
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-072-32/+11
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a ↵Simon Hausmann2012-03-121-0/+1
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
* Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 ↵Simon Hausmann2012-02-242-0/+29
| | | | (http://svn.webkit.org/repository/webkit/trunk@108790)
* Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 ↵Simon Hausmann2012-02-091-1/+7
| | | | (http://svn.webkit.org/repository/webkit/trunk@107223)
* Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 ↵Simon Hausmann2012-02-035-41/+68
| | | | (http://svn.webkit.org/repository/webkit/trunk@106560)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-0610-0/+1119
(http://svn.webkit.org/repository/webkit/trunk@104285)
View Lorry Controller Status