summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0411-31/+32
|\ | | | | | | | | | | | | | | | | | | | | | | Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc, use the macro \macos. Conflicts: src/core/media_capture_devices_dispatcher.cpp src/webengine/doc/src/qtwebengine-deploying.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
| * Pepper flash search-path for package adobe-flashpluginViktor Engelmann2016-11-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since version 54, the chromium distribution package does not contain the pepper flash plugin anymore. Because of this, the plugin cannot be installed using the Ubuntu package "pepperflashplugin-nonfree" anymore (because the package pulled the plugin from the chromium distribution). The plugin is also contained in the package adobe-flashplugin, which installs the file to /usr/lib/adobe-flashplugin/libpepflashplayer.so. [ChangeLog] Pepper flash is now also searched in /usr/lib/adobe-flashplugin/ Change-Id: I7c135a2eac1628b0d338bbfed07695c9578458e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-10-312-9/+9
| | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except in link targets where QDoc does not expand macros. Change-Id: Icad4e7817d93b9e7b0e1a9a13a8618b3341ab2ba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Allow Pepper Flash to access Media DevicesViktor Engelmann2016-10-281-1/+0
| | | | | | | | | | | | | | | | | | | | The Q_UNREACHABLE caused WebEngine to block Pepper Flash from accessing Media Devices such as the WebCam (this rendered http://testwebcam.com unusable for example) Task-number: QTBUG-55017 Change-Id: I7979c9a5690173e86310f7448c78949371fbc909 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Disable GPU when no shared OpenGL context is availableAllan Sandfeld Jensen2016-10-271-11/+2
| | | | | | | | | | | | | | | | | | In case an OpenGL context can not be created we can try running in software compositing mode. This should have a much better chance of working as a fallback. Change-Id: Icaab24dde8f4b6c8ea4023cf36b0bb679143166f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix leakage of FilePickerControl objects in QWebEnginePageJoerg Bornemann2016-10-261-0/+2
| | | | | | | | | | | | | | | | Delete the FilePickerControl object after we're done with it, analog to what the QtQuick UIDelegatesManager does. Change-Id: Id5ef6666c8536b9e5c6877cd522b4c20adae37e5 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Doc: Clarify that font size is in pixelsKai Koehne2016-10-241-2/+2
| | | | | | | | | | | | Task-number: QTBUG-56645 Change-Id: I16ca76d3a26d0142846b068cc1ba52bee71cf106 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix IME window placement relative to QWebEngineViewAlexandru Croitor2016-10-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The position of the IME window is computed using the widget input item transform. When a regular QWidget gets a focusIn event, the input item transform is recomputed inside the QWidgetPrivate::updateWidgetTransform method. This did not happen for the QWebEngineView, because the focus event is handled internally and not passed down to QWidget::event. Fix consists in calling updateWidgetTransform manually whenever the view receives focus. The other cases when updateWidgetTransform should be called (namely resize and move events) are handled properly by delegating to QWidget::event. Task-number: QTBUG-55634 Change-Id: Ic93662929e169d860f8ca567f1955da4dc45f9fe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add missing override to initializeEngine in pluginMichal Klocek2016-11-021-1/+1
| | | | | | | | | | | | Task-number: QTBUG-56870 Change-Id: I36338a1a29bc4e82f5c84cfa1ea641b8df3b5f4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Apply page margins also for PDF printing (backport from 5.8)Michael Brüning2016-10-281-28/+48
| | | | | | | | | | | | | | | | This was left out by oversight. Task-number: QTBUG-56710 Change-Id: Ie23229396eb94b949212324fb50022763935d524 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Prevent crash with overridden drag 'n drop event handlersJoerg Bornemann2016-10-262-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose the user overrides QWebEngineView::dragEnterEvent without calling the base implementation and without overriding dragLeaveEvent. Then our implementation will notify chromium about the drag leave without having ever seen a drag entering and crash. Only notify chromium about leave/drop/move events if we've notified it about the drag enter before. Also, catch the case where the user overrides dragLeaveEvent without calling the base implementation. Task-number: QTBUG-54896 Change-Id: Ib958040e5fa7ecab86bac9b724d478c81a521fcc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Fix hang when dragging files from file picker onto QWebEngineViewJoerg Bornemann2016-10-262-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method WebContentsAdapter::updateDragPosition actively waits for the UpdateDragCursor message, sent by the renderer. This active wait does not work whenever we're currently in a base::MessageLoop::RunTask call, because of its internal recursion guard nestable_tasks_allowed. Add a check for nestable_tasks_allowed and bail out if we know that the active wait will fail. This fixes the hang. Ensure that the modal file picker dialog is shown outside of base::MessageLoop::RunTask. This enables drag 'n drop updates from the file picker to QWebEngineView. Task-number: QTBUG-56488 Change-Id: Ia13ada9c19e7780e12ca633ab1caeac352aca2a9 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Forward more load parameters in OpenURLAllan Sandfeld Jensen2016-10-141-0/+6
| | | | | | | | | | | | | | | | Adds a number of missing load url parameters following the example of the shell and android webviews in Chromium. Change-Id: Ice27ab3efc550b8b7cfa6a5386aaf09574428a56 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Respect command-line flags overriding our embedded defaultsAllan Sandfeld Jensen2016-10-111-2/+4
| | | | | | | | | | | | | | | | | | Check if the opposite flag has been given by the user before adding our own defaults. Task-number: QTBUG-56432 Change-Id: I7d6b8fed2c3e20405e3986f9afeb2193751a93f3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Consider multiple contents in mimeDataFromDropData conversionViktor Engelmann2016-10-111-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | content::DropData can have multiple contents (e.g. an <img> tag has itself as .html property, but also the src="..." attribute as .url property. Therefore, we should always consider all 3 cases and not return immediately when we have found the first content. Task-number: QTBUG-55858 Change-Id: Ie13851e8edb9ada45184a19b6ccfe38839bb9923 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Set the correct indexTitle for C++ Classes pageTopi Reinio2016-10-061-3/+3
| | | | | | | | | | | | | | | | | | ... and mention namespaces in the title, listing the namespaces with a group selector. Change-Id: I06056beba464a441ab56cb0acbfb0440c0878f0d Task-number: QTBUG-56298 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-044-2/+17
|\| | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| * Doc: Fix initialize() documentationMichal Klocek2016-09-301-1/+1
| | | | | | | | | | | | | | | | We do not share context between "processes", but between "threads" Change-Id: I20f558f913c1f19fc469ade6faab45762f42d528 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2016-09-271-0/+0
| | | | | | | | | | | | | | Pulls in changes to build debug+release correctly and build with Xcode 8 Change-Id: I38d6bd50048b332939416b0fae3f20978995d789 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Propagate the view's screen coordinates on global position change in QuickPeter Varga2016-09-272-0/+15
| | | | | | | | | | | | | | | | | | Based on widget solution: 1e83a2d1b61b13323163dfe8cac64dad397cb202 Task-number: QTBUG-55650 Change-Id: I6df45e7e018fa201c50fe81e8679c36f97ddeb1e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Include neon support for any -fpu=.*neon.*Donald Carr2016-09-271-1/+1
| | | | | | | | | | | | Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2016-10-011-0/+0
| | | | | | | | | | | | | | | | Pulls in changes to build debug+release correctly, build with Xcode 8, and added support for running on macOS 10.12 Sierra. Change-Id: I17668229c1b90af9dca26fb48f6cf945ef0ed114 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-09-255-12/+14
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-245-12/+14
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-233-9/+9
| | |\ | | | | | | | | | | | | Change-Id: I3e152ee134ed38628d1bf9571df58f469b29e74b
| | | * Fix crash when using openIn on newly created viewv5.6.2Christophe Chapuis2016-09-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. (cherry picked from commit bfc2683ab4ca3f56a2effd1b2f7e68850acb72ba) Task-number: QTBUG-55765 Change-Id: Iaa7cb4e8c7780a2e3f1a8c85b7b5da0ec541b2f3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Doc: Fix types of \qmlpropertyKai Koehne2016-09-193-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie355f72a0bf575e66ab465fb2fcada0430ed8c7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | Use canonical include paths for public headersKai Koehne2016-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on "include/QtWebEngineWidgets" or "include/QtCore" being in the default include path. Task-number: QTBUG-56107 Change-Id: I9535f723814efdef7bf8290a891978aabfa899bb Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * | Fix crash when using openIn on newly created viewChristophe Chapuis2016-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. Task-number: QTBUG-55765 Change-Id: Ia1a299dd65c229705462c9444b81d7b26567fc09 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Fix dangling pointer problemViktor Engelmann2016-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the raw pointer ResourceDispatcherHostLoginDelegateQt::m_authInfo into a scoped_refptr, to prevent chromium from freeing the memory, which caused this pointer to dangle and SEGFAULT upon later usage. Task-number: QTBUG-55828 Change-Id: Ib57e89ca042a4494e2ab77ea10328495e6fc1431 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Disable local database when local storage is disabledAllan Sandfeld Jensen2016-09-251-0/+1
|/ / / | | | | | | | | | | | | | | | | | | Ties the feature switch for Indexed DB to the same as local storage. Change-Id: I9ea8992cc00097a8f7bd86236f8cd43008566d2b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Use canonical include paths for public headersKai Koehne2016-09-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on "include/QtWebEngineWidgets" or "include/QtCore" being in the default include path. Task-number: QTBUG-56107 Change-Id: I1a1eb7baf6d3166239eadc5b0b9863704e87888c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-09-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Pulls in the second batch of cherry-picked security patches from the 53 release. Change-Id: Ibd5a596648cb8caa47b9df45e019d198eb494d9d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Doc: Fix types of \qmlpropertyKai Koehne2016-09-203-9/+9
| | | | | | | | | | | | | | | Change-Id: Ibb470580404f2b09dc8c7c2de275ade97251d612 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-181-1/+2
|\| | | | | | | | | | | Change-Id: I2452f25335174d0e0c15a9e069fe50e1d92db1b8
| * | Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-1/+2
| |\| | | | | | | | | | Change-Id: Ie075563e90ca184f8bd38be4a9a9bd49b4640769
| | * Resolved nullptr dereference bugViktor Engelmann2016-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line 282f of chromium/content/browser/frame_host/render_frame_host_manager.cc, RenderFrameHostManager::Navigate passes nullptr to WebContentsImpl::NotifyViewSwapped. In line 3833f of chromium/content/browser/web_contents/web_contents_impl.cc, this is passed on to the observers, including UserResourceControllerHost::WebContentsObserverHelper::RenderViewHostChanged which dereferenced it unchecked, causing a crash. Task-number: QTBUG-55254 Change-Id: Ibdb6645f63957d28a89c50b51faeb3aea086a8b3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromiumDavid Faure2016-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer which also compares this with null. Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-09-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Pulls in the first batch of cherry-picked security patches from the 53 release. Change-Id: Ife72ecef309249e4f80ca9b7cc478bd4e236e094 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-09-123-2/+7
|\| | | | | | | | | | | Change-Id: I9acebc9f1d01ab9041f75c49749f8a122ffbfe30
| * | Do not assume neon on armv7Allan Sandfeld Jensen2016-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Chromium defaults to arm_neon=1 and then sets -mfpu=neon if the arm architecture is 7. Change-Id: Ib144dd4188ba4221ed35367026de9f9a04c69792 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Improve QWebEngineSettings::JavascriptCanOpenWindows docsFlorian Bruhin2016-09-062-2/+3
| | | | | | | | | | | | | | | Change-Id: I44105c768a958714590b979d3877724f0db659ee Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Fix buildAllan Sandfeld Jensen2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We now get a multiword value from $$pkgConfigExecutable which will cause us to treat it as multiple gyp config sets, which will make gyp fail. Change-Id: Icdf781bb633d804ff6355e882dc4997bb5f3310f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Doc: QWebEngineContextMenuData is in the QtWebEngineWidgets moduleLeena Miettinen2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was listed in the wrong place, because the value of the \inmodule command was wrong. Task-number: QTBUG-55872 Change-Id: Ie3df6bb261dd75178bbe0f118d7720e2bff6d205 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Doc: Add type name (WebEngineView) to the SavePage enum value in docsLeena Miettinen2016-09-081-1/+1
| | | | | | | | | | | | | | | Change-Id: Ica90790662929f1141419ccd38d34d3c9d55be32 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-08-317-27/+117
|\| | | | | | | | | | | Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8
| * | Qt Designer plugin: Add a dummy class for querying propertiesFriedemann Kleint2016-08-312-1/+37
| |/ | | | | | | | | | | | | | | | | | | | | Add a lightweight "fake" QWebEngineView class that is returned when Qt Designer queries the default property values by calling QDesignerCustomWidgetInterface::createWidget() with 0 parent, preventing crashes during QWebEngine initialization. Task-number: QTBUG-53984 Change-Id: Iced64b7d8af4c958fe7e29fa2f64bb9b681fbab2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Clicking on a select box option, did not workAdam Kallai2016-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was introcuded a new logic which proves that no mouse / keyboard events are forwarded to Chromium if the view has no focus, and activeFocusOnPress is set to false. The selection box get focus when the user click on it, but the popup window never get (focus is on QuickRootItem) in this case these mouse events are ignored to forward to Chromium. Task-number: QTBUG-54795 Change-Id: Id6e81ee39dcde21a6c5c46e302888b9e9478352f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2016-08-261-0/+0
| | | | | | | | | | | | | | Pulls in fixes for webcursors and building against FFMPEG3 Change-Id: Ic852604eea1a15cbf96decd536278f01a7f9dcf3 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix textures memory leak on second X11 screenMichal Klocek2016-08-242-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-48969 was only half-baked patch and introduced massive memory leak on fbo and texture alloctaions. Delete fbo and extra allocated textures. Task-number: QTBUG-52575 Task-number: QTBUG-48969 Change-Id: I2148f37cd27dab9e40ab72caeb6857752b69379f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 14:45:59 +0000