summaryrefslogtreecommitdiff
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Prevent crash when downloading large blob dataKonstantin Tokarev2017-11-081-1/+3
| | | | | | | | | | | | | | | | | QByteArray::{from,to}Base64 are prone to integer overflow when input data is large, which causes segfaults. We have to set threshold on data size to prevent this from happening. Also, changed data URL construction code to do less intermediate memory reservations. Though biggest offender is QUrl constructor and it has to stay. Original commit: https://github.com/annulen/webkit/commit/535c062962e3e0f425848e6b32ad1c95d25bec4b Change-Id: Ieaf4c914fdff086e15d2358bdb19d378f2a11feb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Enable HSTS by default with Qt 5.9Konstantin Tokarev2017-04-111-1/+5
| | | | | Change-Id: I638ac5e76f087b2af9211a1bfc1ceb3441626419 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Cleanup QRegExp includesSamuel Gaist2017-03-132-1/+1
| | | | | | | | This patch adds the missing QRegExp includes and removes them when not used in prevision of the qtbase include cleanup. Change-Id: Ibb70e9aab72619f6de13b0c0a5e929e5552d1aaa Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Remove uses of QString::nullMarc Mutz2017-03-101-3/+3
| | | | | | | It's going to be deprecated. Change-Id: I2cc901cd2b66330b1beca16c865b6259c3bab949 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-1020-91/+212
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id65b546f295897cd386125d2d3d4160051cc7d22
| * Support custom items in context menuKonstantin Tokarev2017-02-136-7/+68
| | | | | | | | | | | | | | | | This is particularly important for Inspector, which lacks a lot of useful context menu actions without this patch. Change-Id: I8170c806028ff140206f13e5e1de0409e945e905 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Use frameGeometry() to determine the outerWidth/Height of the windowAndy Shaw2017-01-302-1/+24
| | | | | | | | | | Change-Id: Ie6ca8f40a7512e37e0b2efc94706242c9f323686 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-266-75/+75
| |\ | | | | | | | | | Change-Id: Ib843c048b13865645d397428d31eac4f5bd52270
| | * Added missing Q_DECL_OVERRIDEs to QtWebKitWidgets headersKonstantin Tokarev2016-10-106-75/+75
| | | | | | | | | | | | | | | Change-Id: I2ab9287f17155b18f8caee3866d4125d4451a078 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-047-8/+45
| |\ \ | | |/ | | | | | | Change-Id: I0cb01e653bf640a929c26c771eebedc9e6656b14
| | * Fixed checkbox and radiobutton indicatorsKonstantin Tokarev2016-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When layout rect is smaller than indicator its edges may not be repainted properly. Now we center indicator repsectively to layout rect and inflate repaint rect to cover edges. Also, when layout rect is larger than indicator, QStyle code paints it at the top-left corner of given rect. Now indicator is centered, like other browser engines do. Note that when layout has auto size for checkbox or radiobutton, their sizes are adjust beforehand in RenderThemeQStyle::computeSizeBasedOnStyle(). This code path is require only when layout forces checkbox or radiobutton to be smaller than optimal indicator size. Task-number: QTBUG-56302 Change-Id: Idaefffc5775055514a430216ea265af2b3a039b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Report JavaScript errors from Qt signals and slotsVitaly Slobodin2016-09-301-0/+28
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-37899 Change-Id: Idcd92196a44cfac26c6943832bf8971ad70aec5e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Adjust the size of native popupsVitaliy Slobodin2016-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WebKit renders a native control without appearance (-webkit-appearance: none;) for the menu list, it uses the width of the element for the popup size. We need to manually adjust the width of the popup to the longest name. Change-Id: I5883095ab0199c3360ed3fe45d2e2dace416cc4a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fixed documentation of QWebSettings::JavascriptCanOpenWindowsKonstantin Tokarev2016-09-061-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I1e22cba3fb1807302ad2fa868e875d762a369ac0 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Prospective build fix for WindowsSimon Hausmann2016-08-222-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit 770a0c91f3fadcdb132d9eb96d085aafbe1bacd0 in qtbase we may need a heuristic for the COPIES assignment for the qmldir file to protect against copying the same file twice to the same location on debug-and-release builds on Windows. Change-Id: I60d34d218856a70c242824b9253d229d2d33d48d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I47a83c520dc57f77666d8a40de30d3bb9fd724f9 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Fixed conversion of QWebPage::FindFlags to QWebPageAdapter::FindFlagsKonstantin Tokarev2017-01-221-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | After 6255cb893d4 QFlags started to detect signedness of enum type correctly, changing internal storage type of FindFlags to uint. We should use FindFlags::Int type now instead of int. Task-number: QTBUG-58316 Change-Id: Ie346b6062681b49b064fdd9ac0e5897299f4bee5 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix loading of QML pluginsSimon Hausmann2016-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: If758dc34a68f07e916ef4a5f9f8aad97998ecc9d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adapt to qtbase configure changes to fix buildSimon Hausmann2016-08-242-2/+2
|/ | | | | Change-Id: I5f84aeb483d01670525aadd53bf10a65c4da9b82 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Don't use deprecated version suffixes of QStyleOption* classes.Konstantin Tokarev2016-06-151-4/+4
| | | | | | | They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Added missing break statement.Konstantin Tokarev2016-05-201-0/+1
| | | | | Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix tst_QObjectBridge::connectAndDisconnect() failArunprasad Rajkumar2016-05-191-4/+4
| | | | | | | | | | | | | | | | | <https://webkit.org/b/119933> Patch by Arunprasad Rajkumar <arurajku@cisco.com> on 2013-08-19 Reviewed by Allan Sandfeld Jensen. Latest version of JSC has unquoted undefined in exception messages. So replaced 'undefined' with undefined. * tests/qobjectbridge/tst_qobjectbridge.cpp: (tst_QObjectBridge::connectAndDisconnect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154273 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ife6167e9f67f540fcef3f3468c37fcb85991216d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* decruft project fileOswald Buddenhagen2016-05-101-3/+0
| | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I78294e52858387946b2bafd258f7be6b0b5d87d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make use of COPIESOswald Buddenhagen2016-05-102-16/+6
| | | | | Change-Id: I050003e46c437a3fadce11d417861f40d60f6c20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make more ctors explicitMarc Mutz2016-03-042-2/+2
| | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: If2e979aa5772b8dc0b9a4a9360914740144d47a7 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-046-12/+12
| | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I9e521f91abe7972843eeeb6406f8605778dabbaf Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* isLinkVisited: Don't build complete URL unless we use QWebHistoryInterface.Konstantin Tokarev2016-02-261-4/+4
| | | | | | | | visitedURL() is non-trivial function with memory allocations, so we should not call it for nothing. Change-Id: I72e14fac75640cb6b22dd1444b9a061e8432dd7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed unfinished phrase in documentation of evaluateJavaScript.Konstantin Tokarev2016-02-041-4/+3
| | | | | | Change-Id: I5b5f43c68feedbace330494e7eb051cfe8a54128 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Handle WebKitErrorDomain error like other errorsJoni Poikelin2016-01-291-1/+1
| | | | | | Change-Id: Ie4dd08b18706e44947a00b4d61a185b5fc43f478 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed another typo in QWebSecurityOrigin::addLocalScheme() documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | Change-Id: I7013829d4e30a85374a4f63ab6a45b97b44313d7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fixed typo in QWebSecurityOrigin::addLocalScheme documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | Change-Id: Ife7db164671b84f28b03b6d86a038d1370486cae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Improved documentation of evaluateJavaScript().Konstantin Tokarev2016-01-212-2/+24
| | | | | Change-Id: I47d8f4c0e392ffb70655db9725b035d22a7cad91 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add missing docs for QWebSettings attributes.Florian Bruhin2015-08-101-0/+6
| | | | | | | | | WebAudioEnabled is left undocumented because it doesn't work, but WebGLEnabled/HyperlinkAuditingEnabled/CSSRegionsEnabled seem to work fine. Change-Id: I12c88424ae77cdb6f1e0279b39a538ee932b8b60 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Remove QTWEBKIT_VERSION left-oversAllan Sandfeld Jensen2015-07-292-46/+1
| | | | | | | | We removed QTWEBKIT_VERSION in Qt 5.0, but still document it and still define the QTWEBKIT_VERSION_CHECK helper. Change-Id: Iadbe0004224f3cef20a5d55a5ec8b46f04b387d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Allan Sandfeld Jensen2015-05-181-2/+3
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Allan Sandfeld Jensen2015-05-181-2/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib823c8eeb271b380811827aae1ac0bd50ea5a59b
| | * Enforce no remote access from local URLs for XHRAllan Sandfeld Jensen2015-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific setting to disable remote access for local URLs and also enforce that on data-URLs loaded owned by local URLs. Change-Id: Ied8ec141eb1c28775644fce184a4759a79e1d177 Task-number: QTBUG-45556 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Fix potential crash on exitAllan Sandfeld Jensen2015-05-181-1/+2
|/ / | | | | | | | | | | | | | | | | If we close a browser with a combobox open it may crash on exit due to double deferred deletion. This patch avoids that by using a smarter pointer. Change-Id: I3f1c561b0eb70cf1a51054de51b1027b52cd41b6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-151-0/+2
|\ \ | |/ | | | | Change-Id: I0d9dd63455dc12402afd56cc1bd97d0cc97c24e8
| * Set minimum DOMTimer interval to 4msAllan Sandfeld Jensen2015-03-181-0/+2
| | | | | | | | | | | | | | | | | | | | This changes the QtWebKitWidgets minimum DOMTimer precision to match that of QtWebKitQML (WebKit2) and other WebKit1 APIs. See also https://bugs.webkit.org/show_bug.cgi?id=61214 Change-Id: Id8ce7d217ed27396c8b14584f8c0c22a5df888cd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Allan Sandfeld Jensen2015-03-108-3/+35
|\ \ | |/ | | | | Change-Id: I824a984e8552340c2f9f631ac951f2c9eaa90b74
| * Doc: Link issues Qt WebKitNico Vertriest2015-03-052-2/+2
| | | | | | | | | | | | | | | | Removed obsolete references QInputContext and QtDeclarative Task-number: QTBUG-43775 Change-Id: I308931beaec5ef2067350649135c26df1fe3817b Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Forward show and hide events to PluginViewsMichael Bruning2015-02-267-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | This was causing issues with windows plugins on windows, which were always visible on top of all other widgets and not hidden correctly when the owning web view was hidden. Task-number: QTBUG-44401 Task-number: QTBUG-42588 Task-number: QTBUG-43024 Change-Id: Ie0307fa2f7b2bf59f51a76db5feef2e8446c359d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge dev into 5.5Oswald Buddenhagen2015-02-2326-26/+26
|\ \ | | | | | | | | | Change-Id: I1a4e088f1080851e768f41551b69e62267782fd9
| * | Update copyright headersJani Heikkinen2015-02-1626-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-162-6/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib6552c4dd0fbfecfa1800689eb2ae75b9d54a22b
* | \ \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-203-6/+57
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | Conflicts: .qmake.conf Change-Id: Ic900e9207ae48520c99894345fe0b4d0ab58ec44
| * | Fix compile issue as it was missing the multimedia moduleAndy Shaw2015-02-191-0/+1
| |/ | | | | | | | | Change-Id: I24f89215897b366fc7f21bf4a43e61337a17b596 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Add documentation for feature permission related APIs.Florian Bruhin2015-01-221-0/+49
| | | | | | | | | | | | | | | | Those are mostly taken from QWebEnginePage's documentation with some slight adjustments. Change-Id: Ifbde5252cc46505c117a9d75ffa2af6e3b6eec11 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Editor actions should only be checked when page is editableAllan Sandfeld Jensen2015-01-201-5/+6
| | | | | | | | | | | | | | | | | | | | In the split of qt4 QWebPage the check for GUI level editor actions was incorrectly moved to being checked when the page is not editable instead of when it is editable Task-number: QTBUG-44019 Change-Id: I3776cec6ee05f27e43139e40cc18480905300888 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
View Lorry Controller Status