summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
Commit message (Collapse)AuthorAgeFilesLines
* OSX: Fix QSurfaceFormat check to allow < 3.2 OpenGL profiles.Alexandru Croitor2016-03-311-4/+9
| | | | | | | | | | | | | | | | | | | Currently if a < 3.2 OpenGL Compatibility profile is requested on OSX, a webengine application would crash saying that the global profile does not match the default profile. That happens because in the Cocoa QPA any requested OpenGL Compatibility profile or Core profile with version smaller than 3.2 gets reset to QSurfaceFormat::NoProfile and version 2.1. Fix consists in making sure that the QSurfaceFormat check only considers Core profile with versions >= 3.2. All other combinations would result in NoProfile 2.1 and thus not cause any issues for webengine. Change-Id: I7c9866d761c052e52389022abe8e213d062db41f Task-number: QTBUG-51058 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Mark QWebEngineProfile::setRequestInterceptor as new in Qt 5.6Kai Koehne2016-03-311-0/+1
| | | | | Change-Id: I93f68098718d7f0303accabc9def49ff83e65ca2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Mention which settings properties are new in Qt 5.6Kai Koehne2016-03-311-2/+2
| | | | | Change-Id: Ic99ce79856fdc9a528b78f518c27013579bf38cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Fix documentation about cookie storesKai Koehne2016-03-291-1/+3
| | | | | | | | | | | | | Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Improve docs for the zoomFactor propertyLeena Miettinen2016-03-232-3/+7
| | | | | | | | In the WebEngineView type and QWebEnginePage and QWebEngineView docs. Change-Id: Ibbabcf6cc38a48fb14abb105f5fda4c03a89ccba Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-214-27/+51
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
| * Doc: Add information about framesLeena Miettinen2016-02-243-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Describe differences between Qt WebKit and Qt WebEngine in the porting guide - Replace references to frames with references to the view in the QWebEngineView docs - Describe frames in the QWebEnginePage class overview - Replace references to frames with references to pages where appropriate in the QWebEnginePage docs - Describe the "security origin" concept that is related to frame handling Change-Id: I8c952d507414058759537a6333649c37976c12e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Include the module prefix for the header filesv5.6.0-rc1Andy Shaw2016-02-151-3/+3
| | | | | | | | | | Change-Id: I81545b00dbfc94949dd5d8b2252c2230ca5d2601 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: Mark renderProcessTerminated signal as new in 5.6Kai Koehne2016-03-112-0/+3
| | | | | | | | | | | | Change-Id: I54a9514451c04918faf55516881c9ca720d56dc5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Improve web engine profile class descriptionsLeena Miettinen2016-02-291-6/+28
| | | | | | | | | | | | | | | | Add information about the most important methods and properties. Change-Id: I41ae039a0cc6084b62b492560def5eed7d8d3742 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Doc: State equivalent of setHtml more preciselyJoerg Bornemann2016-02-161-1/+2
| | | | | | | | | | | | | | | | | | Calling setContent with mimeType "text/html" does not use UTF-8 encoding. The character set must be specified. Change-Id: I67e3273afd0503b333e718e4706852d911fed2e4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-3/+5
|\| | | | | | | Change-Id: I74e27960437e76876b9ed214db18e77e9e82408c
| * Fix rendering with default OpenGL surface on LinuxJoerg Bornemann2016-02-121-3/+5
| | | | | | | | | | | | | | | | | | Commit 32929885 led to rendering blank pages in QWebEngineView. Set the OpenGL version only if the core profile is requested. Change-Id: Ie05c7804afbce26aee63455e27c23219484f535d Task-number: QTBUG-51032 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix WebAction muteAllan Sandfeld Jensen2016-02-131-1/+1
| | | | | | | | | | | | | | | | | | WebAction mute was not working since it was setting its current state instead of the toggling mute. Change-Id: I9572c77e084e11b00f645845764fe13e0a603664 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix double LoadFinished on URL errorsAllan Sandfeld Jensen2016-02-101-2/+10
|/ | | | | | | | | | | | | | | | | | RenderFrameDeleted was called before DidFinishLoad, which meant m_loadingErrorFrameList was empty and wouldn't detect the page loaded was an error page. Instead this patch relies on the chromium error-page url which we already asserted. Additonally we delay emitting the loadFinished signal until the error page is also done loading, since the error-page can be considered part of the load, and we otherwise have a race condition on toPlainText. Finally we were not getting error-pages when blocking requests because we reported them as aborted them instead of blocked. Change-Id: I945eb838b7f080d4e146f18354e8986e1b88b5cd Task-number: QTBUG-50752 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* OS X: Fix crash when setting a custom default QSurfaceFormat.Alexandru Croitor2016-02-041-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a new default QSurfaceFormat after QtWebEngineCore::initialize() is called, might lead to a crash. This happens when the new surface format has a different OpenGL profile, compared to the profile created by web engine in the RenderWidgetHostViewQtDelegateWidget constructor. The default constructed QSurfaceFormat has an OpenGL Compatibility profile. Inside the Cocoa platform plugin when a new shared OpenGL context is created, it fails to initialize the new context because of the difference in profiles, and thus ultimately creates an unshared context, which leads to a crash. Fix consists in using the shared context QSurfaceFormat in the RenderWidgetHostViewQtDelegateWidget constructor, and also printing a fatal warning to notify the developer only to set the new QSurfaceFormat before the application instance is declared. Bottom line, if the QSurfaceFormat OpenGL profile has to be changed, it should be done before QtWebEngineCore::initialize() is called. Doing so after initialize() is called, will lead to a crash. Change-Id: I8a07211b592143d736b001556b944d4759802396 Task-number: QTBUG-50665 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Doc: QWebEngineSettings::WebAttribute values provide no safety mechanismsLeena Miettinen2016-02-041-1/+8
| | | | | | Task-number: QTBUG-45556 Change-Id: Ifc39eba7f9e9324f180feeb0d99fef1434f97d64 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Prefix Markdown Editor example with "WebEngine"Kai Koehne2016-02-041-1/+1
| | | | | | | | | | Follow the example of the other examples, and always start with WebEngine. This makes also sure that Qt Creator attaches the 'webengine' tag to the example. Task-number: QTBUG-50582 Change-Id: If99ba9a23560abae61e4e2ef5a5b091b3c5473c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Fix build against Qt 5.5Allan Sandfeld Jensen2016-02-042-0/+4
| | | | | | | Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5 Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Preserve webchannel and userscripts when restoring historyAllan Sandfeld Jensen2016-01-314-2/+27
| | | | | | | | | | | Most page-state is set in webcontentsadapter::initialize except user scripts and webchannel. This patch ensures those are initialized too when changing to a new adapter during history restore. Change-Id: I4dca23ddab50480b1a72252a038834ce1802ad77 Task-number: QTBUG-50751 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: David Rosca <nowrep@gmail.com>
* Fix crash on open link in new windowJoerg Bornemann2016-01-281-1/+3
| | | | | | | | | The default implementation of QWebEngineView::createWindow returns a null pointer. Add missing null pointer check in adoptNewWindow. Change-Id: Ia6138f372ff169b9d32764b15550939adc247a1c Task-number: QTBUG-50718 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: warn about heavy routines blocking content renderingLeena Miettinen2016-01-201-0/+3
| | | | | | Task-number: QTBUG-50092 Change-Id: I1f3bbcab3b1999b9ecc86660ff9fef8330775cb4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Widgets: Add example names to documentationSzabolcs David2016-01-191-2/+2
| | | | | Change-Id: I73f6e944e3a64b948b86882e951f85593fdb800f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Widgets: Improve geometryChangeRequested signalSzabolcs David2016-01-192-0/+7
| | | | | | | | | Use this signal to notify the user on JavaScript window move/resize requests. It works only for windows opened by JavaScript (according to the Chromium browser's behavior). Change-Id: I7fdeda4c252cc4badb36b74ed61d947be690f45a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: link capturing methodsLeena Miettinen2016-01-192-1/+17
| | | | | | Task-number: QTBUG-48435 Change-Id: If7117ecb11a0f06df1204dc91757a29c5444e189 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2016-01-181-21/+35
|\ | | | | | | Change-Id: I591be7a7131d85a269bf12fbd5c47a0ccf6ce574
| * Update license header for qwebenginepage.cpp to LGPLv3Joerg Bornemann2016-01-141-21/+35
| | | | | | | | | | | | | | This amends commit 3b4eec9b. Change-Id: I19e8a295fa7e64ff83c26b6965097bd0ae3cbf73 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-0/+24
|\| | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
| * Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-222-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | When opening a new tab by middle clicking on a link in a web page, two MouseMove events are sent to Chromium consecutively, without getting proper acknowledgment events, which causes further move events not to be handled properly. Fix consists in preventing the second move event from being sent. Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9 Task-number: QTBUG-50031 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: certificate management in Qt WebEngineLeena Miettinen2016-01-051-1/+2
| | | | | | | | | | | | Task-number: QTBUG-49987 Change-Id: I04440144566d7a0caf36f6eaf3b724a02cf58205 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: add info about unavailable API from the wikiLeena Miettinen2015-12-181-1/+7
| | | | | | | | | | | | | | https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine Change-Id: Ic28e2140ca1dd9643d68a0a21bdd30317b70e282 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Move WebEngine initialization to core libraryAllan Sandfeld Jensen2015-12-152-3/+7
| | | | | | | | | | | | | | | | This means QtWebEngineWidgets no longer needs to depend on and link to the QML API. Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-091-0/+6
|\| | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| * Fix incorrect device pixel ratio used on startup.Alexandru Croitor2015-12-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Report the correct device pixel ratio to Chromium, when the QOpenGLWidget gets initialized. The initial value on startup is incorrect, because Chromium tries to query the screen information, before a relevant QWindow handle can be returned, and thus defaults to 1.0f. Change-Id: Ibbedd7b2915840f9716340e582aedbc13406f11a Task-number: QTBUG-49727 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Make the MIME-type of downloads availableAllan Sandfeld Jensen2015-12-074-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An application currently have to rely on suggested filename only to guess the type of a download. This is often insufficient when the suffix is misleading or missing. This patch adds the mimetype to the reported metadata and also adds a mimetype appropriate suffix to suggested filenames. Task-number: QTBUG-48206 Change-Id: I4c70f076d6eb5ae820fd6b7f568515eeb7c18df5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit the porting instructionsLeena Miettinen2015-12-021-20/+19
| | | | | | | | | | | | | | | | Follow the Qt documentation guidelines and fix some grammar issues. Change-Id: I1e708a2089b112aa079871b19698f71f0d3e85c3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Rename QWebEngineCookieStoreClient to QWebEngineCookieStoreMichal Klocek2015-12-012-6/+6
| | | | | | | | | | Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rename url scheme handler's destroyed signalAllan Sandfeld Jensen2015-12-011-3/+3
| | | | | | | | | | | | | | | | Make the signal distinct from the QObject destroyed signal and make sure it is not documented and follows private signal naming. Change-Id: If10a6e7fcee5e9ea4d3ed12ddb8e6ff3f1170adc Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: document QWebEngineHistoryItem::swap methodLeena Miettinen2015-12-011-0/+5
| | | | | | | | | | Change-Id: Ie8c6e4d9887d5169037e580db8a91c102009df5e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Doc: make docs for QWebEnginePage::requestedUrl clearerLeena Miettinen2015-12-011-2/+4
| | | | | | | | | | | | | | Task-number: QTBUG-49500 Change-Id: Ibeafae52ae523a526c912ef3e40f6d69da7b13bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kati Kankaanpaa <kati.kankaanpaa@theqtcompany.com>
* | use Q_ENUM instead of Q_ENUMSJoerg Bornemann2015-11-161-1/+1
| | | | | | | | | | | | | | | | This makes the enum values available as strings in qDebug, QCOMPARE and such. Change-Id: Id57a2002451337fcc8aedac673f834445913895c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Make QWebEngineFullScreenRequest const correctKai Koehne2015-11-124-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | Let QWebEngineFullScreenRequest be logically const-correct. It feels weird to be allowed to call "accept()" or "reject()" on a constant object. Also allow the user to copy the request, but check whether the page is still valid in the implementations of accept(), reject(). Change-Id: Ibf139a126734fc8e2db68ec26dc8f24cd4438942 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add documentation about console loggingKai Koehne2015-11-061-0/+2
| | | | | | | | | | Change-Id: I50ae0beb54f70c232eed0d9bd47b0dc01dadc130 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Print JS console messages by defaultKai Koehne2015-11-062-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of QWebEnginePage/WebEngineView to print JavaScript console.warn and console.error messages by default in a 'js' logging category. This matches also the behavior for QtQml, where console messages end up in a 'qml' logging category by default. So far access to the JavaScript console required either use of the remote debugging functionality, subclassing of QWebEnginePage, or implementing a custom handler. Anyhow, even then writing a seamless forwarding of the data and metadata to the Qt message handler is difficult. This patches implements this forwarding by default. The behavior can be changed by either setting up rules for the 'js' category, e.g. setFilterRules("js.*=false"); or by implementing onJavaScriptConsoleMessage(), or overriding QWebEnginePage::javaScriptConsoleMessage. [ChangeLog] Unhandled JS console messages are now forwarded to to the Qt message handler inside a 'js' category. Change-Id: I5480383a80dcf7a122496f9b7915264ef9036db3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Ensure WebContents::WasShown/WasHidden are calledAllan Sandfeld Jensen2015-11-066-2/+41
| | | | | | | | | | | | | | | | | | Forward WebEngineView visibility to WebContents visibility, and call WebContentsView visibiliy on actual show/hide events to avoid a recursion when WebContents visbility triggers it. Change-Id: I0c336359fb35bf93874aa1092767177d7a5ce341 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Improve documentation for QWebEngineScriptKai Koehne2015-11-054-4/+18
| | | | | | | | | | Change-Id: I9274a3cacaa04529152a5d827c47cf6fc831df19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-041-2/+1
|\| | | | | | | Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
| * Do not display context menu when pending event flag is false.Michael Bruning2015-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | When an event filter is installed on the view, the right mouse click event may trigger Chromium to request a context menu even though the context menu events get filtered out. Removes a Q_ASSERT that would now never be triggered. Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06 Task-number: QTBUG-49092 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Properly mark value based classesKai Koehne2015-11-022-1/+5
| | | | | | | | | | | | | | Change-Id: I937ce0daf2fa73d7179a5f62585abfb1acea7264 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-1/+1
|\| | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 05:51:42 +0000