summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-041-6/+9
| | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-111-0/+1
| | | | | Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-301-2/+0
| | | | | Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-251-78/+106
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-071-1/+1
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-021-28/+27
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-021-3/+3
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Added userStyleSheets property to WebView.experimental.Konstantin Tokarev2015-09-241-11/+41
| | | | | | | | This is similar to QWebSettings::setUserStyleSheetUrl() from widgets API, and shares most of helper code with existing userScripts property. Change-Id: I9352e6b4338c5750ed2ea28efbb2aba045cf7847 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-1/+1
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-281-0/+1
|\ | | | | | | Change-Id: Ideed7a2c21b448633c32f690918eb1ae40355819
| * Fix regression in QQuickWebView's transparent backgoundAllan Sandfeld Jensen2014-08-131-0/+1
| | | | | | | | | | | | | | | | | | We need to set both setDrawsTransparentBackground and setDrawsBackground to get the full correct behavior of transparent backgrounds. Task-number: QTBUG-40063 Change-Id: Iaa276a6a12e3cff40d8bc2892fb0667242afb88b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Integrate QWebChannel with QtWebKit.Milian Wolff2014-08-161-0/+53
|/ | | | | | | | | | | | | | | | | | | | | | | | 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>
* Doc: Added detailed description for WebViewstableVenu2014-06-161-22/+38
| | | | | | | | | | | Moved the description from the overview page to the WebView type documentation. Also added an image corresponding to the snippet used. Task-number: QTBUG-36179 Change-Id: Iaf4207a36f774d93af9a881eae2162d44837eeee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Mention default encoding for QML WebView loadHtml method in docs.Michael Brüning2014-03-251-0/+4
| | | | | | | | | | The fact that the html string will be implicitly converted to UTF-16 led to some errors with loaded resources. Task-number: QTBUG-36656 Change-Id: I6ed36e2e814034cfccb4082c24e3327674e04cdf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix doc warningsJocelyn Turcotte2014-03-171-1/+1
| | | | | | | | | | - Qt for Embedded Linux Requirements isn't available since Qt5 - NOTIFY signal documentations are now ignored and are part of their property - The QtQuick1 WebView code isn't available anymore - Adjust to other renamed and removed pages Change-Id: Ife04becb1a847fb0bfb11dfafa6db2caa36aa9f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix ambiguous castAllan Sandfeld Jensen2014-02-041-1/+1
| | | | | | | | | The conversion from uint64_t to QFlags is now ambiguous, but since we need an int QVariant in the end anyway, we can cast directly to that. Change-Id: I4478efa2b293a59b47c46d27346b56eab48b3278 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Reapply mouse event handling in QQuickWebViewFlickablePrivate.Michael Brüning2014-01-071-0/+5
| | | | | | | | | | | | This reapplies commit 0b789c6a785d5ef45c3f6f2fc0f8694772b3d392, which had been in Qt 5.0.x and 5.1.x, but was not upstreamed and hence overwritten when importing the new snapshot. This basically reverts http://trac.webkit.org/changeset/136119. Task-number: QTBUG-35097 Change-Id: I3e02c3feeb5193c0c06b7525469e208de1d6cafc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Doc: Update WebView code sample on Qt WebKit landing pageTopi Reinio2013-12-041-5/+9
| | | | | | | | | | Replace obsolete 'Page' QML type used in the sample code with 'ScrollView' from Qt Quick Controls. Task-number: QTBUG-35154 Change-Id: I0a16a6158be028bf8a7975240411841c4e8200ef Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix bad if test in QQuickWebViewPrivate::didFailLoad.Michael Brüning2013-11-261-1/+1
| | | | | | | | | It was using and for two different error codes as David Binderman pointed out. Task-number: QTBUG-39425 Change-Id: I85348d8ba07757eb33eceb447adb34cc2e4e1842 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Doc: Reverted name of Qt WebKit and landing page filename.Jerome Pasion2013-10-011-6/+6
| | | | | | | | | -qtwebkit-index.html and "Qt WebKit" are the correct names for the module according to the writing guidelines -index.html will collide with the main Qt 5 index.html page Change-Id: Ic07ae422b85766090b1e3c09b34100293a972bfb Reviewed-by: Martin Smith <martin.smith@digia.com>
* Import Qt5x2 branch of QtWebkit for Qt 5.2Allan Sandfeld Jensen2013-09-191-153/+326
| | | | | | | Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-131-0/+12
|\ | | | | | | | | | | | | Conflicts: Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp Change-Id: Iaa6209d0d611d18b8c916bcd165c8bf5b7441b7b
| * [Qt] Restore URL Scheme Delegates after QtWebProcess crashMilian Wolff2013-09-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=108808 When the QtWebProcess crashes, the registered URL Scheme Delegates are not properly restored over IPC in the newly launched process instance. Reviewed by Simon Hausmann. * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebViewPrivate::didRelaunchProcess): (QQuickWebViewPrivate::updateSchemeDelegates): * UIProcess/API/qt/qquickwebview_p_p.h: (QQuickWebViewPrivate): Change-Id: I14493ea1190053e5a523d2cf8a99cc8d526b4fd2 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142997 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | [Qt] Enable QML handling of crashed/unresponsive QtWebProcessMilian Wolff2013-09-021-0/+24
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=108474 Forward the processDidCrash, didRelaunchProcess, processDidBecomeUnresponsive and processDidBecomeResponsive signals to QML's WebView.experimental. Reviewed by Jocelyn Turcotte. * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebViewPrivate::processDidCrash): (QQuickWebViewPrivate::didRelaunchProcess): (QQuickWebViewPrivate::processDidBecomeUnresponsive): (QQuickWebViewPrivate::processDidBecomeResponsive): * UIProcess/API/qt/qquickwebview_p.h: * UIProcess/API/qt/qquickwebview_p_p.h: (QQuickWebViewPrivate): NOTE: This is the initial iteration of the patch attached to upstream bug report 108474, i.e.: https://bug-108474-attachments.webkit.org/attachment.cgi?id=185771 The actually committed version is incompatible with the status of QtWebKit stable as the architecture changed too much. Change-Id: I91d28dde2774fd1487a96ac36a14b522ffb7756c git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153580 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Qt] docs: Fix module name formatSze Howe Koh2013-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=113209 Reviewed by Jocelyn Turcotte. Make QDoc-generated documentation follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Source/WebKit/qt: * Api/qwebdatabase.cpp: * Api/qwebkitglobal.cpp: * Api/qwebpluginfactory.cpp: * Api/qwebsettings.cpp: * WidgetApi/qgraphicswebview.cpp: * WidgetApi/qwebframe.cpp: * WidgetApi/qwebpage.cpp: * WidgetApi/qwebview.cpp: * docs/qtwebkit-bridge.qdoc: * docs/qtwebkit-goes-mobile.qdoc: * docs/qtwebkit.qdoc: Source/WebKit2: * UIProcess/API/qt/qquickwebview.cpp: Change-Id: I27927b6a3722f86379fdc538a53f4cc84c68494f git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147637 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* [Qt][WK2] Pages / resources cannot be loaded from qrc files.michael.bruning@digia.com2013-02-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=107031 Reviewed by Jocelyn Turcotte. Enables WebKit2 Qt applications to load files from the bundled qrc files. This is achieved by adding a url scheme handler for the "qrc" scheme using the application scheme handler and ignoring all handlers for the qrc application scheme that the application might set. * UIProcess/API/qt/qquickurlschemedelegate.cpp: (QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate): (QQuickQrcSchemeDelegate::readResourceAndSend): * UIProcess/API/qt/qquickurlschemedelegate_p.h: (QQuickQrcSchemeDelegate): * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebViewPrivate::initialize): (QQuickWebViewExperimental::schemeDelegates_Append): (QQuickWebViewExperimental::invokeApplicationSchemeHandler): * UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml: * UIProcess/API/qt/tests/qmltests/common/qrctest.html: Added. * UIProcess/API/qt/tests/qmltests/resources.qrc: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140676 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ia1cbd499ff9d1ca03373f6fb542d41f25231d656 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* [Qt][WK2] Fix painting on Mac with retina displayAndras Becsi2012-12-131-58/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=104574 Reviewed by Kenneth Rohde Christiansen. Since HiDPI support has been added and enabled in Qt we ended up painting incorrectly scaled content on high-resolution screens. Because the intrinsic device pixel ratio is always taken into account by Qt when painting to high-resolution screens we should automatically obtain the scale ratio from the window in which the item is rendered instead of setting it in QML. Qt does not make it possible to override the device pixel ratio of the native window, therefore our experimental QML API for setting a custom value is of no use any more and should be removed. This patch fixes the scaling issue on Mac retina display by querying the underlying window for the device scale factor and applying it to the backing store and the scene-graph rendering of the content node. Additionally removes the experimental API and related API tests. Change-Id: I04f23059147773ca279a89ae8976ccd3d9bef292 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137597 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Fixing Qt WebKit reference documentation.Jerome Pasion2012-12-131-0/+6
| | | | | | | | | | | | | | Fixes: -added \module for C++ classes and \qmlmodule for QML types -added links to the Qt WebKit Examples pages -fixed the qhp settings for Qt Creator Task-number: QTBUG-28583 Task-number: QTBUG-28418 Task-number: QTBUG-27646 Change-Id: I883139f51f457bd6dc7bfe72bb53eb26771d2ccb Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix links in Qt WebKit and Qt WebKit Widget documentationPaul Olav Tvete2012-12-041-1/+1
| | | | | Change-Id: Ibe7ef6bc1ea6ef42fce09fe6c4b6d64ac9ae2e9a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* [Qt][WK2] Do not override previously set flags of QQuickWebView when ↵Andras Becsi2012-12-041-1/+1
| | | | | | | | | | | | | | | enabling drag&drop https://bugs.webkit.org/show_bug.cgi?id=103901 Setting the specific flag instead of resetting all the flags when enabling QQuickItem::ItemAcceptsDrops. This fixes clipping of the contents of QQuickWebView visible in the flickrview example. Change-Id: I64695c5954a3b04d70f9b6da6b1a57b14d3cdbc0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Unreviewed, rolling out r136119.Simon Hausmann2012-12-041-0/+9
| | | | | | | | | | | | | | | http://trac.webkit.org/changeset/136119 https://bugs.webkit.org/show_bug.cgi?id=100964 We decided to restore previous default behaviour * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebViewFlickablePrivate::handleMouseEvent): * UIProcess/API/qt/qquickwebview_p_p.h: (QQuickWebViewFlickablePrivate): Change-Id: I8b8696e6de8f771a0985b487eb383115a5db6867 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Doc fixesPierre Rossi2012-12-031-1/+1
| | | | | | | Let's try to be compliant with the Qt5 approach. Change-Id: Ib5bc5500a6d8c916f4cc165b637eb493b7409bd0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 ↵Simon Hausmann2012-11-301-0/+1
| | | | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@136242) Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split Extra fixes will be cherry-picked. Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e ↵Simon Hausmann2012-11-291-9/+1
| | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@136119) New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 ↵Simon Hausmann2012-11-071-15/+15
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
* Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 ↵Simon Hausmann2012-10-221-1/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets
* Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 ↵Simon Hausmann2012-10-171-22/+25
| | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
* Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-161-25/+22
| | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :(
* Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-151-22/+25
| | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300) WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314
* Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 ↵Simon Hausmann2012-09-261-24/+10
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@129610) New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)
* Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d ↵Simon Hausmann2012-09-181-11/+7
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128886) New snapshot with various build fixes
* Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c ↵Simon Hausmann2012-09-111-0/+8
| | | | | | | (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future
* Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d ↵Simon Hausmann2012-09-101-50/+361
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot
* Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 ↵Simon Hausmann2012-08-211-0/+6
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@126147) New snapshot including various build fixes for newer Qt 5
* Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 ↵Simon Hausmann2012-08-121-63/+60
| | | | | | (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-1/+1
| | | | | | (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-0/+6
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@123308) New snapshot with better configure tests
* Imported WebKit commit 953baa67aa07087b6ecd4199351ec554c724e27d ↵Simon Hausmann2012-07-161-0/+32
| | | | (http://svn.webkit.org/repository/webkit/trunk@122676)
* Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc ↵Simon Hausmann2012-06-251-0/+17
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@121147) New snapshot that includes Win32 debug build fix (use SVGAllInOne)
* Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 ↵Simon Hausmann2012-06-201-15/+82
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes
View Lorry Controller Status