summaryrefslogtreecommitdiffstats
path: root/src/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-11-246-10/+77
|\ | | | | | | | | | | | | | | | | Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
| * ResourceType ABI/API fixupAllan Sandfeld Jensen2016-11-234-10/+28
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Changes] The enum value ResourceTypeUnknown has changed value since there was a mismatch between 5.6 and 5.7+ definitions. In general any unknown ResourceType value should handled as unknown for forward compatibility, since more types are and can be added in later Qt versions. Change-Id: I0a9f8a2129d4549deeae01e199f432fbbf1bbb9e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix IPC message loggingPeter Varga2016-11-222-0/+49
| | | | | | | | | | | | | | | | | | | | | | Register Qt IPC messages for logging. The usage of content::RegisterIPCLogger function adds the content_common.content_ipc_logging.o to the link dependency. Thus it will register the Chromium Content IPC messages too. Task-number: QTBUG-57224 Change-Id: I2c45691feb22a34f6074940cc35b8a4ba7804370 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.7.1' into 5.7Allan Sandfeld Jensen2016-11-211-1/+8
|\ \ | | | | | | | | | Change-Id: Ifcf7423fa8d892ddad595300e33a09c7f63f5e6e
| * | Fix crash in WebEngineContext when using WaylandAllan Sandfeld Jensen2016-10-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the OpenGL context wayland QPA sets has no nativeHandle, so we end up crashing in strcmp. Assume a context without nativeHandle is Wayland or other GLES2 platform and also force GLES2 when using Ozone. Change-Id: Ia3fc524f3ffbb278d86f9153ec96c7258ef86656 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Pass size to URLRequestJobAllan Sandfeld Jensen2016-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QIODevice has a size we can pass that on as expected size. This fixes media playback where Chromium does not always support streaming outside of HTTP or HTTPS. Task-number: QTBUG-57139 Change-Id: Ie8bf96b1f7f6af80fe707936055620d154c3ef2d Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Fix sites with optional client certificate supportAllan Sandfeld Jensen2016-11-102-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fail to load pages that supports client certificates because we didn't implement the client certificate selection. This patch makes a small implementation that selects no certificate whenever a client certificate is requested. Task-number: QTBUG-56206 Change-Id: I95394d9664c7e8e4d03d9e63e5043da81e2672a4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Make Linux QPA combinations more robustAllan Sandfeld Jensen2016-11-092-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use resourceForIntegration to get egldisplay since not all QPA return a egldisplay for context (in particular xcb_egl). Implement EGL fallback for linux desktop builds, to make Wayland work without an X11 server present. Change-Id: Idcead42250fa00a36e50c082711f5618fd213556 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Do not fail for wayland-eglMichal Klocek2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Client-side buffer integration can be set manually, therefore beside accepting generic wayland plugin accept also wayland-egl. Change-Id: I8269f117f81cf8bb9462bea525cb253727910bc6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-043-13/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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>
* | | 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>
* | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-041-1/+1
|\| | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| * 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>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-09-251-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
| | * 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>
* | 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>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-09-121-0/+4
|\| | | | | | | | | | | 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-08-313-20/+69
|\| | | | | | | Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8
| * 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>
| * Fix crash when trying to navigate in new window but is blockedAllan Sandfeld Jensen2016-08-231-0/+1
| | | | | | | | | | | | | | | | Ensure that if QWebEnginePage::createWindow returns 'this' that we fall back to navigating in current tab. Change-Id: Idffe25dcafaaf3c824815b3cf1f0e400eaec2923 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2016-08-301-1/+1
| | | | | | | | | | | | | | Pulls in a security update and updates our sources to match. Change-Id: I06af8eea04426ee9c695e78cce7c9606eb2b4ab1 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Use pkg-config wrapper provided by qmakeMichal Klocek2016-08-261-0/+2
| | | | | | | | | | | | | | | | Switch to pkg-config wrapper provided by qmake to avoid exporting extra PKG_CONFIG_LIBDIR paths. Change-Id: I6c916d8d20965808af7b206c4fecf6c8791e93b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Support the command-line argument --allow-running-insecure-contentAllan Sandfeld Jensen2016-08-262-1/+6
| | | | | | | | | | | | | | | | | | Reads the chromium command-line argument and pass it on to WebKit. This also prepares for adding it as proper API later. Task-number: QTBUG-54902 Change-Id: I391940ef43a88332f45cc3c97fe22514d7f6a76c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Ensure WebEngineContext::destroy() is called before the destructorAllan Sandfeld Jensen2016-08-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a false reference only removed after destroy() is called, so the tearing down of static objects won't dereference it before the QApplication is destroyed and the post routines including destroy() are called. Also adds a little safety by asserting destroy() has been called before ~WebEngineContext() and make sure we don't create a new WebEngineContext() during shut down. Task-number: QTBUG-54769 Change-Id: I2b1d189f9ebd8da2dc9f322f9bb307a5aa0c6a2f Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Pass alsa pulseaudio qt build settings for embedded buildsMichal Klocek2016-08-201-1/+10
| | | | | | | | | | | | Change-Id: I0996b08d661bc52233396a98acdf9d2e68876711 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Check if gpu fence is supported in pullTextureMichal Klocek2016-08-091-1/+1
| | | | | | | | | | | | Task-number: QTBUG-53972 Change-Id: Ie722e40e4763c5a78ce566d03fec6877d64b2023 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-0221-91/+120
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| * Do not use proxy when connecting to localhostErwin Kandler2016-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | Chromium does not exclude localhost connection from its proxy rules by default. When using a qt proxy with any other form of qt-based connections, connections to localhost are excluded by default. This patch adds localhost connections to the proxy-bypass rules. Change-Id: I76c43a2ae0de8d8fad455445a64a739c6c6b40f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-275-22/+12
| | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Add persistent backend to channel id serviceAllan Sandfeld Jensen2016-07-194-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Channel-ids are only supposed to be memory only when running in off the record profiles. We have just never initialized the sql-based backend. We follow the cookie-settings, because channel-ids are used together with cookies, have similar implications, and newer Chromium versions will assert that cookie-store and channel-id store have matching storage models. Change-Id: I0a64146f0ed36a8913706bfc3fcadd7404894745 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix regression in updating cookie store settingsAllan Sandfeld Jensen2016-07-171-2/+2
| | | | | | | | | | | | | | | | A copy-paste error meant we only updated user-agent settings when cookie store settings changed on a profile. Change-Id: I173ea7dfc309a30a3d3b98ee5ccab74e2abec456 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Improve OpenGL implementation checkAkihiko Odaki2016-07-131-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebEngine uses `isOpenGLES` to know whether the OpenGL implementation is EGL with OpenGL ES 2.0. However, some non-ES OpenGL implementation such as eglfs_x11 uses EGL and are compatible with OpenGL ES 2.0. This change allows to use them. Also the change will allow to detect incompatible combinations. (i.e. EGL + ES-incompatible OpenGL, API other than EGL + OpenGL ES) Change-Id: I0abea253696d06ec365bde2176663700e8567f45 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix regression in text selectionAllan Sandfeld Jensen2016-07-041-0/+13
| | | | | | | | | | | | | | | | | | While 'button' should officially be none on mouse move events, the aura and windows events set 'button' on mouse move, and selection code appears to depend on it. Change-Id: I49f84e6f9178c3b2cb0f2c2c8a7b1d30141d0b4e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix regression with fine-grained wheel eventsAllan Sandfeld Jensen2016-07-041-2/+2
| | | | | | | | | | | | | | | | The division needs to be done in float, otherwise steps smaller than one standard tick will be rounded to zero. Change-Id: Id939be062f1575104ca6cd66f05892841ec27569 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Switch WebContentsAdapter to using shared pointersAllan Sandfeld Jensen2016-07-016-21/+13
| | | | | | | | | | | | | | | | | | QExplicitSharedDataPointer is meant for value objects, not for shared objects. Instead switch to using QSharedPointer. Change-Id: Ib3791bbcfde627a67508f2819e141d8c538a4a50 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| * Clear internal selected text when searchingAlexandru Croitor2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a selection was made on a web page, and afterwards a find operation is executed, the selection in the web page would be cleared, but the call to selectedText() would still return the old selection. Make sure selectedText() is always cleared, when starting a find operation, as well as when stopping one. Change-Id: If78f0fa1dd836a52184015e749ef5a84b9f784cd Task-number: QTBUG-54071 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 13:14:42 +0000