summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix callback mechanism in the WebContentsAdapterSzabolcs David2014-08-281-6/+6
| | | | | | | | When we dispatch a request, we register it's callback with different ID in the QWebEnginePagePrivate. Change-Id: I1fa1f778de66fbedbd6cce35f6c823d5640dbe5e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Cleanup use of QJSValue::engine()Pierre Rossi2014-08-281-1/+2
| | | | | | | | | | Not only this causes warnings because it is deprecated, it lead to a crash in our QML tests when the callback fails to return a valid engine instance. Change-Id: I9412f138f87c39fbee8dbb6121a5bf0a69dcfbb4 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update license headers.Pierre Rossi2014-08-285-71/+47
| | | | | | | | Because the files were recent additions or for other unclear reasons, not all the files were updated to reflect the license change. Change-Id: I6898f6f4f993f1efa9489382f0b94af285f8c4f5 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* [Win64] Make sure ninja is built in 64bit mode as well.Zeno Albisser2014-08-261-1/+5
| | | | | | Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* When comparing paths in python we have to use normcase.Zeno Albisser2014-08-262-5/+5
| | | | | | | | | | | | Chromium requires relative paths for output-dir and for generator-output. Also output-dir is expected to be a subdirectory of generator-output. This now allows building on windows without running qmake in recursive mode. Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable 64 bit builds on Windows.Michael BrĂ¼ning2014-08-261-0/+5
| | | | | | | | Ninja needs to have an _x64 appended to the configuration in order to build the 64 bit targets on Windows, as opposed to Linux and OS X. Change-Id: Idc9888c9f80ccb27d26fb86588ed39fba92a2c71 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Doc: Added some links among the pages.Jerome Pasion2014-08-262-1/+11
| | | | | | | | -increases visibility to those pages. Change-Id: I6b776157eee991907c8e2bc16c63df90a85663a3 Task-number: QTBUG-40757 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update the src/3rdparty submoduleJocelyn Turcotte2014-08-261-0/+0
| | | | | | | This includes the XCode 5.0 build fix. Change-Id: I99a5a9b64cc4b31f41cc94eea380a1d61d7f7218 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Use a relative submodule url for src/3rdpartyJocelyn Turcotte2014-08-261-1/+1
| | | | | | | | | | | Now that the CI configuration has been updated to support them, use a relative submodule URL to make sure that we use the same mirror for our submodule that was used for qtwebengine. Change-Id: I92215bd3caef2bb33820185572f5bb088718f61f Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Tweak the back and forward buttonsPierre Rossi2014-08-224-17/+79
| | | | | | | | | To have a more "discoverable" UX, and cleaner UI (requiring private QML API for now). Change-Id: Ic275287d429149a1c353a1cbdc5b7f9b19e57410 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable the Windows build on 64bit or non-angle configured QtJocelyn Turcotte2014-08-221-0/+4
| | | | | | | | Those configurations should be re-enabled once we support them properly. Change-Id: Id8019df8e0b34a2fb1a411780689f28def50546f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Update the version numbers for the WebEngine QML types.Zeno Albisser2014-08-211-4/+4
| | | | | | | | For the WebEngineVersionBumper we have to remove the major version bits after right shifting to determine the minor number. Change-Id: I09f47dd261dc8de1e5cc94085ac3fdf3503588fb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Improve roles"Jocelyn Turcotte2014-08-211-70/+33
| | | | | | | | | | | This reverts commit 7ea45766f6c49de9a81a387013fb1b98ab82766d. This blocks our integration into qt5.git for now as we would need to update qtbase as well and prevent us from pushing build fixes beyond this change. Let's get it in again after the alpha. Change-Id: Ie57c99dd91fc19ae2695f8d881a0a8318e988806 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* [OSX] Buildfix: Classes used with templates must be fully qualified.Zeno Albisser2014-08-212-7/+5
| | | | | Change-Id: Idf1cd3990e2cfd9e2ed3b017370e689c1126bb48 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update License Headers for Qt WebEngine to LGPLv3.Zeno Albisser2014-08-21132-1952/+1566
| | | | | | | Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Update the submodule to try and make it through the CIPierre Rossi2014-08-201-0/+0
| | | | | Change-Id: I32e7a89f5d86be18d8e10606af480fd082c214a8 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Propagate the page's screen coordinates when the top-level window movedJocelyn Turcotte2014-08-2012-37/+73
| | | | | | | | | | | | | | | | This fixes a regression after the 37 upgrade where the select popups would have the wrong position. Adjust to the new behavior and also avoid doing a mapToGlobal of the position received in InitAsPopup. RWHV::SetBounds has been giving us screen coordinates since the Chromium 33 update, but popup locations somehow managed to work properly through some side-effect sorcery. This also fixes the value of window.screen[XY] in JavaScript which wasn't updated when the window was moved. Change-Id: I544499bafedccfb7d389b4abc48f1386c398473f Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Improve rolesFrederik Gladhorn2014-08-201-33/+70
| | | | | Change-Id: I0a0d546779aa4a22411f5811880268a61e803b0e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Tell ANGLE to enable multithread protection.Michael BrĂ¼ning2014-08-191-0/+4
| | | | | | | | | | | | | | This is done on initialization of the Web Engine as this should happen before any contexts and Direct 3D devices are created. It makes D3D9 create a device with the D3DCREATE_MULTITHREADED flag and makes D3D11 enable multithread protection using the ID3D10Multithread interface. Depends on the appropriate counterpart in QtANGLE. Change-Id: I8204de2f8ebe993273ff9f11af55caacb1290e4e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Add scrollanimator settings to example browserAllan Sandfeld Jensen2014-08-193-1/+16
| | | | | Change-Id: I7dc7261aadbbf08dbbeb1323cf46d24dc8e58e16 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable the build on XCode < 5Jocelyn Turcotte2014-08-191-0/+2
| | | | | | | | | | | | Chromium itself requires XCode 5 to build and would require a few modifications to build with the version of libc++ that ships with XCode 4. Disable the build on that environment to at least get passed the Qt5 CI. Change-Id: I296055ac1880a9e09e2c0e8343058ff5add837c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Add iconUrl() to QWebEngineHistoryItemAllan Sandfeld Jensen2014-08-194-0/+18
| | | | | Change-Id: I61bda1aafc7513acdaeda99ef493ce50363d352e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove unsupport DeveloperExtrasEnabled settingAllan Sandfeld Jensen2014-08-191-1/+0
| | | | | Change-Id: I2e21c19c193d94d2ebbaed0bc3b9b0aaa28e6e85 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update the gyp variable used to disable tcmallocPierre Rossi2014-08-192-3/+1
| | | | | | | | This changed with chrome 37. We only need to define it unconditionally in gyp_qtwebengine as tcmalloc is never an option for us. Change-Id: I8b21eb1114582c1d9a8aa61c5f15fc8469721395 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Re-enable some qwebenginesetting features in browser exampleAllan Sandfeld Jensen2014-08-198-43/+24
| | | | | | | | We now have the QWebEngineSettings class and can re-enable the features that were previously disabled in the browser that depended on it. Change-Id: I525dd1a4b5c380ad4c6060f276440e069f633897 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add missing include to qwebenginesettings.hAllan Sandfeld Jensen2014-08-181-0/+1
| | | | | Change-Id: I9c0dd4e2da5452e6d90f177f4c5d5edd735294e5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update the src/3rdparty submoduleJocelyn Turcotte2014-08-181-0/+0
| | | | | Change-Id: If324dcd51db92b0f37c5c373246bf47c7733aa29 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Disable QtWebEngine if Qt is configured with -staticJocelyn Turcotte2014-08-182-1/+2
| | | | | | | We currently don't support this configuration. Change-Id: Ibd6ad9e1ffc993a2224fb814109467bd7b65f0fc Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Implement accessibility functionsFrederik Gladhorn2014-08-181-4/+4
| | | | | | | | These get called in the new snapshot and will lead to crashes as soon as any screen reader is running. Change-Id: If10159b85e788538c93f32007b68441cdc35dc8f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Implement RenderWidgetHostViewQt::AccessibilityViewHasFocusFrederik Gladhorn2014-08-182-1/+6
| | | | | Change-Id: I2cbb4860936c7780a749047b37d8c9852f54e7bc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix accessible roles after snapshot updateFrederik Gladhorn2014-08-181-102/+100
| | | | | Change-Id: I017d2cdf1424365c1a76ab2fce507c699a1ca502 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix accessibility event enum after snapshot updateFrederik Gladhorn2014-08-181-10/+10
| | | | | Change-Id: I3d8b29739595708aa785e147aa0c7967229ab807 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix accessibility state enum after snapshot updateFrederik Gladhorn2014-08-181-22/+22
| | | | | Change-Id: I6ecd3acc848a17f3527c95e5a23d29549532481a Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove XFAIL that got fixed by snapshot updateFrederik Gladhorn2014-08-181-1/+0
| | | | | | Change-Id: I5e2ab9f9119491f61033d8dd93059d0a54f3bc5b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Use Q_DECLARE_PRIVATE to wrap the p-impl in QWebEngineSettingsJocelyn Turcotte2014-08-153-10/+20
| | | | | | | This follows the same pattern now used in other public classes. Change-Id: I999c6ba7fc594cdb77da47482e1060542fe86861 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a crash in WebEngineSettings when opening a new windowJocelyn Turcotte2014-08-157-28/+14
| | | | | | | | | | | | | | | | | | A new window means that the QWebEnginePage gets its WebContentsAdapter swapped and that the pointer in WebEngineSettings must be updated. Do the WebContentsAdapter-to-WebEngineSettings binding in WebContentsAdapter::initialize to cover both cases. This also refactors the way that QWebEngineSettings is created by removing the need to pass a QWebEngineSettingsPrivate instance to be adopted, and also move the global settings construction logic in the singleton accessor instead of relying on the fact that it uses a different contructor. Change-Id: I6f8a2ed1407a4b25f9898526db9432721c354ddf Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix unused parameter warnings in qwebenginepage_p.hJocelyn Turcotte2014-08-151-1/+1
| | | | | Change-Id: I17bcd79ee2dcb539f369a8f4a8d59949e09930be Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Handle new window/tab modifiers also on normal navigationsJocelyn Turcotte2014-08-157-32/+105
| | | | | | | | | | | | | | | | | AddNewContents is only called when window.open is called from JavaScript. We also want the shift/ctrl modifiers to trigger normal links to open in the requested disposition. In this case OpenURLFromTab will pass the detected disposition and we must create a new WebContents ourselves. Use the same code path going through WebContentsAdapterClient::adoptNewWindow except that we pass a null WebContents pointer to the WebContentsAdapter constructor and let it create its own when initialized. Change-Id: I817b0e72aec12723bf92d9b7ad85c1cecbf5e408 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix uncalled callbacks with findTextJocelyn Turcotte2014-08-154-10/+51
| | | | | | | | | | | | | | | | | Calling findText successively might prevent the previous pending FindReply to be sent, which would leak the callback on the application side. This would cause a crash in qupzilla since we empty all pending callbacks in the QWebEnginePage's destructor to catch this kind of issue. This also renames lastRequestId to nextRequestId to make it clear that this is the ID generator for everything, including findText, and that lastFindRequestId is only a tracker. Change-Id: Ia78d553a58ed31af7237aad8772fa9828560c6d4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Don't build release with debug info by default on WindowsJocelyn Turcotte2014-08-141-0/+3
| | | | | Change-Id: Idf4373bc10367dfc15445c4c530915cbda04ae9c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Exclude accessibility files on windowsJocelyn Turcotte2014-08-141-0/+13
| | | | | | | | | | This allows the BrowserAccessibilityFactoryQt and BrowserAccessibilityQt classes to also be used on Windows, and this also remove our dependency on ATL, which is only easily available for Visual Studio Professional users. Change-Id: I1a9c047f0343252a0b6fcc215b84e4c2f3d664b4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the toolchain from PATH on WindowsJocelyn Turcotte2014-08-142-9/+18
| | | | | | | | | | | | | | We don't want to fetch the compiler path from the mkspec on Windows the same way that we do on linux/embedded. Qt usually let the build environment decide the MSVC toolchain, as it is usually done on Windows. This patch also passes the ninja_use_custom_environment_files ninja generator option to make sure that gyp doesn't try to construct the build environment by running the env scripts itself. Change-Id: I6e04471eb994b81a9f1b8b5f149b4dbddbb320a8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on Windows due to backslashesJocelyn Turcotte2014-08-141-4/+9
| | | | | | | | | | | | | | | | A gyp variable containing backslashes would be evaluated twice when passed through grit_action.gypi in src/core/chrome_qt.gyp. For some reason, gyp would end up reducing the escaping of backslashes once for each variable evaluation, which would completely remove backslashes from the value. Fix the issue by making sure that we pass paths to gyp with slashes instead of backslashes. Python will know what to do with them regardless. Change-Id: Id38866fd63a2ba1524a8c998fe577f7f50fca059 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on windows when qtwebengine.chromiumsrcdir isn't setJocelyn Turcotte2014-08-143-8/+10
| | | | | | | | | | | | | | | qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the config couldn't be found in git. Move the fallback logic to a getChromiumSrcDir qmake function, and use it in both places. The build system will now also print that the Chromium sources will follow the git config if found instead of the other way around, since this should now be the normal case as part of Qt5. Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the unified gesture recognizerJocelyn Turcotte2014-08-143-174/+105
| | | | | | | | | | | | | | | | | | | | | | | The ui::GestureRecognizer is now tightly coupled with Aura and won't be usable on Mac or Android. Fortunately, the reason for this is that a new gesture recognizer common to both Android and Aura, ui::GestureProvider has been introduced. Using it allows us to stop pulling touch event types from Aura build files. Most of the change is about using ui::MotionEvent instead of ui::TouchEvent, and to feed them to the GestureProvider. A major difference is that the touch events sent to the renderer are not passed through the gesture recognizer only when the come back unhandled. They are instead always sent to both the renderer and the GestureProvider, and the call to OnTouchEventAck on the gesture filter tells it if the next event in the queue was handled or not, deciding if the gesture should be cancelled. Change-Id: Ifccebf85800cdf0ef29cf52b13f1bd659428e3f6 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the QtWebEngineCore library to run on top of Chromium 37Jocelyn Turcotte2014-08-1448-467/+285
| | | | | | | | | | | | | | | Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the scripts for the snapshot of 37Jocelyn Turcotte2014-08-143-61/+72
| | | | | | | | | | | | | | | - The svn repo string would be something like: ...branches/2062/path_suffix and I want only the branch number in this case. Updated git_submodule.py to support that case and use regexp instead to keep thing a bit simpler. - .isolate are gyp files, moved the exception at the top - Changed some inclusions/exclusions - tools/ is now all excluded by default with exception instead of all included. We don't need most of it. Change-Id: I6d0666d9af7fc6a0f3c4fe866adf2744f13f7c35 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Disable chromium error pagesPeter Varga2014-08-141-1/+1
| | | | | Change-Id: I6b70b6199f0502ef67043325e7b7680529bd33fa Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Rename the 3rdparty submodule to match its pathJocelyn Turcotte2014-08-131-1/+1
| | | | | | | | This will be one less edge case that qt5.git's init-repository script has to worry about. Change-Id: I0b20769ab45c5521ac6f56ffd69b50fba6f8b543 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add QJSValue support to the public API testSzabolcs David2014-08-131-1/+5
| | | | | | | | | | | | QJSValue is not a built-in QMetaType (it's ID is over 1024 [QMetaType::User]) and we can't get the QML type names from the QML engine, so I hardcoded it in this test. The check of the "void" is unnecessary, because that is built-in: QMetaType::Void Change-Id: I0d7668abedc8830b4bba39ff60bce644fe97888b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>