summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix debug-only build on WindowsJoerg Bornemann2016-05-091-1/+1
| | | | | | | | | | Do not attempt to build the release version of QtWebEngineProcess if Qt is not configured for release. Task-number: QTBUG-53240 Change-Id: Iff52a5049b3eefdd52c405fb80095a4d53c55fba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-0914-116/+315
|\ | | | | | | Change-Id: I2843a633721212850db77c772caf24e0ea82b450
| * Doc: Add build requirements on supported platformsLeena Miettinen2016-05-061-4/+56
| | | | | | | | | | | | Task-number: QTBUG-52733 Change-Id: Id0806db78fd7a87cc78c6b284c2249a7ad203b7b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Quick fix for not working history in demobrowserMichal Klocek2016-05-044-50/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of history manager seems to be not straight forward. To display history we use QList to keep history items plus model adapter in form of HistoryModel (QAbstractTableModel) plus HistoryFilterModel to avoid duplication, plus HistoryTreeModel to make a tree view with split for dates, plus TreeProxyModel on top to enable sorting. This approach unfortunately falls apart when items should be deleted from the model by treeView. This ends badly with corrupted cached values. This fix removes history items using history manager. It also abandons HistoryTreeModel since frequent sourceReset calls make it unusable. If split for dates it desired the better approach would be to implement history tree model already at HistoryManager level to avoid unmaintainable code. Task-number: QTBUG-49913 Task-number: QTBUG-50255 Change-Id: Ic9cebb52b623bd453119e11b5e907eaa90609e34 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix memory leak of standardContextMenuMichal Klocek2016-05-041-0/+1
| | | | | | | | | | | | | | Add deleteLater after menu is hidden. Change-Id: I7bf7f5e83b40328e220a1ff91f07055c160b6ab9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2016-05-041-0/+0
| | | | | | | | | | | | | | Pulls in security patches from Chromium 50.0.2661.94 Change-Id: Idd71e08fe60d79074fca956d47522d708c5c2640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * [Demobrowser] Fix command line option parsing.Alexandru Croitor2016-05-042-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in iterating through the command line arguments, until a non-option argument is found (doesn't start with a dash), and use that as the startup URL. Change-Id: Ibe2946b25b2e023c094a85e50d2ccbd5bfce2977 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix threading issues with URLRequestContextAllan Sandfeld Jensen2016-05-034-53/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequestContextGetterQt contains data which is shared between UI and IO thread. Make the class more thread friendly by making copies of the data that can be accessed from the IO thread, and protect synchronization with a full mutex instead of atomics. Also fixes circular reference between URLRequestContextGetterQt and BrowserContextAdapter. Task-number: QTBUG-50160 Task-number: QTBUG-52509 Change-Id: Idaba211533cfad229e1d1872cdfdf4e7dffeb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * 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>
* | Remove spellchecking supportMichal Klocek2016-05-0613-259/+5
| | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add spellcheck autotestMichal Klocek2016-05-067-0/+262
| | | | | | | | | | | | | | Skip test on osx for now. Change-Id: I8f748d00da54fd5b7217b08a18e7a58d31cb898c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Adds qwebengine_convert_dict toolMichal Klocek2016-05-064-1/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a tool which converts hunspell 'dic' dictionaries to binary 'bdic' format, which is required by spellchecker in chromium. Tool is compiled as a qt console application. It reuses linking information produced by gyp. This tool cannot be used in cross-builds due to limitations of the gyp-based build system. Change-Id: Ibee8cbc6048b522c0e4fe22b21c91c649c8515bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use empty default values in spellcheck initMichal Klocek2016-05-041-6/+3
| | | | | | | | | | | | | | | | | | Using default value in kSpellCheckDictionary ends up in migrating preferences from single-language to multi-language schema. Default values can be set on application start. Change-Id: I59e3667bcf57a859f1b18f389c1c44c81fc82651 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Document how dictionaries are loadedMichal Klocek2016-05-042-0/+31
| | | | | | | | | | Change-Id: I366e35b6de0a46be648de3130eb7d8585fc1a694 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove warnings about missing dictionariesMichal Klocek2016-05-041-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Current logic of setting resource paths will always complain about missing dictionaries see QTBUG-52682. Remove warnings so now only SpellcheckService warns about missing or corrupted dictionary on lazy load. Use only one global and one local search path. Task-number: QTBUG-52506 Change-Id: I33b613ea8c0a7533f51742e6c155c6ee2c8ceda1 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-045-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: How recentlyAudibleChanged and setMuted interactLeena Miettinen2016-05-041-2/+16
| | | | | | | | | | | | | | Task-number: QTBUG-52971 Change-Id: Iae1501a49f57a140eaedb0ca446aacc67f207c9e Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Combine candidate icons for a page into a single iconPeter Varga2016-05-0416-56/+208
| | | | | | | | | | | | | | | | | | | | | | | | For the Widget API the QIcon returned by QWebEnginePage::icon() function contains all the candidate icons for the current page. For the Quick API the QQuickWebEngineFaviconProvider provides the best quality icon for the requested size from the candidates. Task-number: QTBUG-51179 Change-Id: I42b8427f957e2f2fc745dd0111bedcc71b577216 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove availableDictionaries from spellcheck apiMichal Klocek2016-05-047-68/+7
| | | | | | | | | | | | | | | | | | | | | | This method is broken, since SpellcheckerService is lazily initialized and dictionaries might be not loaded yet. Moreover there is a missing implementation on mac. Instead log warning when SpellcheckService can not load dictionary. Change-Id: Ifa2e769d83307543fa6cdf529475e9ab980022f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update ChromiumMichal Klocek2016-05-041-0/+0
| | | | | | | | | | Change-Id: I1fef30dbfe056743f21e398c547fd962856ef7e6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Get additional sanitizer dependencies from upstream chromium.Alexandru Croitor2016-05-033-37/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buildtools directory contains custom libc++ libraries, which are a second-level git submodule (the first-level being the buildtools submodule, and the supermodule being chromium itself). The init_repository.py script does not support checking out submodules recursively, thus leading to the mentioned libraries being skipped. This change adds a hardcoded addition to make sure the buildtools submodules are checked out when init_repository is run, as well as support for copying all nested files in the submodule tree, when the take_snapshot script is executed. Thus it copies all necessary sanitizer dependencies. Change-Id: Icb5cf5b52c3d0a83c4690fb7d641cee4f5dc1132 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Cleanup license leftoversMichal Klocek2016-05-039-129/+204
| | | | | | | | | | Change-Id: Ie0ecb1808c6b6a689ef29d7fa4831ca0a2e92721 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Revert "Fix unexpected passes in tst_QWebEnginePage."Alexandru Croitor2016-05-031-0/+2
| | | | | | | | | | | | | | | | The test passes in 5.6, but not in 5.7. This reverts commit fe84829aeb3ba19b74935198dbcbd6f5c67915b3. Change-Id: I204c2d80b80e7c33d573963fd4366e4613ceb789 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-05-034-15/+18
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-294-15/+18
| |\| | | | | | | | | | Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
| | * 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-282-4/+4
| | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix unexpected passes in tst_QWebEnginePage::setHtmlWithImageResource.Alexandru Croitor2016-04-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting a local file resource without a baseUrl set, should not be allowed. This hasn't worked before in Webkit, so the checks were marked with QEXPECT_FAIL. Remove these, as the issue has been fixed, and now causes unexpected passes. Change-Id: I7d38692a9961651d48abe28218d7ee022a85f101 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>
* | | Add missing icon getter and corresponding signal to QWebEngineViewPeter Varga2016-05-033-8/+41
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51179 Change-Id: I44a34fbe9d738b5f27c5f0f220691aab0120e040 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Make public API test up to dateAdam Kallai2016-05-021-0/+168
| | | | | | | | | | | | | | | Change-Id: I5560f761551d8990d4b8bfb8389b746f37848c86 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Remove WebAudio settingsAllan Sandfeld Jensen2016-05-028-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Replace print dialog with a custom one for printing to pdf.Michael Bruning2016-05-025-13/+349
| | | | | | | | | | | | | | | | | | | | | | | | The standard pdf print dialog does not work on OS X and Windows. Task-number: QTBUG-53016 Change-Id: Ic9dd1a1603e1cdbd82fef095cc660814bcd8c98e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | 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-2842-139/+452
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-2542-139/+452
| |\| | | | | | | | | | 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-213-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix contextMenu handling in examplesMichal Klocek2016-04-212-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Adds missing deleteLater on close Change-Id: Id337856f138e0d38f0c72d3962ccac309d36c73e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * 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>