summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
| * Fix crash when trying to navigate in new window but is blockedAllan Sandfeld Jensen2016-08-232-3/+9
| | | | | | | | | | | | | | | | 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-302-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>
* | Fix sandboxing of localtime syscallAllan Sandfeld Jensen2016-08-191-63/+1
| | | | | | | | | | | | | | | | | | | | The check OS(LINUX) does not work here, so use the Qt OS defines, and remove the stat and fopen overrides that Chromium no longer proxies this way. Task-number: QTBUG-55125 Change-Id: Ie03b8e0cabd100f2f72b7ab1cff5dc8697ba69ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-1610-111/+154
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| * Update ChromiumAllan Sandfeld Jensen2016-08-101-0/+0
| | | | | | | | | | | | | | Pulls in security updates from Chromium 52 Change-Id: I4fb5183a321b45fdf5515f0a88100b48697ee3aa Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Add type name to enumeration values to follow the doc conventionLeena Miettinen2016-08-096-89/+107
| | | | | | | | | | Change-Id: I86eea3a64a38f6ec9984f663499abffa03cd9eb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add Qt WebEngine to list of "All QML Modules"Kai Koehne2016-08-051-0/+1
| | | | | | | | | | | | | | This list is shown in qtdoc/qmlmodules.html Change-Id: Ib51f0405e7581571f8a124ea6806e7bc4982dba3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix issue where Chromium thought it had active focusAlexandru Croitor2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when a WebEngineView's RenderWidgetHostViewQtDelegateQuick had focus, but not activeFocus, Chromium was told that it had keyboard focus. That is not correct, because having focus inside the FocusScope (the WebEngineView), does not mean it has keyboard focus, it just means the RWHVQDQ will receive active focus, when the WebEngineView does. The call path for that erronous check was done when a new page was loaded, specifically going through NavigatorImpl::DidNavigate() -> RenderFrameHostManager::CommitPending() -> render_frame_host_->GetView()->HasFocus() -> RenderWidgetHostViewQtDelegateQuick::hasKeyboardFocus(), which resulted in incorrect display of a blinking caret in an input, when the view actually wasn't focused. The fix consists in checking for the activeFocus rather than the focus property. Change-Id: I97002be3fc8adfec2228a1b5ad62696f8872d3cc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Explain how to support High DPI devices in applicationsLeena Miettinen2016-08-041-0/+25
| | | | | | | | | | | | Task-number: QTBUG-54114 Change-Id: I63ae6c47eb76a4acf85cd5b0c7adb21399a985dd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Move WebEngineView property docs to webengine.qdocLeena Miettinen2016-07-292-20/+20
| | | | | | | | | | | | | | | | | | The docs do not currently get built, because docs for a QML type need to reside in one file. Also edited the docs for grammar and style. Change-Id: Ic62f293e113d0e4bfe0497ce4a665a2a42971eb3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | 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>
* | Doc: Describe deployment of Qt WebEngine applicationsLeena Miettinen2016-08-091-26/+97
| | | | | | | | | | | | Task-number: QTBUG-55142 Change-Id: I1255269730bb3b5ae13e2128743da421589c26c8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Add type name to enumeration values added in Qt WebEngine 1.3Leena Miettinen2016-08-085-142/+149
| | | | | | | | | | Change-Id: I8f3aa86b451e57d01937559e595a439529a839ce Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Move "Target Platforms" to deployment topic from "Platform Notes"Leena Miettinen2016-08-082-13/+14
| | | | | | | | | | Change-Id: I178260c8356afaada989abfb2a1218d4ce0f134e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Move info about deployment on Windows from qtdoc moduleLeena Miettinen2016-08-041-0/+22
| | | | | | | | | | | | | | This information was in the "Qt for Windows - Deployment" topic. Change-Id: I309a53001695f8d287c819852a3457a75ec17657 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: Move info about deploying Qt WebEngine apps into a separate topicLeena Miettinen2016-08-033-12/+45
| | | | | | | | | | | | | | | | Move information from the Qt docs here in a follow-up change. Also add information in more follow-up changes. Change-Id: I420dcb879332b298247867768e59a736ef466081 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-0238-209/+2175
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-276-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>
| * Prevent a crash after having downloaded a fileAndy Shaw2016-07-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | Since the profile owns the QWebEngineDownloadItem then it is likely that it will still be around when the QWebEngineProfile is deleted. As the QWebEngineDownloadItem is a child of the QWebEngineProfile then it will try to delete it when deleting the QWebEngineProfile which means it cannot trigger a function call into QWebEngineProfilePrivate. Change-Id: I51077a7857fb49a6708224a9e9942d17de6f6778 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Link to QWebEngineProfile::downloadRequested from WebActionLeena Miettinen2016-07-251-1/+3
| | | | | | | | | | | | Task-number: QTBUG-54644 Change-Id: Ief2e92e6baf3057cb4c1835557c51c4728c34ec0 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Move details about script injection in overview to separate sectionKai Koehne2016-07-211-13/+18
| | | | | | | | | | Change-Id: I51562b2dff1ffe4359c6db4a802c406c3706de84 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Condense documentation for Qt WebEngine ProcessKai Koehne2016-07-211-6/+3
| | | | | | | | | | Change-Id: Idf18d236816aab12fb01e1b5725e5ad1c73dbaad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Replace ambiguous reference to 'C++ implementation'Kai Koehne2016-07-211-3/+3
| | | | | | | | | | | | | | Qt WebEngine and Qt WebEngine Core also have C++ API. Change-Id: I4fa4219cd9c0a984f736585caf84676e64f1155a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move mentioning of QSG in overview to WebEngineWidgets moduleKai Koehne2016-07-211-5/+4
| | | | | | | | | | | | | | | | | | | | Currently it was placed under WebEngineProcess, which is confusing. That the scene graph is used for the QtWebEngine module is probably not really interesting, but it's certainly suprising for Qt WebEngine Widgets, hence mention it there. Change-Id: I1a87b0b0d32cc2695c4dfa31aae56c517e39124e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Use \note tagKai Koehne2016-07-211-1/+1
| | | | | | | | | | Change-Id: Ie82c3b34974b391ca69f82d00165c0d46ad6b4af Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move WebKit comparison to porting guideKai Koehne2016-07-212-4/+8
| | | | | | | | | | | | Change-Id: I75d3f5641ccd402ea1a167d14533b70df5744ff7 GPush-Base: 8ca4a41dfe6887c2637fe2e562f5314b56facd20 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move Platform notes into separate section in OverviewKai Koehne2016-07-211-4/+6
| | | | | | | | | | | | Change-Id: I40d9c30dd33eb38d1d33c68df4cb4bbc3704c647 GPush-Base: 8ca4a41dfe6887c2637fe2e562f5314b56facd20 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Fix WebEngine module diagramLeena Miettinen2016-07-204-0/+1915
| | | | | | | | | | | | | | | | | | | | - Fix typo - Add dependencies between submodules - Add sources for diagrams Task-number: QTBUG-54382 Change-Id: I88aa1dfd0ba16f3d3ca26d8c9cfa05b0ec1e9c83 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Introduce new 'Related Modules' section in OverviewKai Koehne2016-07-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Consolidate the description of related modules in a separate section, and place them less prominently at the end of the overview. Also - remove mentioning of (ambiguous) 'web runtime' - fix spelling of supersede Change-Id: Iccac376a6b602ee9d23efd4b856e65b9292d6382 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>