summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-215-2/+70
| | | | | | | | | | | | | 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>
* Add tst_settings.qml QML test caseAdam Kallai2016-04-203-0/+131
| | | | | | | | | - Add test for localStorageEnabled setting. - Add test for javascriptEnabled setting. Change-Id: I7a67c24bdf76409148e88500d9a7a092f7896493 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@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>
* demobrowser: Fix precision of progress bar renderingJoerg Bornemann2016-04-201-1/+1
| | | | | | | The progress bar never reached the 100% mark. Change-Id: Id87bdb27f882d0d77ed0ad590e2c2278ce6fba92 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* 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-192-0/+30
| | | | | | | | 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>
* SimpleBrowser: Fix loading iconKai Koehne2016-04-151-1/+1
| | | | | Change-Id: I008b649b43069978b6ce19b2faf5a557dd67c756 Reviewed-by: Michal Klocek <michal.klocek@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>
* Demobrowser: Fix black screen after exiting fullscreen mode on OS X.Alexandru Croitor2016-04-151-3/+6
| | | | | | | | | | | | | | | | | | | | When exiting fullscreen while viewing a full screen video, the video is replaced with a black screen, and does not switch back to the initial page. This happens when hide() is called on a native window while being in fullscreen, which hides the window, but does not exit full screen mode, thus showing a black screen. The workaround fix consists of two parts: 1) Make sure to delete the fullscreen window object, to release the OS virtual screen it occupies (visible in mission control as a black rectangle). 2) Hide and show the main page window, to force exit fullscreen mode. Change-Id: I364d4427e84957ed97f57a14e2cfc2c95aed6f48 Task-number: QTBUG-52058 Reviewed-by: Kai Koehne <kai.koehne@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>
* Un-blacklist qwebengineaccessibility autotestJoerg Bornemann2016-04-051-6/+0
| | | | | | | The test passes now. Change-Id: Ifc96c995036759d554938dbbc80ca05a5680d496 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-013-5/+8
| | | | | | | | | | | | | | | | | | | | | 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-318-1/+224
| | | | | | 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>
* Blacklist tst_QQuickWebEngineView::transparentWebEngineViewsJoerg Bornemann2016-03-311-0/+2
| | | | | | | | This test is failing on 32 bit Windows. Unfortunately, we couldn't reproduce the failure locally yet. Blacklist the test for now. Change-Id: I7bdbc52033ccc0ed16ccf934418cc56a7783f88b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* OSX: Fix QSurfaceFormat check to allow < 3.2 OpenGL profiles.Alexandru Croitor2016-03-312-8/+18
| | | | | | | | | | | | | | | | | | | 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>
* Fix QtWebEngineProcess not being found after macdeployqt is used.Alexandru Croitor2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently on OSX, two Info.plist files are generated and copied to the QtWebEngineCore framework, one into Contents/Info.plist and another into Resources/Info.plist. The first one is generated by core_headers.pro and the second by core_module.pro. OS X frameworks only use the plist found in the Resources directory, and the Contents one was generated by qmake erroneously, assuming that core_headers is an application, rather than a framework. When macdeployqt is used with -always-overwrite option, it copies Contents/Info.plist (which contained an incorrect bundle id) over to Resources/Info.plist, and afterwards when an application is executed, it cannot find the plist file because it contains the the wrong CFBundleIdentifier, thus not being able to find the QtWebEngineProcess. Fix consists in making sure code_headers.pro does not generate an Info.plist, and just use the one generated by core_module.pro. Change-Id: I6295bde3b1d1771ed45f3a2fdff9fc60577f2ab6 Task-number: QTBUG-51939 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Purge sRGB chunks from PNGs in test.Edward Welbourne2016-03-301-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I0fe8ea5a1c89d5c9c0dce765607e55ae9e9cf9fd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Fix documentation about cookie storesKai Koehne2016-03-294-3/+8
| | | | | | | | | | | | | 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>
* Move loadVisuallyCommitted signal to the test support APISzabolcs David2016-03-256-5/+30
| | | | | Change-Id: I877bbd8bc5c710370f135a27bcd7f0f7c95a7292 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Restructure paragraph about loading pagesLeena Miettinen2016-03-241-3/+2
| | | | | | | | Describe the "loading" property first and remove the "LoadStatus" enumeration. Change-Id: I2357c604197c305e9cd2d3ff7dd322949b1b9e4b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>