summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Reset the selected text of a page when setHtml is called.Alexandru Croitor2016-05-031-0/+1
| | | | | | | | | | | | | | | When text is selected inside a QWebEngineView, the selection is stored in a RenderWidgetHostViewBase instance. When QWebEngineView::setHtml is called, the stored selection is not cleared, and thus requesting for the selected text will return stale data that is not present in the page anymore. Fix consists in calling WebContentsImpl::Unselect() after the new html is loaded and focused in WebContentsAdapter::setContent(). Change-Id: Idd0f3187f324863b9a805af6a288dccfcbd5566f Task-number: QTBUG-53033 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix QtWebEngineCore::initialize() for Qt < 5.6.1Joerg Bornemann2016-05-021-0/+2
| | | | | | | | | | | | | | | In Qt versions < 5.6.1 the constructor of QCoreApplication directly calls QCoreApplication::init and QtWebEngineCore::initialize() in turn. That means that qobject_cast<QGuiApplication*> cannot work, because the object is not fully constructed yet. This was fixed for Qt 5.6.1 in commit qtbase/1b441c39. This patch turns off the fix for QTBUG-51789 when building QtWebEngine against Qt versions older than 5.6.1. Task-number: QTBUG-51789 Change-Id: I092fb559ea4449bd443737d5962b4b87dee88cdd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update chromiumJoerg Bornemann2016-04-281-0/+0
| | | | | | | | Pulls in fix for race condition in URLRequestRedirectJob. Task-number: QTBUG-52200 Change-Id: I43b822c87501e28ff3cd4a71513ec79712b726c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Never call QtWebEngine::initialize from DllMainCorentin Jabot2016-04-282-6/+16
| | | | | | | | | | | | | | | | | On windows, calling QtWebEngine::initialize from DllMain may crash, depending on what QPA backend is used. We make sure to only add a qAddPreRoutine initializing QtWebEngine if there is no instance of QCoreApplication. By doing so, we support linking to QtWebEngineWidget from a plugin, while still initializing the WebEngine automatically when linked to the main application binary. Task-number: QTBUG-46720 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> (cherry picked from commit 6a8d99ab00ace2084820547572dc05ac8ad2bc5a) Change-Id: Id3b2c1e21e01808cef124f8ece6b247b1ba613cb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Avoid default casesAllan Sandfeld Jensen2016-04-281-9/+10
| | | | | | | | | Prefer to list all enums to handling defaults, this makes it easier to catch missing cases in the future. Change-Id: Idae2f445bd907f62202a6b68da0d030e21863afe Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix hint to use WEBENGINE_CONFIG+=Kai Koehne2016-04-281-1/+1
| | | | | | | At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add missing icon and text for ReloadAndBypassCacheAllan Sandfeld Jensen2016-04-271-0/+4
| | | | | | | We were not handling this enum value. Change-Id: Ib44b9e42c8b9589513091d2f47c79623416ec358 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update ChromiumKai Koehne2016-04-251-0/+0
| | | | | | | | | 619d606 Fix Linux kernel lacking V4L2_CID_POWER_LINE_FREQUENCY_AUTO 91e1486 Fix Linux kernel lacking v4l2 multi-planar support Task-number: QTBUG-48298 Change-Id: I3fac1dcb04ecc17cdafccbe9add30d446641c83e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix regenerating job-factoryAllan Sandfeld Jensen2016-04-222-6/+34
| | | | | | | | | | | Only update installed custom url scheme handlers, and leave the rest of the job factory untouched, so we don't delete the protocol handlers and request interceptors Chromium passed us, and that are now owned by the job-factory. Change-Id: I640527487dda053463f8fa9986ceb47941593f2b Task-number: QTBUG-52790 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Cleanup and comment URLRequestContextGetterQtAllan Sandfeld Jensen2016-04-212-11/+17
| | | | | | | | | | | Add comments to parts of URLRequestContextGetterQt that are subtle and I already forgot once. Also adds another update atomic to match the rest. Change-Id: I8193247ce76435ac0d169b740a4543099b3ffac2 Task-number: QTBUG-52790 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Do not access browser-context to read user-agent or accept languageAllan Sandfeld Jensen2016-04-212-21/+16
| | | | | | | | | | | | Switches HttpUserAgentSettingsQt to reading local string that lives on the IO thread, instead of accessing a pointer that may be deleted. Also adds a test and fixes updating accept-language of already initialized WebContents. Change-Id: Iff4e3bd1ac40482a92bed50c3f703ed8b974b0ad Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Fix saving cookiesMichal Klocek2016-04-211-0/+1
| | | | | | | | | | Release CookieStore in URLRequestContextGetterQt destructor, this will eventually delete CookieMonsterDelegateQt and trigger commit of cookies in cookie store backend. Task-bumber: QTBUG-52121 Change-Id: Ic83c7ee3ece1c64ac9e47cba5dcf40e084d9c3dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Improve WebEngineHistoryListModel documentationKai Koehne2016-04-211-6/+3
| | | | | | | Change-Id: Ica5adc508113678747c20a9807ad09eaae79ccb1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix crash when instantiating a QCoreApplicationJoerg Bornemann2016-04-211-1/+5
| | | | | | | | | | | | When linking against QtWebEngineWidgets, a Q_COREAPP_STARTUP_FUNCTION is installed, which is then called from QCoreApplication::init. In that function, check whether qApp is a QGuiApplication or derivative before calling QtWebEngineCore::initialize. Change-Id: I16a3cdda2c707040ad3707a83a192fcb9059ddc4 Task-number: QTBUG-51789 Task-number: QTBUG-52539 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* Fix copying images to clipboardJoerg Bornemann2016-04-214-2/+120
| | | | | | | | | | | | The SkBitmap to QImage conversion in ClipboardQt::WriteBitmap was hardcoding the image format to ARGB32. This failed whenever the format of the SkBitmap provided by Chromium was different. This change backports 1cf9175e from 5.7. Task-number: QTBUG-52715 Change-Id: Icf27b97bc421a2201c307a4514928dcf384d9ba6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Use the temporary zoom factor to set the zoom factorMichael Bruning2016-04-213-2/+24
| | | | | | | | | | | | | It turns out that using the temporary zoom factor is meant to set the zoom factor for one certain view, and this is actually what we want. Also added auto tests for this. Task-number: QTBUG-51851 Task-number: QTBUG-51969 Change-Id: I8912cbc25637d3c1681026380a2ab3068a964868 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Remove direct access BrowserContextAdapter's customUrlSchemeHandlersAllan Sandfeld Jensen2016-04-204-11/+11
| | | | | | | | Remove the non-const reference access to customUrlSchemeHandlers, and replace the last remaining use-case with clearCustomUrlSchemeHandlers. Change-Id: If9077e3900593d7f9520fb9bbcef2f1aa3307eac Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Improve thread-safety of custom scheme handlersAllan Sandfeld Jensen2016-04-208-22/+51
| | | | | | | | | Avoids accessing the QWebEngineUrlSchemeHandler from any other thread than the UI thread, since it may be deleted at any time on the UI thread. Change-Id: Icb4331b3c36f6f619a9fd975d155a9fd608dc5e9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove unused BrowserContextAdapter handlesKai Koehne2016-04-205-11/+7
| | | | | Change-Id: Ic3504db1b55e1ff4375efacb450a96ce32a119ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix user-agent override works when setting contentAllan Sandfeld Jensen2016-04-191-0/+1
| | | | | | | | Adds test for user-agent override and fixes the override so that it also works when loading with content instead of URLs. Change-Id: I3f61b1d91b7b0908e35216722054168d1c514a87 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Switch BrowserContextAdapter to QSharedPointerAllan Sandfeld Jensen2016-04-1917-36/+39
| | | | | | | | | | | | BrowserContextAdapter is not a form of shared data, and using QExplicitSharedDataPointer on it as always been a misuse of the class. Instead we should switch it to QSharedPointer, which also allows us to use QWeakPointer. Change-Id: I8eb489b4a12d3fdddcde55821be294814a156a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Doc: Fix typo on WebEngineHistoryListModel documentationKai Koehne2016-04-191-1/+1
| | | | | Change-Id: If20959319ab8fb1ff7281bba6a1dfcfaabcc1989 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Assert thread assumptionsAllan Sandfeld Jensen2016-04-191-0/+10
| | | | | | | Assert and thereby also document thread assumptions. Change-Id: I44cd8b015ed8a6e38b9328f334f55d9d2f72b50d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-04-181-0/+0
| | | | | | | Pulls in update that makes remote inspector compatible with Chrome 50+ Change-Id: I5e5db318228fa77c650f058fc834568c1d5bb6ad Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Install all resources for developer build in .pro fileKai Koehne2016-04-152-26/+8
| | | | | | | | | | ICU .dat file and .pak files were already copied to the developer build directory in core_module.pro. Let's do the same for translations, and remove the logic handling this in resources.gyp. Change-Id: I4926cd6012f2664feed27aa042eb3ceb282a93d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-04-151-0/+0
| | | | | | | Pulls in security fixes from Chromium 50 Change-Id: I46f331fd37b17366231469c1b5aa2df9bea75291 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix crash while settingPersistentStoragePathMichal Klocek2016-04-131-1/+4
| | | | | | | | | | Get rid of dangling pointer on storage removal in URLRequestContextGetterQt. This is accessed later in generateHttpCache. Task-number: QTBUG-52468 Change-Id: I03c0b3186b01046e17258af838bf5f9adc435da0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix compilation error with missing includeKai Koehne2016-04-111-0/+2
| | | | | | | | | I could not reproduce the issue, nor the CI. Anyhow, it doesn't hurt to include the header explicitly, instead of relying on indirect includes. Task-number: QTBUG-52460 Change-Id: I78d04f3af853aa5951cdfc066089f06f71f72988 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Mark WebEngineSettings::defaultTextEncoding as new in 1.2Kai Koehne2016-04-111-0/+1
| | | | | Change-Id: Iee69fd2b033cfe09d5347e8502812632d1309b19 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Avoid crashing if WebContext is accessed before initializedAllan Sandfeld Jensen2016-04-111-4/+19
| | | | | | | | | While it is better to use the global shared OpenGL context, we can fall back to using the module type which is usually correct. Change-Id: I441bfdc38db593abfd10cb08ba90af09dcd31a2a Task-number: QTBUG-51379 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Still send navigation request signal on non-blocking interceptAllan Sandfeld Jensen2016-04-111-1/+2
| | | | | | | | | | If a URL interceptor changes the request but doesn't block it, we currently do not send the navigation requested signal to the API layer. Instead continue as normal when not blocking. Change-Id: Ida6aad5767fcaef58093c50aa3932092334f499c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: initializing web engine when running it as a pluginLeena Miettinen2016-04-111-0/+18
| | | | | Change-Id: I27981327fb563fdd6697352582c2cbc99b173ccc Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update ChromiumJoerg Bornemann2016-04-071-0/+0
| | | | | | | | Pulls in build fix for MSVC 2015 Update 2. Task-number: QTBUG-52367 Change-Id: I57f17388b280eb79397cbba3e6b1b546d30be096 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Revision DownloadItem.mimeTypeKai Koehne2016-04-051-0/+1
| | | | | | | | The property was already revisioned, but the signal was not. Also mark the property as new in the documentation. Change-Id: Iab50bea0d593e9dafb3e58b7f99dd5b95655a1a9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Register qrc as local after blink initialization.Michael Brüning2016-04-052-3/+20
| | | | | | | | | | | | | It is needed to let local content access the qrc resources by making them part of the same security origin. This is stated in the docs as the default behavior. This also backports change f7d343000d77c80f34a115fe9c78f101929292b1 from 5.7, which fixed some race condition with the qrc registration. Task-number: QTBUG-52085 Change-Id: Ia704fa6dbce8529f82695ab543244020cb9f8b8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-04-051-0/+0
| | | | | | | Pulls in security fixes from Chromium 49.0.2623.108 Change-Id: Icb318aa21772eecb4b39f2bbe92ccdc0f020aee3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: WebEngine does not support Chromium extensionsLeena Miettinen2016-04-053-0/+6
| | | | | | | For example, @include, @match, and @exclude. Change-Id: I16d29b4e72452980e43c8e7c5702e21cccf159d5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add missing revision tag to the mimeTypeChanged signalAdam Kallai2016-04-051-1/+1
| | | | | | | | The mimeType property of the WebEngingeDownloadIten is tagged for REVISION 1 so the related signal should be tagged for REVISION 1 as well. Change-Id: I918de55c81779424011e42c358d5c7aeed2909ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Implement CheckMediaAccessPermissionAllan Sandfeld Jensen2016-04-057-0/+35
| | | | | | | | | | | Fixes access of label of MediaStream tracks Also fixes the logged error: WebContentsDelegate::CheckMediaAccessPermission: Not supported. Change-Id: I3fee9ccd9e8b2e5cbd6b707336cc61425a44ba31 Task-number: QTBUG-52216 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix trying to open multiple windows if not supportedGiulio Camuffo2016-04-051-1/+3
| | | | | | | | We shouldn't special case some platform integration names, instead check if it supports the proper capabilities Change-Id: Ib8a28a974a4054cea4fbfb503be7c0e0f797e242 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Replace "web engine script" with class and type namesLeena Miettinen2016-04-051-2/+3
| | | | | Change-Id: I644475dc966b9a0a13bba242b653d2bc2357f24b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix typo in the folder name of the cookiesSzabolcs David2016-04-031-2/+7
| | | | | Change-Id: I9e1acaa0dbd31978730dae33ebb517f467f8df49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Link Pepper plugin platform information to respective settingsKai Koehne2016-04-033-5/+10
| | | | | Change-Id: I1bd0c58a0cee3933370238841c12cf0c1d965c93 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Add docs for QWebEngineFullScreenRequest classLeena Miettinen2016-04-031-0/+64
| | | | | | Change-Id: I40706d93348c868f7572fa4c0485f0babf98a06e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix crashes due to qputenv being called after Chromium initialization.Alexandru Croitor2016-04-012-3/+6
| | | | | | | | | | | | | | | | | The qputenv() call inside gl_surface_qt.cpp, which is executed on a GpuChildThread, can reallocate the process environment structure, and it is possible that at the same time the main thread calls getenv, which will dereference a pointer to the freed environment structure, essentially causing a use-after-free crash. Make sure the qputenv() call happens before Chromium initialization starts, so no thread-race can occur. Change-Id: I4ecbdc8bf2abbe45f7d6c5d2633dc9fe27f51e66 Task-number: QTBUG-52124 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> (cherry picked from commit 76c61aa1400ef2def204c3732e30e08e40631e8d)
* Use system NSS only for certificate handlingKai Koehne2016-04-012-3/+6
| | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Avoid triggering extra urlChanged signalAdam Kallai2016-04-012-0/+15
| | | | | | | | | | | | | | | | | Chromium usually clears the pending entry when it fails, so that an arbitrary URL is not left visible above a committed page. However, it does preserve the pending entry in some cases, such as on the initial navigation of an unmodified blank tab. So in other cases Chromium clears the pending entry (if the navigation is not in progress), and it does force the UI (URL bar) to refresh. In our case we allow failed URLs to stick around in the URL bar but only when alternate error pages are used. Change-Id: I26e81e7a99415aa184880dcb647a06d977584119 Task-number: QTBUG-48995 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add a Qt Designer plugin for QWebEngineView.Friedemann Kleint2016-03-317-1/+223
| | | | | | Task-number: QTBUG-52104 Change-Id: Icf8b4eea7fc52498b2ce9a2c04da6a24e8bdb070 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix Windows build when response files for moc are generatedJoerg Bornemann2016-03-311-0/+3
| | | | | | | | | | | | | | moc.prf contains magic (translation: weird heuristics) to determine if the moc command line would exceed the command line length limit on Windows. If such an excess is detected a response file is created in MOC_DIR. As our build directory is not qmake's default one, moc calls will not find the response file. Set MOC_DIR accordingly to generate the reponse file in the right location. Task-number: QTBUG-51847 Change-Id: Id0695451a986cd9514a7c965c6d33c5c3ef800cd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix CommandLine initialization on WindowsJoerg Bornemann2016-03-312-7/+20
| | | | | | | | | | | | Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>