summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove WebAudio settingsAllan Sandfeld Jensen2016-05-027-33/+0
| | | | | | | | | In Chromium 51 WebAudio will be always on, and can not be runtime enabled or disabled. We should avoid introducing a setting we can not even support in the next version. Change-Id: I42f7d4f3f7f952f38361ef73dfe7b318ea1a4cf5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Disable extensions at compile timeAllan Sandfeld Jensen2016-04-292-2/+2
| | | | | | | We don't use extensions and can disable them. Change-Id: I2f1ff2a177cf60d229b599e8dffc4ee55b46b920 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Cleanup copyright and origin in src/coreAllan Sandfeld Jensen2016-04-297-1/+24
| | | | | | | | Adds copyright and origins to files in src/core based on Chrome sources. Change-Id: I842ce4c170bfeabe06d92fb67fef3d8f9a202ddc Task-number: QTBUG-53048 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Copyright cleanup in core/renderer sourcesAllan Sandfeld Jensen2016-04-297-3/+27
| | | | | | | | | Adds original copyright where it was missing and add origin sources, so we can better find and compare with the original. Change-Id: Id74da177325a55d98ac4487ff596f9b383012ea4 Task-number: QTBUG-53048 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Implement hooks for pepper isolated filesystemAllan Sandfeld Jensen2016-04-284-0/+236
| | | | | | | | This API is needed to support Netflix. Change-Id: I413a0e29e6be12fa5c70879c7127618665fc859c Task-number: QTBUG-52100 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* [OSX] Try and load the widevine plugin where Chrome looks for it.Alexandru Croitor2016-04-281-0/+11
| | | | | | | | | | Chrome usually installs the widevine plugin into the /Library/Application Support/Google/Chrome/WidevineCDM directory. Try and load it from that location, so it doesn't have to be specified on the command line. Change-Id: Idb14ae677112f16c853bdc5d1ae700a75a735ebf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-04-2831-119/+211
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-2531-119/+211
| |\ | | | | | | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
| | * 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>
* | | Add icon role to WebEngineHistoryListModelPeter Varga2016-04-263-4/+17
|/ / | | | | | | | | | | Change-Id: I64a46b810dda8654b8afbec2aeef2e180fbfcd23 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update ChromiumJoerg Bornemann2016-04-211-0/+0
| | | | | | | | | | | | | | | | Pulls in fix for generating MSVC debug information. Task-number: QTBUG-52283 Change-Id: I45a146a91860dd259ef5b1c2f487f75f41a60177 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Parse logging verbosity levelsAllan Sandfeld Jensen2016-04-211-10/+30
| | | | | | | | | | | | | | | | Call logging::InitLogging so arguments such as --v and --vmodule are parsed and used to configure chromium logging levels. Change-Id: I44f8ed6b0ca9db4d606ced383c269566218383ad Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add QQuickWebEngineFaviconProviderPeter Varga2016-04-209-7/+313
| | | | | | | | | | | | | | | | | | The new QQuickImageProvider subclass is used to access downloaded icons from the FaviconManager via the Quick API. Change-Id: I6a52d3c737b2260cf480167764a931915cd99cab Task-number: QTBUG-51179 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add comments to new ResourceType enumsKai Koehne2016-04-191-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51808 Change-Id: Ie612410b95cc13363bfca0b412deac3a7e65f687 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update spellchecker APIsMichal Klocek2016-04-1823-125/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * marks new properties in QQuickWebEngineProfile as FINAL * removes QT_NO_SPELLCHECK from API headers * renames spellCheckLanguages() to availableDictionaries() * removes "togle spellcheck" methods and actions * use WEBENGINE_CONFIG instead of CONFIG for disable the feature at compile time: WEBENGINE_CONFIG+=no_spellcheck Done-With: Peter Varga <pvarga@inf.u-szeged.hu> Task-number: QTBUG-52371 Change-Id: I8c8eff497b9e7afe0cec2edc97dec248151487f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-188-32/+54
|\| | | | | | | Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
| * 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>
* | Remove "Save Page" web action from the standard context menuJoerg Bornemann2016-04-132-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The SavePage web action is only useful if the user code reacts on the downloadRequested signal. Also, having SavePage available is not useful for e.g. hybrid applications. Extend the demobrowser example to show how to add the SavePage web action to the context menu. Change-Id: I979bcd9f5a25d2cae07ef819663afde17784440b Task-number: QTBUG-52370 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix ABI of QWebEnginePage::OpenLinkInNewBackgroundTabAllan Sandfeld Jensen2016-04-131-1/+1
| | | | | | | | | | | | | | | | New enums must be added in the bottom. Change-Id: I840381337088dbdea2b3c3ceb0f28fd09c3e64c4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
* | Fix merge duplicationAllan Sandfeld Jensen2016-04-131-1/+0
| | | | | | | | | | | | | | | | We already set sysroot to empty for all none cross_compile builds in the 5.7 branch. Change-Id: I99626694983c776f46d0e5daa9b1e39614266cb6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Move QQuickWebEngineContextMenuData to experimentalAllan Sandfeld Jensen2016-04-135-9/+9
| | | | | | | | | | | | | | | | | | We have no good way of using it in 5.7 as users can't replace context menus directly anyway. Instead we keep it as experimental until it is useful. Change-Id: I91ca0c210e190debdc62db8de9de2ebee0784d3b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove default values for printToPdf callbacks and unify API.Michael Bruning2016-04-135-8/+8
| | | | | | | | | | | | | | Adds default QPageLayout values. Change-Id: Ibf2964ecd86350a51d682e385973f830ac4347a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1Allan Sandfeld Jensen2016-04-1145-133/+522
|\ \
| * | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-1145-133/+522
| |\| | | | | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| | * 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>