summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Disable accelerated 2D canvas rendering with ANGLEJocelyn Turcotte2014-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | ANGLE isn't thread-safe and we're already taking a risk by letting Chromium do texture upload from the GPU thread with a shared GL context. Any kind of drawing happening concurrently between the GPU thread and the Qt scene graph thread might currently end up drawing on the same device context and this is creating visual artifacts and Direct3D errors. We're already disabling WebGL but we should also disable accelerated 2D canvas rendering to lower that risk. We should ultimately disable ANGLE from within Chromium or fix multithreading issues to properly support GL rendering scenarios across threads. Task-number: QTBUG-41627 Change-Id: I37a7a778f0e1066a454f51bb38e98df4dea8767e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-107-26/+43
|\ | | | | | | refs/staging/5.4.0
| * Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-107-26/+43
| |\ | | | | | | | | | Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0
| | * Cache to QStandardPaths::CacheLocationAllan Sandfeld Jensen2014-11-074-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should save our cache in the configured CacheLocation, and ensure we are prepared for multiple BrowserContext by caching to a Default subdir. This matches how chromium caches on linux. Change-Id: Ibe914fca35435ea1658565be87747cfabc71e97b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Fix enum names of audio/video featuresAllan Sandfeld Jensen2014-11-073-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature enum names and documentation gave the impression it could control audio and video output, while they only control input. Also removed documentation of non connected feature permissions for Notifications and GeoLocation. Change-Id: Ia35142ca691ebd6059b7472e9803fda8cbd84813 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | | Update snapshot sha1 to include various crash fixes for the release.Andras Becsi2014-11-101-0/+0
|/ / | | | | | | | | Change-Id: I2d04e910c7a08e1c630bc490d1f8b1be3d27a6f1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix crashes in QQuickWebEngineSettingsPeter Varga2014-11-061-0/+1
| | | | | | | | | | | | | | | | Remove QQuickWebEngineSettingsPrivate object's pointer from the global setting list before the object is destructed. Change-Id: I1cca6bf8aa2438903692d9e2ef863c8fc543adbd Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Deploy external data in QtWebEngineCore.framework for framework buildsJocelyn Turcotte2014-11-064-16/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no convenient way to deploy QtWebEngine into an application bundle on OSX. macdeployqt copies frameworks into a .app bundle's Frameworks directory but this makes no sense unless all the needed files are also distributed with the bundle. This patch moves: - The ffmpegsumo.so library into Libraries/ - Locale .pak files, qtwebengine_resources.pak and icudtl.dat into Resources/ - QtWebEngineProcess into its own .app bundle, itself into Helpers/ QMAKE_BUNDLE_DATA is used to copy files into the bundle while INSTALLS is used when installing normally. A LOCALE_LIST is explicitly listed since QMAKE_BUNDLE_DATA can't handle the * glob to match all source files. Change-Id: I5c0df57b4b9e93f9cce34a74a6e024bf90d37b5c Task-number: QTBUG-41611 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Move extra installs from core.pro to core_module.proJocelyn Turcotte2014-11-062-27/+26
|/ | | | | | | | | | core_module.pro is the one responsible for deployment of the binary so it makes sense to also let it handle the other files to install. This leaves core.pro to only handle sub-projects dependencies. Change-Id: Ibe433eceec7fb0a9f806dfa89dccb0bedeaccc59 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Optimize the QMatrix4x4 after a conversion from SkMatrix44Jocelyn Turcotte2014-11-031-1/+3
| | | | | | | | | This avoids using a General matrix for tile transformations which are usually only translations in our case. Change-Id: Ic947d7ef9b78de6d5d16ea718cc03255e38a8097 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update chromium submodule after adding fixes for MacOSX10.10.sdk.Zeno Albisser2014-10-291-0/+0
| | | | | Change-Id: I935ee10d10248ab525aca31c1b1c04d2927915c1 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Support Qt::AA_ShareOpenGLContextsPierre Rossi2014-10-291-4/+13
| | | | | | | | | | | | QtWebEngine::initialize happens after QGuiApplication instantiation, so it is too late to simply set the application attribute. In that scenario, we don't want to override the shared context and risk a double free when both QGuiApplication and our cleanup handler try to delete it. Change-Id: Id52884abbb0c2380208876d9c00e8ddbfbc21eda Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Make url handling consistent in widget and quick APIPeter Varga2014-10-285-7/+11
| | | | | | | | Use explicit url in quick API too and use GetLastCommittedURL instead of GetVisibleURL for getting the expected urls in tests. Change-Id: If3251323645979643f3dc0e16491fe35b584f51c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Display error if building for ARM architecture older than ARMv6Jonathan Liu2014-10-271-0/+1
| | | | | | | Chromium is only supported on ARMv6 and ARMv7 for ARM architecture. Change-Id: I0493c9ba2baf4a537f759286622056093c0d4a25 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Disable geolocationSzabolcs David2014-10-162-0/+24
| | | | | | | This prevents the crash when a webpage requests geolocation permission. Change-Id: I7331b869ec1439d678cee7941691289220718f3d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Allow building on boot2qt.Zeno Albisser2014-10-161-0/+0
| | | | | Change-Id: I91ce455ac5e3992e50d13c14f4035f91baad85bf Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add plugins.qmltypes for WebEngine APIMichael Brüning2014-10-151-0/+164
| | | | | | Task-number: QTBUG-41952 Change-Id: Ic21089a34364696c8ff7e68e397e39f8f0b7f5cc Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix ARM NEON detection for -mfpu=neon-vfpv4Jonathan Liu2014-10-151-1/+1
| | | | | Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix up coding style in GetNavigationErrorStringsPierre Rossi2014-10-142-28/+26
| | | | | | | | That code was borrowed straight from Chromium and used the Chromium coding style. Change-Id: I212aea23f19056b901cbc770640faed4998f02fd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add setting ErrorPageEnabledAndras Becsi2014-10-1410-2/+35
| | | | | | | | | This is required so that embedders can implement custom error pages, and is also needed for tests, where error-page loading has side-effects on subsequent page loads. Change-Id: I5ae276a58864a2fa9d7b608bea3340b482a92f4e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Disable Desktop Notifications.Michael Brüning2014-10-141-0/+1
| | | | | | | | | This should be removed once desktop notifications have been implemented. Task-number: QTBUG-41893 Change-Id: Ia004ee8946ae4441027161f5dddf05d304df8b1b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix localization on OS XAndras Becsi2014-10-132-9/+0
| | | | | | | | | We did not load any localization data on OS X until now, so the error page did not have any strings, and some tests asserted because of missing localization. Change-Id: Icb6de1f7e3aaa6815483d379efaf00e8ed6a1dbf Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Do not run Callback for already canceled URLRequests.v5.4.0-beta1Michael Brüning2014-10-101-0/+3
| | | | | | | Doing so causes a check to fail in URLRequest::BeforeRequestComplete. Change-Id: I487042b922b3f357bd8d9579167d9b372963ff29 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Bounds check the zoom factor before we pass it along.Pierre Rossi2014-10-101-0/+2
| | | | | | | As it turns out failing to do so can mess up the page state. Change-Id: I8cc785b01c73bde5443bdb78554d7b3809d96afe Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Notify canGoBack/canGoForward on urlChanged instead of loadingChanged.Jarred Nicholls2014-10-091-2/+2
| | | | | | | | | | | | In order to support Fragment (#) based routing and history navigation together, canGoBack/canGoForward properties should be notified when the url is changed instead of when the page is loading. Task-number: QTBUG-41849 Change-Id: Ic995fffa5c683dade88fbd98ffea90527a77261b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Jarred Nicholls <jarred.nicholls@gmail.com>
* Doc: Correct snippets for QWebEngineView API doc.Michael Brüning2014-10-091-4/+4
| | | | | | | | Those were using wrong action names and also the wrong trigger methods in the wrong context. Change-Id: If124bf7836a553dc4a632db208cee41fb998c622 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable Downloads for now.Michael Brüning2014-10-091-1/+0
| | | | | | | | | The current delegate just downloads files to the default download location. By not setting the delegate for downloads, we effectively disable them. Change-Id: I1b416f76ac9b4395ee0bcf9986134f4bf056d8ed Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Accessibility: Table interfaceFrederik Gladhorn2014-10-082-0/+232
| | | | | | | | | | | This is used to represent tables, lists and trees to screen readers. There are some properties still not implemented, notably selection which is also not available in blink. Change-Id: I57053881445e39a4967a1aabd85a594271402f63 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Replace QStringLiteral with QLatin1String where appropriateKai Koehne2014-10-076-16/+16
| | | | | | | | | It's faster to use QLatin1String in places where we don't actually need a QString object (like for comparison, or when creating a string with QStringBuilder). Change-Id: I9b8e28040dc2b79a767e15015b85822d06141bbe Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix WebContentsAdapater::requestedUrl() functionPeter Varga2014-10-071-2/+7
| | | | | | | | | | | | | | The requestedUrl function didn't return empty URL even if the empty URL was really requested. It was assumed if GetOriginalRequestURL returned empty string that means the requested url was not set in the navigation entry. This fix handles that case when empty url is set in the navigation entry as requested url. If the navigation entry is in pending state that means the request url has not been set yet thus the actual URL should be returned. Change-Id: Ic2eff5c487686f7c0e349a7a34a86b80551a002f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix loadFinished signal in case of interrupting error page loadingPeter Varga2014-10-071-0/+1
| | | | | | | | | | If the error page loading is interrupted by loading of another page the signals of the second page should not be suppressed. Change-Id: I537daabf80ffed005acaaf2a6019e52a3250c523 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
* Fix WebEngineSettings::setDefaultTextEncoding()Szabolcs David2014-10-071-1/+2
| | | | | | | | | | Add the missing default_encoding to the web preferences. Use a 0ms timer instead of the 100ms in order to apply the settings as soon as possible and avoid waiting mechanisms in the test. Change-Id: I12f1a6dd68b29c2b287b160eea1ad5a5fb169c14 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update build configuration for eLinux after update to Chromium 37.Zeno Albisser2014-10-063-1/+6
| | | | | | | | | | | | | | | | | | | | The build configuration requires the following changes: - toolkit_views=1: for native_theme_aura, as otherwise nine_image_painter_factory.cc would be excluded. - use_system_harfbuzz=0: we do not want to rely on this being provided on the system, therefore being explicit. - want_separate_host_toolset=1: assures that icuuc gyp target will be available. The file gl_surface_ozone.cc must be added to the exclusion list to avoid duplicate symbols with gl_surface_at.cpp. The defines EGL_API_FB and LINUX must be set to 1, to explicitly define that we are using EGL and are building for a linux target. Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* gfx::LoadLibrary has been replaced in Chromium by base::LoadNativeLibrary.Zeno Albisser2014-10-061-8/+14
| | | | | | | | Adding a local LoadLibrary function to wrap the new call to base::LoadNativeLibrary and do the error handling. Change-Id: Iaab23d3731508fbbf2dadb27d34c53fd65095830 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update OzonePlatformEglfs after update to Chromium 37.Zeno Albisser2014-10-062-6/+54
| | | | | | | | | | The Ozone platform base class has received several new pure virtual functions that needed to be implemented. Most of the functions are implemented according to how it is done in OzonePlatformGbm. Change-Id: Ibab75ae0891b67d03f705da611949ed6cf75ad9f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Doc: Fix issues in .qdocconf filesTopi Reinio2014-10-032-3/+3
| | | | | | | | | - Remove url variable (it's included from global doc config) - Fix qhp selector for QML types - Sort the examples in qhp Change-Id: I7f72aebe4f5482ac922a294ad156f8a73e4ccc6e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Use proper module name for Qt WebEngine WidgetsTopi Reinio2014-10-035-6/+12
| | | | | | | | | | Fix the name used for the \module command to include the module name to properly generate the C++ class reference page for Qt WebEngine Widgets, and link to the new page from the module landing page. Change-Id: If0814650fa16ecf1b5c66e8e46e598d576a8c21d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Provide a fallback for the QtWebEngineProcess executable path.Michael Brüning2014-10-021-5/+9
| | | | | | | | This makes deployment easier and was also what was done in QtWebKit for the WebKit2 WebProcess executable Change-Id: I2245c1f3337f19509c08c08c0baf40dc0a964890 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Update submodule SHA1 with Win64 desktop OpenGL fix.Michael Brüning2014-10-021-0/+0
| | | | | Change-Id: Ide283188e04ed4f6619040225c40c2e6850514c8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Create a QCoreApplication in QtWebEngineProcess as well.Michael Brüning2014-09-301-0/+5
| | | | | | | | | | | | A QCoreApplication is needed in order to correctly load the configuration from qt.conf and setup the Qt environment variables accordingly. This is important to be able to deploy applications. This patch creates a dummy QCoreApplication in process main to have the environment setup correctly. Change-Id: If536b9edf357d5925fee02f2528872101139f87e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Edited docs according to writing guidelines.Jerome Pasion2014-09-292-93/+85
| | | | | | | | | | | | | -added \since and added commands such as \readonly -converted enum values to use \value -edited language and other minor issues. -only the main Qt WebEngine, the widget docs will be edited later. Change-Id: Ifbb76a6472b5efede15daebc78d605b8b449d957 Task-number: QTBUG-40757 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Import the Qt WebKit porting guide from the wikiJocelyn Turcotte2014-09-293-1/+295
| | | | | | | | Also added a link to it in a new section briefly explaining the difference between Qt WebKit and Qt WebEngine. Change-Id: I89529c701e7f9faae1e4b7d15d5e5d6aec0c8f9f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Various doc tweaksJocelyn Turcotte2014-09-294-21/+10
| | | | | | | | | | | | - Fix the example pages titles to match the qdocconf files - Remove information not as relevant for QtWebEngine as it was for QtWebKit - Fix the QtWebEngineWidgets snippet not to refer to webengine - Remove the dead link and the reference to Arora from QtWebEngine Change-Id: Ib3c57c8dd534330b3323c94fb2217374b3e52cf9 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update chromium submodule.Michael Brüning2014-09-261-0/+0
| | | | | | | | This pulls in the changes to the .gitattributes and for disabling the gpu blacklisting for llvmpipe. Change-Id: Ie298901ec64802dbbd64399d080e01bb500b10e6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Win] Use automatic destruction for PbufferGLSurfaceWGL.Michael Brüning2014-09-261-5/+2
| | | | | | | | | | | | PbufferGLSurfaceWGL is a reference counted class, hence deleting it manually triggers an assert in debug builds if Release is not called or the reference count is non-zero. Using a scoped_refptr prevents this and deletes the object correctly. Change-Id: I7e5ff783afc367e06d872b8d118c2ff83627b836 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Prevent OS X from picking a wrong version of clang from the envAndras Becsi2014-09-261-0/+15
| | | | | | | | | | | Until now we relied on the PATH to pick the right clang version on OS X which turned out to be a source of issues on build nodes that have a lot of old cruft lying around which was picked up by gyp. Set make_clang_dir so that gyp uses the configured clang version from Qt and remove the env manipulation from our gyp script. Change-Id: I4ac679ea56fa874eecaa578aad77b462445c0caa Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Remove IOBlootooth.h import from chromium source.Andras Becsi2014-09-261-0/+0
| | | | | Change-Id: Iadd41a522aad40f7edf7205126d4824211f4c390 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Desktop OpenGL backend for WindowsKai Koehne2014-09-258-19/+151
| | | | | | | | Enabling rendering into a WGL backbuffer, in addition to the EGL/angle one. Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix issues on HiDPI displaysAndras Becsi2014-09-242-2/+5
| | | | | | | | | | | This patch fixes widgets rendering on HiDPI displays and notifies about the a potential device pixel ratio change when the window is moved. This addresses the blurriness when a web view is moved between an attached LoDPI screen and HiDPI screen resulting from the device pixel ratio not being updated. Change-Id: I97af0199c07deac8bbe4688c665aaa6df1608ae9 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix an assertion in web_content_delegates_qt.cppAdam Kallai2014-09-232-24/+30
| | | | | | | | If we get a replacement content, we can see a DidFinishLoad event for a frame. This error page should be ignored based on the frame. Change-Id: I3e1cd1773e8c5fc608605197c957011ddf258123 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 02:07:56 +0000