summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-11/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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>
* | | 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-8/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-251-4/+4
|\| | | | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
| * Switch BrowserContextAdapter to QSharedPointerAllan Sandfeld Jensen2016-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | BrowserContextAdapter is not a form of shared data, and using QExplicitSharedDataPointer on it as always been a misuse of the class. Instead we should switch it to QSharedPointer, which also allows us to use QWeakPointer. Change-Id: I8eb489b4a12d3fdddcde55821be294814a156a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-181-4/+19
|\| | | | | | | Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
| * Avoid crashing if WebContext is accessed before initializedAllan Sandfeld Jensen2016-04-111-4/+19
| | | | | | | | | | | | | | | | | | While it is better to use the global shared OpenGL context, we can fall back to using the module type which is usually correct. Change-Id: I441bfdc38db593abfd10cb08ba90af09dcd31a2a Task-number: QTBUG-51379 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-8/+20
|\| | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Fix crashes due to qputenv being called after Chromium initialization.Alexandru Croitor2016-04-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qputenv() call inside gl_surface_qt.cpp, which is executed on a GpuChildThread, can reallocate the process environment structure, and it is possible that at the same time the main thread calls getenv, which will dereference a pointer to the freed environment structure, essentially causing a use-after-free crash. Make sure the qputenv() call happens before Chromium initialization starts, so no thread-race can occur. Change-Id: I4ecbdc8bf2abbe45f7d6c5d2633dc9fe27f51e66 Task-number: QTBUG-52124 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> (cherry picked from commit 76c61aa1400ef2def204c3732e30e08e40631e8d)
| * Fix CommandLine initialization on WindowsJoerg Bornemann2016-03-311-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Enable Viewport Meta support for Embedded platformOtavio Salvador2016-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | The Viewport Meta is enabled in Android so we ought to do the same for Qt's embedded platform. Task-number: QTBUG-50903 Change-Id: I0d5aab42e740cc00eb2d9111953577019211bf11 Reviewed-by: Otavio Salvador <otavio@ossystems.com.br> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix crashes due to qputenv being called after Chromium initialization.Alexandru Croitor2016-03-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qputenv() call inside gl_surface_qt.cpp, which is executed on a GpuChildThread, can reallocate the process environment structure, and it is possible that at the same time the main thread calls getenv, which will dereference a pointer to the freed environment structure, essentially causing a use-after-free crash. Make sure the qputenv() call happens before Chromium initialization starts, so no thread-race can occur. Change-Id: I4ecbdc8bf2abbe45f7d6c5d2633dc9fe27f51e66 Task-number: QTBUG-52124 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Enable sandboxing for OSX and Linux.Alexandru Croitor2016-03-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | Remove the --no-sandbox option when starting the Chromium render process and set --disable-setuid-sandbox, so that on Linux a SetUID sandbox is not used, because Qt WebEngine does not have a separate SetUID binary. Task-number: QTBUG-50708 Change-Id: Ibadfc6e25c89bd99ec8aa20dc15de4688c35d386 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix CDM plugins not always being loadedJocelyn Turcotte2016-03-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue in a similar fashion to what Chromium is doing in chrome/browser/download/download_target_determiner.cc. PluginService::GetPlugins is the only way that the plugin info can be loaded. Since we can't do it on demand from the IO thread in a synchronous handler, do explicitly during the WebEngineContext initialization. Task-number: QTBUG-50132 Change-Id: I8ed796b541c880caf8546230b3a5011047eb0fe3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update GL mailbox synchronization to Chromium 49v5.7.0-alpha1Allan Sandfeld Jensen2016-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | Chromium 49 switched to using SyncToken, making our old model based on sync-points obsolete. This patch rewrites our syncing to instead take advantage of new Chromium API for waiting on sync tokens. It also moves the creation of the GLFences we use out of Chromium. Task-number: QTBUG-51173 Change-Id: I04d726d4bc81bf6b7fe39bb2b5507e84a0b6991e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Basic adaptation to Chromium 49Allan Sandfeld Jensen2016-03-071-1/+1
| | | | | | | | | | | | | | | | Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Include printing sources and enable printing for desktop platforms.Michael Bruning2016-02-101-0/+13
| | | | | | | | | | | | | | | | | | | | | | Also adds Qt specific core classes for printing as well as adding printing related objects to the web engine context and including the printing sources in the builds for the desktop platforms. Also updates src/3rdparty submodule SHA-1. Change-Id: I9c2631c59f63571c0840d838077e66122bacc741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Unify license header usage.Jani Heikkinen2016-02-011-11/+14
| | | | | | | | | | | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-121-7/+11
|\| | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * Use QOpenGLContext::isOpenGLES() to check if OpenGL ES is enabledSiteshwar Vashisht2015-12-211-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLContext::openGLModuleType() performs a general check whether OpenGL ES support is enabled or not. However it is possible that a specific OpenGL context does not have OpenGL ES support enabled even when QOpenGLContext::openGLModuleType() returns QOpenGLContext::LibGLES. In such situations QOpenGLContext::isOpenGLES() method is correct way to determine if the context is an OpenGL ES context. Task-number: QTBUG-50015 Change-Id: I319c2932a62027d3142040045a46cdcb12fcdebe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-201-1/+1
|\| | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * Replace QList with QVectorKai Koehne2015-11-061-1/+1
| | | | | | | | | | | | | | | | 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>
* | 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>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-4/+9
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* fix crash on exit when using the inspectorJoerg Bornemann2015-09-011-0/+1
| | | | | | | | | Destroy the DevToolsHttpHandler early on, because ~DevToolsHttpHandler assumes the browser's UI thread is still running. This fixes a crash on exit in tst_inspectorserver. Change-Id: I98476231b709d60c249e58e17b09de70aed6792b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-08-181-1/+18
|\ | | | | | | Change-Id: I9977663123560a22f493b8c02d02de8897b38666
| * Fix single-process modePeter Varga2015-07-141-1/+18
| | | | | | | | | | | | | | | | | | | | Destroy RenderprocesHostimpl first then the WebEngineContext. RenderProcessHostImpl's destructor may use the default BrowserContext stored by the WebEngineContext. Task-number: QTBUG-45722 Change-Id: Ide8875a89bd339ecf65ddd32a5f00842102c1c43 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove --enable-viewport-meta switch on embeddedAndras Becsi2015-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This breaks the initial scale of some pages on embedded Linux and is mostly tied to Android codepaths in chromium and might be removed soon from public switches. See: https://code.google.com/p/chromium/issues/detail?id=513214 and: https://code.google.com/p/chromium/issues/detail?id=232102 Change-Id: I9eb6577bcc9c3aeb583ac6576e9de34c230c36c3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge Chromium 44 and fixesAllan Sandfeld Jensen2015-07-061-6/+4
|\ \ | | | | | | | | | | | | | | | | | | Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch, which contains all the patches to build against Chromium 44. Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
| * | Other changes for Chromium 44Allan Sandfeld Jensen2015-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | Minor changes for Chromium 44 that didn't fit in anywhere else. Change-Id: I569422239acd077e33e1878a1d5dc7afeac0bea6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * | Update remote inspector for Chromium 44Allan Sandfeld Jensen2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Handle changes in modules, API and ownership of inspector related classes. Change-Id: I8faa7f22b50828edeac450cc34c151fbb2c45a0c Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
| * | Trivial changes for Chromium 44Allan Sandfeld Jensen2015-06-231-3/+3
| |/ | | | | | | | | Change-Id: I8261b201f1d6623eff3427b68b8d098c17d293d3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* / Make it possible to run applications with chromium embedded optionsAndras Becsi2015-06-301-15/+19
|/ | | | | | | | | | | | This patch adds --enable-embedded-switches command line switch to enable all the embedded switches on startup instead of during compile time. Among others this enables pinch-zoom, viewport and impl-side painting, to make it easy to run an application with these settings even if the library was not cross-compiled. On embedded these are enabled by default and can be disabled by --disable-embedded-switches. Change-Id: I366ed243f1b0e17cbeb900e672d0e15fb4a2b8b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-141-7/+0
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Clean up global profiles and ownershipAllan Sandfeld Jensen2015-03-121-4/+6
| | | | | | | | | | | | | This patch removes the unused global off-the-record browser-contexts and changes all browser-contexts to be ref-counted by an API level profile. The API default profiles are now owned by a global QObject and are deleted on exit. Change-Id: Id7c9eafa24829118105f58b66663a6348216823d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add namespace to internal QtWebEngine APIAllan Sandfeld Jensen2015-03-021-0/+2
| | | | | | | | Adds the QtWebEngineCore namespace to all internal core API. This ensures we don't export any internal symbols in the global namespace. Change-Id: I26af888ea7c6c4c4d0f04c24a377c1a9d3c92751 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix the build on eLinuxAndras Becsi2015-02-201-5/+3
| | | | | | | | | | | | | Update ozone layer to the new snapshot, update the embedded_linux.pri configuration, fix the GLSurfaceQt build on non-x11 linux and update embedded command line switches for the 40.0.2214-based chromium snapshot. This patch also updates the snapshot sha1 to include required chromium changes. Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | 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: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* [Windows] Enable WebGL and accelerated 2D Canvas.Michael Brüning2015-01-231-9/+0
| | | | | | | | | Now that we are using Chromium's SW compositor when using an ANGLE-based Qt build, it should be safe to re-enable those. Change-Id: Ib87ef38a5a381a389fef7e092328c9c5d116aa4e Task-number: QTBUG-42182 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Replace the inspectable property with an environment variableJocelyn Turcotte2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would enable or disable the inspector globally when the inspectable property was set on a WebEngineView, overwriting the value previously set by other pages. Instead of havind default port for the debugging server and having to enable debugging on individual pages, use an environment variable, QTWEBENGINE_REMOTE_DEBUGGING, to enable the debugging server for the whole application at the same time as specifying the port. The format is the same as for QTWEBKIT_INSPECTOR_SERVER in QtWebKit. QTWEBENGINE_REMOTE_DEBUGGING is set by default in quicktestbrowser to ease development. This also keeps the input reading from the --remote-debugging-port command line switch for convenience, but its usage should be considered internal. This patch also take the opportunity to remove the unused DevToolsHttpHandlerDelegateQt::m_browserContext and to move the ownership from ContentBrowserClientQt to WebEngineContext since the list of inspectable pages isn't bound to the BrowserContext anyway. Change-Id: I772687f88f4feee0cc14dd182b0129cc0ea384dd Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix gcc warning 'may be used uninitialized'Andras Becsi2015-01-201-1/+1
| | | | | | | Initialize glType to make gcc happy. Change-Id: I558ac822666d54a623e68cd2182895b05ba410c0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scoped_refptr operator for implicit conversion to pointer has been disabled upstream: https://codereview.chromium.org/510323002 * Group permission API as done upstream: https://codereview.chromium.org/622793002 * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): https://codereview.chromium.org/457103003 * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002 * Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002 * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate https://codereview.chromium.org/560323005 * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: https://codereview.chromium.org/449743002 * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. https://codereview.chromium.org/569713002 * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. https://codereview.chromium.org/607843002 * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. https://codereview.chromium.org/501503003 * MotionEvent::Cancel and Clone are not virtual anymore. https://codereview.chromium.org/502993004 * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. https://codereview.chromium.org/558913003 * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use configure.py --bootstrap instead of bootstrap.py Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-161-0/+1
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Tell the ContentMainRunner to not reset signal handlers in the browser process.Michael Brüning2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | This prevents problems when QProcess::waitForFinished is used from the same application as QtWebEngine. Updates the src/3rdparty SHA1. Change-Id: I373456b1ef9f65e55b89acd877b15e7115516d6b Task-number: QTBUG-42747 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-141-0/+4
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 05:40:11 +0000