summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix multiple symbol definition error with gold linker.Michael Bruning2015-11-061-2/+0
| | | | | | | | | | | | | | | | | | | | | We should not need to include the moc'ed sources here anymore. Change-Id: I2417e71aac9495e6f85653c7636be882b02e8a74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Add documentation about console loggingKai Koehne2015-11-065-3/+28
| | | | | | | | | | | | | | | Change-Id: I50ae0beb54f70c232eed0d9bd47b0dc01dadc130 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | Print JS console messages by defaultKai Koehne2015-11-064-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of QWebEnginePage/WebEngineView to print JavaScript console.warn and console.error messages by default in a 'js' logging category. This matches also the behavior for QtQml, where console messages end up in a 'qml' logging category by default. So far access to the JavaScript console required either use of the remote debugging functionality, subclassing of QWebEnginePage, or implementing a custom handler. Anyhow, even then writing a seamless forwarding of the data and metadata to the Qt message handler is difficult. This patches implements this forwarding by default. The behavior can be changed by either setting up rules for the 'js' category, e.g. setFilterRules("js.*=false"); or by implementing onJavaScriptConsoleMessage(), or overriding QWebEnginePage::javaScriptConsoleMessage. [ChangeLog] Unhandled JS console messages are now forwarded to to the Qt message handler inside a 'js' category. Change-Id: I5480383a80dcf7a122496f9b7915264ef9036db3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Ensure WebContents::WasShown/WasHidden are calledAllan Sandfeld Jensen2015-11-066-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | Forward WebEngineView visibility to WebContents visibility, and call WebContentsView visibiliy on actual show/hide events to avoid a recursion when WebContents visbility triggers it. Change-Id: I0c336359fb35bf93874aa1092767177d7a5ce341 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Replace QList with QVectorKai Koehne2015-11-067-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | Replace QList with QVector in all places where the type isn't a pointer, and is not already (indirectly) exposed through public API. Change-Id: I90e3db56bf9ebda6b3cb8fb4396d2ae283159727 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Use relative paths instead of absoluteAllan Sandfeld Jensen2015-11-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja will build to source-directory when using absolute paths, to get it to build to build-directory we need to use relative paths. Fortunately we can use the DEPTH variable to get relative path to the chromium src dir. Change-Id: I6b97ef20f2800721cfc399b6f9b6621f5656f7ee Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Improve documentation for QWebEngineScriptKai Koehne2015-11-054-4/+18
| | | | | | | | | | | | | | | Change-Id: I9274a3cacaa04529152a5d827c47cf6fc831df19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-11-053-4/+21
| |\ \
| | * | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-043-4/+21
| | |\| | | | | | | | | | | | | Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
| | | * Fix build on WindowsAllan Sandfeld Jensen2015-11-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't delete a scoped_refptr, but just returning should cause it to do so automatically. Change-Id: I7d7ba28d0264506d608f64847cbfb8a7cb63cf5e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * adoptWebContents: re-bind user scripts with new adapterChristophe Chapuis2015-11-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-48984 Change-Id: I87cb224899458ba8f2d0343ed98932cfc8a6947f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * fix frequent deadlocks on WindowsJoerg Bornemann2015-10-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a desktop OpenGL build of Qt we encountered frequent deadlocks when creating OpenGL contexts. Initialize the context directly on the calling thread instead of the browser thread and do not synchronize with the browser thread. Task-number: QTBUG-48276 Change-Id: I0970c66cb230881cdc53f22d4a255ea08e6fe63a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Do not use system harfbuzz unless it is configured.Michael Bruning2015-10-302-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d2aca1d3192be08295af57b08489bfefc8e0dc4 Task-number: QTBUG-49128 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Do not display context menu when pending event flag is false.Michael Bruning2015-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an event filter is installed on the view, the right mouse click event may trigger Chromium to request a context menu even though the context menu events get filtered out. Removes a Q_ASSERT that would now never be triggered. Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06 Task-number: QTBUG-49092 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | | * adoptWebContents: re-associate webchannel with new adapterChristophe Chapuis2015-10-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-48984 Change-Id: Ief41fe9619f4300d7a0c25a57f09f5eefe3fca3d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | | Update devtools discovery pageAllan Sandfeld Jensen2015-11-051-37/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the page to follow recent versions of Chromium's, now renders both title and URL for items. Change-Id: I0bc6dd4c2e4078bf9197d0f0af67747728bf6e8e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | | [Windows] Fix build on 32 bit hosts.Michael Bruning2015-11-041-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Change-Id: If313188cdcc4634c3c9bf9dad6d2dce229fa3faa Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Properly mark value based classesKai Koehne2015-11-026-2/+27
| | | | | | | | | | | | | | | | | | | | | Change-Id: I937ce0daf2fa73d7179a5f62585abfb1acea7264 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Revert "Remove rpath workaround from QtWebProcess build."Michael Bruning2015-10-301-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not work properly with the new rpath logic and causes problems with the installer packages. This should be a temporary fix until the rpath situation has been cleaned up again. This reverts commit 819279827a4ce05562909994468ec5604392c672. Change-Id: I082ba0118d410f90d202c786d07717bf224d5f70 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Use consistent naming of Qt-specific Chromium classesAllan Sandfeld Jensen2015-10-2912-73/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | Most of our Qt specific versions of Chromium classes have Qt appended, but a few observers have it prepended. This patch renames them to keep naming consistent. Change-Id: I004b61e16bc47f39a6bbc16a5f5c10585626865c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Update Chromium SHA1Allan Sandfeld Jensen2015-10-281-0/+0
| | | | | | | | | | | | | | | | | | | | | Pulls in the lastest 45-based SHA1 Change-Id: I7111143db7697cfa3861ba26255102717d1d39e2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Joerg Bornemann2015-10-286-7/+177
| |\ \
| | * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-286-7/+177
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
| | | * Fix touch events coordinates when using custom devicePixelRatioChristophe Chapuis2015-10-271-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-48766 Change-Id: Idcae6dc84829fe96db62c6cb30ab193873d36709 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | | * Include memory leak fix in the 3rdparty submodule.Michael Bruning2015-10-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the backported fix from newer Chromium versions. Task-number: QTBUG-48822 Change-Id: If9c5746b350840ae1fdbd5331dd2abb8e6118b8a Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | | * Update qtwebengine-chromium sha1.Michael Brüning2015-10-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to include a fix for windows developer builds. Change-Id: I341167adc89e1dec05180f48194c0c22b3a3a77a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Set off-the-record to true as documentedAllan Sandfeld Jensen2015-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API had no way of setting off-the-record, because the constructor meant for it set it to false. The patch fixes the constructor and adds basic API tests for the QWebEngineProfiles. Change-Id: I407eb4a4b0524b6c4eb944d17d744620dd9db6fb Task-number: QTBUG-48724 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | | * make the render process DPI-awareJoerg Bornemann2015-10-133-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, system calls that retrieve screen properties (like GetSystemMetrics to get the size of a scroll bar button) are dependent on the DPI awareness setting of the calling process. The render process must use the same DPI awareness setting as the browser process. Retrieve the DPI awareness of the parent process in the render process and set it accordingly. Task-number: QTBUG-48380 Change-Id: Ic17d29d0f584e3cf230ac6ea2b08e3aa0d87ccdd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * [Doc] Correct the name of WebEngineNewViewRequest::userInitiated QML property.Michael Brüning2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was named isUserInitiated, which is the name of the C++ method used internally, not the name of the QML property. Task-number: QTBUG-48699 Change-Id: I82d69e3c2e011f1cffadc106322709d2b22ef275 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | | Support IOSurface framesAllan Sandfeld Jensen2015-10-283-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support getting video as IOSurface frames on OS X. With Chromium 45 we only get IOSurface frame when using non-default command-line flags. Change-Id: Ibf5226db53fa6fb51112bec9061d701918798ddd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Update plugins.qmltypesKai Koehne2015-10-281-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d628d9d2aab7c1b8144d79d8ce9d5dabdb99f32 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | | Remove left-overs of QWebEngineUrlSchemeHandlerPrivateAllan Sandfeld Jensen2015-10-282-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class no longer exists, these appears to have been overlooked when it was removed. Change-Id: I0f3632ac075f8e59bdb40b4178094fbb2cb348e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Add namespace to the specialized QSG nodesAllan Sandfeld Jensen2015-10-284-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QtWebEngineCore namespace to classes I missed earlier. Change-Id: Ia40b03c58e0aec858e8fbe9a8fdb532349353046 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Use web_cache componentAllan Sandfeld Jensen2015-10-287-3/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Use the web_cache component which monitors and adjusts the web cache, so that the memory use is limited across multiple renderer processes. Change-Id: I9faa060d48f99a3c527fe0e0963bbe86db4b502c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Revert "Fix build with freetype2 depending on harfbuzz"Allan Sandfeld Jensen2015-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should trust the global Qt configuration, the same issue should have been solved in qtbase already. This fixes RedHat builds where FreeType2 reports a wrong version. This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c. Change-Id: I662105521b277585c83335e20831692f990e4dc1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Compilation fixes for MSVC 2015 (64 bit)Kai Koehne2015-10-231-0/+0
| | | | | | | | | | | | | | | | | | | | | Take in compile fixes for new ninja, and MSVC 2015 (64 bit). Change-Id: Iaa2531a507e2c7034dfe39813c952d7ad75e7285 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Remove revisioning from WebEngineSettingsSzabolcs David2015-10-232-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use revisions in uncreatable types because QTBUG-40043 is affecting our API. Change-Id: Id9bf18fe8cfda590079ed72d7ca8b1c298aff90e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Remove const from QWebEngineCookieStoreClient::FilterRequest in ↵David Rosca2015-10-233-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setCookieFilter callback FilterRequest can be rejected by changing FilterRequest::accepted to false, so it should not be const. Change-Id: I87cd0f97dd442c6676aeeda9e1cbeb582eb06741 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Add missing const declaration to new virtualAllan Sandfeld Jensen2015-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | OpenClientNativePixmapDevice() as the only pure virtual method is const. Change-Id: Ic5843bcc4682f906a028ec5c6d7615dd407f57fb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add deployment information to documentation.Michael Bruning2015-11-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously unmentioned in the docs that the user needs to deploy QtWebEngineProcess. Change-Id: Iaff674036affc19f28a41273b4230d3dbeffe2b7 Task-number: QTBUG-44222 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | | Add MediaCaptureEnabled setting to the web engine settings.Michael Bruning2015-11-168-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Defaults to off. Change-Id: I416116ce07c8b7f5b24ad6e329390358406eadca Task-number: QTBUG-48801 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | register WebEngineView 1.3Joerg Bornemann2015-11-162-1/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ie7aeacfc0b96f208bd3e71a392500a3c9dfacfec Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | fix includes in UIDelegatesManagerJoerg Bornemann2015-11-162-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary includes and move as many as possible to the implementation. Fix local/global includes. Change-Id: Ia1efe447ed83d436997616a3c6a02ed30d9965d2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | [Windows] Fix build on 32 bit hosts and update src/3rdparty.Michael Bruning2015-11-142-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Also updates 3rdparty submodule to enable builds with MSVS2015 and let the merge from 5.6 to dev pass the CI. Change-Id: Ifb31a0e379c978b238b3437170c53a02cbde0349 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Fix JavaScript injection for Chromium 47Allan Sandfeld Jensen2015-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default Chromium does not allow injecting javascript, however since this is a standard webview feature they have a function the Android WebView calls to allow it anyway, which we can also use. Change-Id: I692864bb78e177c2da07a9a80e756e4f10ec1a32 Task-number: QTBUG-49235 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Update Chromium SHA1Allan Sandfeld Jensen2015-11-061-0/+0
| | | | | | | | | | | | | | | Change-Id: I0b9710a221ebd85b71b96c1a8b664b0792428cab Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Implement missing stubs for embedded linuxAllan Sandfeld Jensen2015-11-052-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Adds stub implementations of methods needed in the embedded linux configuration. Also fixes OpenSSL desktop linux build. Change-Id: Icf4b9a24f7a83bb171d29a8c4693c72cd321eb94 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add dummy implementations for new pure virtuals.Michael Bruning2015-11-022-1/+8
| | | | | | | | | | | | | | | | | | | | | The missing implementation made the merge from 5.6 fail. Change-Id: I974e71c276e3b103f217aa06f0d9a7d5b9313ac8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Fix components strings dependenciesAllan Sandfeld Jensen2015-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling localized_error needs to depend on the components strings to avoid a race-condition while building, and repack_locales needed to be updated to include them into the our locales pak. Change-Id: I3250b2bbad717f560eeaaf31d59e45167225191e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-2733-126/+115
| | | | | | | | | | | | | | | | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 14:32:08 +0000