summaryrefslogtreecommitdiffstats
path: root/src/core
Commit message (Collapse)AuthorAgeFilesLines
* Fix QDoc warning for QWebEngineUrlRequestInterceptor.Michael Bruning2016-02-041-0/+3
| | | | | | | Explains the info parameters internal change tracking. Change-Id: I19c8f96d8ecd0b2dc8a56d3d01cc91dd2b664abd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Add SUBDIRS in correct orderSamuli Piippo2016-02-041-2/+2
| | | | | | | | | | To workaround qmake issue, the SUBDIRS need to be in correct order. Otherwise recursive qmake call will fail with: Project ERROR: Unknown module(s) in QT_PRIVATE: webenginecoreheaders-private Task-number: QTBUG-45706 Change-Id: I0f70b468fa306406036c0425fc7ae7e7a4f0cfc7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix build against Qt 5.5Allan Sandfeld Jensen2016-02-042-0/+4
| | | | | | | Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5 Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Disable WebSpeechAllan Sandfeld Jensen2016-02-012-2/+2
| | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Disable printing in ChromiumAllan Sandfeld Jensen2016-01-315-0/+16
| | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix crash on exit for view-owned QWebEngineUrlSchemeHandler objectsJoerg Bornemann2016-01-282-3/+4
| | | | | | | | | | | | | | For view-owned URL scheme handlers the destructor would remove the handler and then trigger URLRequestContextGetterQt::generateStorage. This would access the browser context from the IO thread while it already has been destroyed on the browser thread. Increment the ref count for the browser context before every call of generateStorage, and decrement it when generateStorage is finished. Task-number: QTBUG-50160 Change-Id: Id8b1505891ec56e93bf9d47f33bb8bc3304eb55a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix multi-thread protection in custom url handlerAllan Sandfeld Jensen2016-01-275-96/+206
| | | | | | | | | | The classes were not properly protected against race conditions. To solve this there is now a class shared between the two thread that is not deleted until the classes on both threads have been deleted. Change-Id: I499bd98805ae7a195aca42f30610eb6c2b0fd0f7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix occasional "WeakPtrs must be checked on the same sequenced thread."Joerg Bornemann2016-01-262-11/+9
| | | | | | | | | | | Revert 7c7ee9a9, and fix the issue by passing a raw this pointer to startAsync. Bind will take care of calling AddRef/Release for us. Otherwise the WeakPtr would get assigned to the UI thread and must be invalidated in the same. Change-Id: Iee741dde521cf085a086e397a8154fa1384d58d1 Task-number: QTBUG-49670 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Copy all resource files to build directoryKai Koehne2016-01-231-8/+17
| | | | | Change-Id: I1a4b96a2a695b4be4e936275c59f939b887098d1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix asserts in touch handlingKai Koehne2016-01-231-1/+3
| | | | | | | | | | | Generate touch events with the "causesScrollingIfUncanceled" property set to true. This is checked by TouchEventQueue::TouchMoveSlopSuppressor Task-number: QTBUG-50511 Change-Id: I5260100db75ed7afdd7afeff8f530221c22090b0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Add the Google Chrome path for pepper Flash on LinuxJocelyn Turcotte2016-01-221-1/+2
| | | | | | | | This is the path used when installing the official Chrome deb packages on Ubuntu. Change-Id: Iaa30c1df17ba2c6d069d17f828ecbbd26d16237b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix deadlock on QWebEngineUrlRequestJob::failJoerg Bornemann2016-01-221-4/+8
| | | | | | | | | | | URLRequestCustomJob::notifyFailure calls NotifyStartError(status), which in turn will result in a call to URLRequestCustomJob::Kill. We must release the lock of m_mutex before calling NotifyStartError, otherwise m_mutex.lock() will wait forever in Kill. Change-Id: I319e45049766c2192dfc46a91b352b92ec677bc6 Task-number: QTBUG-50160 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Avoid full storage update on installing URL scheme handlersJoerg Bornemann2016-01-193-3/+10
| | | | | | | | | | | When installing/removing URL scheme handlers, do not update the full URLRequestContextStorage. Only update the job factory. This avoids calling the - potentially expensive - generateStorage() method superfluously often. Change-Id: I99c4ec479fcfdee4e97d86b858ea42f3cdccfec4 Task-number: QTBUG-50160 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Widgets: Improve geometryChangeRequested signalSzabolcs David2016-01-193-1/+14
| | | | | | | | | Use this signal to notify the user on JavaScript window move/resize requests. It works only for windows opened by JavaScript (according to the Chromium browser's behavior). Change-Id: I7fdeda4c252cc4badb36b74ed61d947be690f45a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: remove docs for QWebEngineCookieStore::FilterRequest classLeena Miettinen2016-01-191-32/+0
| | | | | | | The class and its members were removed. Change-Id: Ib8e892da1f9e10ffcf9861f75615ef48d3697886 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists()Anton Kudryavtsev2016-01-192-4/+4
| | | | | | | and QFile::exist(f) instead of QFile(f).exists(). It's faster. Change-Id: I2d5ffb2e64a547d3c703ad048ef0c75a7ccfe0d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2016-01-181-9/+28
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2016-01-181-9/+28
| |\ | | | | | | | | | Change-Id: I591be7a7131d85a269bf12fbd5c47a0ccf6ce574
| | * Update key code mappings using QtWebkit mappings as reference.Alexandru Croitor2016-01-121-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copy additional key code mappings from PlatformKeyboardEventQt.cpp. Also add a mapping for missing numeric keypad equals key. Change-Id: Ia6c4413795293be84bcd8ea9d981d8cdfb94509b Task-number: QTBUG-50401 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Send proper key codes for KeyEvents to WebKit.Alexandru Croitor2016-01-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few KeyEvents to key code mappings were incorrect or missing. Fix them. Change-Id: I74087768fddd467993f04ed8b4c2dc6345d20e8a Task-number: QTBUG-50354 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Correct QWebEngineUrlRequestInterceptor documentation.Michael Bruning2016-01-181-3/+1
|/ / | | | | | | | | | | | | | | | | | | The documentation was still based on the initial version of the method, where it had to return a boolean value. This is no longer the case and hence removed from the doc. Change-Id: Ica1e4a769631c0169bc5e59abd54c25a416cf4a9 Task-number: QTBUG-50513 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove FilterRequest from qwebenginecookiestoreMichal Klocek2016-01-154-51/+2
| | | | | | | | | | | | | | | | | | | | OnCanSetCookie and OnCanGetCookies should both be mapped to API. Since the other call is missing (filter cookies which should be send) remove existing one from 5.6 Change-Id: I4f42c4a1fee6add7a5efffaf4c38877a1f35ce61 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove callback functions from qwebenginecookiestoreMichal Klocek2016-01-152-84/+33
| | | | | | | | | | | | | | | | | | | | Remove all callback api calls, rename getAllCookies to loadCookies, update documentation. New function name reflects the fact the cookieAdded signal is always emitted when cookies are loaded from the store. Change-Id: Iab7bb04871c7396d2e23306a10084d425426a19f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix crash in BrowserContextAdapter::removeCustomUrlSchemeHandlerJoerg Bornemann2016-01-151-2/+2
| | | | | | | | | | | | | | | | Do not cache the end iterator, because erase might invalidate it. Do not increment the iterator in the erase case. Change-Id: I1cbad04fdaaf1bf4cfae252bb7569d817b6ab5a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix access of freed dataAllan Sandfeld Jensen2016-01-151-7/+7
| | | | | | | | | | | | | | | | | | The string parts inside the lambda construction were already freed, so instead use a simpler construction where we are sure we are still holding the stringlist. Change-Id: I3559ab9d203b368e2d62efef73497ce7f9135cc5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix access after freeAllan Sandfeld Jensen2016-01-151-2/+7
| | | | | | | | | | | | | | | | | | If deleteLater is called from the destructor of LocationProviderQt, QtPositioningHelper shouldn't be accessing LocationProviderQt from its destructor. Change-Id: I1f2344edc1918fcfa566c3cd6045694cabf89768 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Have a WeakPtrFactory per thread in URLRequestCustomJobJoerg Bornemann2016-01-152-8/+11
| | | | | | | | | | | | | | | | | | | | We must separate WeakPtrs per thread. Otherwise we run into a DCHECK in weak_ptr.cc: "WeakPtrs must be checked on the same sequenced thread.". Done-by: Allan Change-Id: I6ae971b01fb8f8ecda13e50798d6315dcf19d96e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix access violation error because of access to an invalid QString.Alexandru Croitor2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Commit 6ed125c0073288f46e544b9d415d1f9a9968cb2d introduced the usage of QT_USE_QSTRINGBUILDER, which caused an issue in BrowserContextAdapter::httpAcceptLanguageWithoutQualities, incorrectly deducing the return type of the lambda. Fix consists in explicitly setting the return type of the lambda to QString. Change-Id: If3f8992e031838e899d35bcd2f962d051976a8f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Move ICU data to resources sub-dirAllan Sandfeld Jensen2016-01-112-12/+16
| | | | | | | | | | | | | | Also moves the ICU data from the prefix root to the resources subdir. Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-112-0/+5
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
| | * Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-222-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening a new tab by middle clicking on a link in a web page, two MouseMove events are sent to Chromium consecutively, without getting proper acknowledgment events, which causes further move events not to be handled properly. Fix consists in preventing the second move event from being sent. Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9 Task-number: QTBUG-50031 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Implicitly use QStringBuilder in all modulesJoerg Bornemann2016-01-095-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every Qt module is built with QT_USE_QSTRINGBUILDER by default. Also define QT_USE_QSTRINGBUILDER in the core API library. Remove superfluous qstringbuilder.h includes. Keep the use of operator% to make sure that QT_USE_QSTRINGBUILDER won't vanish in future build system changes. Change-Id: I41fd036fc4e6063951cd758aaafdf9aefed7dd5a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Simplify search for Flash plugin on WindowsKai Koehne2016-01-081-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for C:\Windows\SysWOW64 is actually non needed, because 32 bit apps will automatically see this directory as "C:\Windows\System32" on 64 bit Windows. Change-Id: Ic2e847a287632955970893be91b00489dd7ab0a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Fix resources location for developer buildsJoerg Bornemann2016-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The pak files must be in a "resources" sub-directory since commit d18b3e7c. Change-Id: Ia5191b1c532cf630be8c2d123261421a39d6a5ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Enable loading of Flash plugin on Windows 64 bitKai Koehne2016-01-071-2/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | The pepper plugin is available on 64 bit in C:\Windows\System32\Macromed Also do not give up after finding a candidate file (because it might be the wrong bitness). Change-Id: I70af34fbcabeec792e8c74d8010476477c6e91dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Install qtwebengine resources in a sub-directoryAllan Sandfeld Jensen2016-01-062-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | Moves the qtwebengine resource files to a resource sub-directory so they are not installed in the prefix-root. At the same time the search of them is improved, so application developers can install them in the application dir, even if the prefix dir exists. Change-Id: If64f16ae6ee924c66fb0a0b024bca2caa6400ee3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Propagate qmake's warnings-are-errors settingAllan Sandfeld Jensen2016-01-061-0/+2
| | | | | | | | | | | | | | | | Disable -Werror when Qt is configured to not use it. Change-Id: Icc4d291cf941fc27b19aa2170796985c20eced8e Task-number: QTBUG-50254 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix more syncqt warningsAllan Sandfeld Jensen2016-01-0510-9/+21
| | | | | | | | | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix an assertion in QWebEngineCookieStoreSzabolcs David2016-01-054-2/+19
| | | | | | | | | | | | | | | | | | | | Don't process pending cookies after resetting the CookieMonster to 0 in the CookieMonsterDelegateQt. We are destroying the old cookie store, so we can reject the pending cookies here. Task-number: QTBUG-50160 Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | 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>
* | Use default URLRequestInterceptors passed from ChromiumAleksey Yermakov2015-12-165-14/+29
| | | | | | | | | | | | | | | | | | | | | | Default URLRequestInterceptors are required for App Cache and Service Workers support. They were previously ignored and dropped in BrowserContextQt::CreateRequestContext. Implementation in content shell was taken as a reference. Change-Id: I5a12e90febdb4c639f9ead9faf044df09431bdd0 Reviewed-by: Aleksey Yermakov <jp.kuraisu@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Move WebEngine initialization to core libraryAllan Sandfeld Jensen2015-12-152-0/+95
| | | | | | | | | | | | | | | | This means QtWebEngineWidgets no longer needs to depend on and link to the QML API. Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix some syncqt warningsJoerg Bornemann2015-12-113-0/+26
| | | | | | | | | | | | Change-Id: I9f224e96138117bdf202084231ce6c805e15f5b2 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make use of QObject's d-pointer in QWebEngineCookieStoreJoerg Bornemann2015-12-104-12/+10
| | | | | | | | | | | | | | | | | | This safes us from managing d_ptr/q_ptr pairs and saves a bit of memory. Change-Id: Icdd692c5ddf0980de980bebb691ecf51b738acaa Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-092-24/+81
|\| | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| * Reuse or clean up HttpNetworkSession when (re-) setting a cache type.Michael Bruning2015-12-042-24/+81
| | | | | | | | | | | | | | | | | | | | | | Not reusing or cleaning up the session led to race conditions which in turn lead to crashes and asserts. Reuse the session if parameters match, clean up and it recreate otherwise. Task-number: QTBUG-49397 Change-Id: I4f846a448b50d80a3cf7c4f9bb833fa6d64974d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix embedded Linux debug buildJoerg Bornemann2015-12-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The icu header files are picked up from src/3rdparty/chromium/third_party/icu, but the syroot's icu libs were linked. Do not claim to support linking against the sysroot's icu. This never worked properly in 5.5. Task-number: QTBUG-49693 Change-Id: I7dca37ecefbc5b1dabfadf86540442b8face8347 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make the MIME-type of downloads availableAllan Sandfeld Jensen2015-12-072-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An application currently have to rely on suggested filename only to guess the type of a download. This is often insufficient when the suffix is misleading or missing. This patch adds the mimetype to the reported metadata and also adds a mimetype appropriate suffix to suggested filenames. Task-number: QTBUG-48206 Change-Id: I4c70f076d6eb5ae820fd6b7f568515eeb7c18df5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: mark QWebEngineUrlRequestInfo::changed() internalLeena Miettinen2015-12-031-0/+3
| | | | | | | | | | | | | | ...to stop QDoc from printing an error. Change-Id: I22ac3d94e4f8ad53c0bfbda97a71c615a43a2262 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>