summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tools: add check_patches.py script for checking patch annotationsAndras Becsi2014-07-031-0/+108
| | | | | | | | | | | | | | | | This script should be ran whenever adding new patches to our chromium snapshot and makes sure we keep the upstream build functional. Having clean patches is beneficial to keep it possible to upstream patches to the Chromium project, and to keep an overview of our changes. An annotation is not needed if the patch is adding files to the chromium snapshot that were removed by take_snapshot.py, thus are already present in the upstream repository. In these cases the non-annotated patch will be ignored by the scripts. Change-Id: I46605c559825d9da2653036e9a12a2a5730330a0 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* tools: move upstream repo utility functions to version_resolver.pyAndras Becsi2014-07-032-50/+61
| | | | | | | This makes it possible to use them in other scripts as well. Change-Id: I8aa76c1a9be91c56fd232a592ac41de5079eb3c7 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Reorder files alphabeticallyPierre Rossi2014-07-011-10/+10
| | | | | Change-Id: I1b7bea888290be340b2e368f8e77b661e8d66018 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add .tag file and the git-archive export optionsSergio Ahumada2014-07-012-0/+5
| | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. Change-Id: I0c9cd62fae0c4f4ca75552cbac966e27cadac45d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* XFAIL tst_QWebEnginePage::backActionUpdateJocelyn Turcotte2014-07-011-0/+1
| | | | | | | | | The test relies on events being propagated from the QWebEngineView to its children. We should probably send those events directly to the WebContentsAdapter to fix this kind of use case. Change-Id: Ib5cc199fe8fc27c21603888b49334d1c1f71e575 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* XFAIL tst_QWebEngineFrame::setUrlHistoryJocelyn Turcotte2014-07-011-6/+17
| | | | | | | | | | Update the checks to cover the case where the count could be the same with different URLs, and mark those checks as currently failing because QtWebEngine doesn't have the logic preventing QUrl() to affect the history. Change-Id: Id0260d21d32d9e85fbd14f44536c2c93b6eb40b1 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Prevent premature deletion of JavaScript alert dialog object.Michael Brüning2014-06-303-8/+9
| | | | | | | | | | | This fixes a crash on Windows when dismissing a JavaScript dialog. It was caused by the JavaScriptDialogController object deleting itself and its private object from a method call and subsequently trying to run the JavaScript dialog callback. Task-number: QTBUG-39883 Change-Id: I74300c53943ec7ebc492362ef7d75d83aa1f8051 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* OS X: Fix the build with the Qt SDKAndras Becsi2014-06-273-3/+3
| | | | | Change-Id: Icc4219ace4121a4b30302e0348e48dc75cae54cb Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix crash when loading context menu on Windows.Michael Brüning2014-06-261-1/+1
| | | | | | | | | | | Use QUrl::fromLocalFile to load components from the installation Qml directory. Using just the absolute file path wasn't a problem on Linux, but did not work on Windows. Other Qt modules are also using QUrl::fromLocalFile to do this. Change-Id: I689c516dc63a6c966435eedb94441d7c9246dd25 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Install ICU data file to Qt on WindowsZoltan Arvai2014-06-201-0/+5
| | | | | | | ICU data file is required by Qt5WebEngineCore. Change-Id: Ifcbb1119e9dfe25b6a1bb206475176f21278c2a9 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix keyboard scrollingAllan Sandfeld Jensen2014-06-182-3/+10
| | | | | | | | | | | | Arrow keys and page-up/page-down was not working. These are detected on RayKeyDown events which both the Win and GTK versions sends instead of KeyDown. Also fixes a mistake in reading the length of the UTF16 text string that was using sizeof on a pointer. Change-Id: I441ef21c15430dafcaeda00d43eb9aec81cd88b8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix patch_upstream script on WindowsZoltan Arvai2014-06-171-2/+9
| | | | | | | | | | | Preventing failure while applying patches on submodules that are skipped on Windows. Non Windows related submodules are not checked out from upstream repository. This behavior is a workaround for git issues. Change-Id: If34d9d2916829f87c7397a07803f79c156c05c57 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Project quads to z=0 instead of compressing them between 0 and 1Jocelyn Turcotte2014-06-171-30/+6
| | | | | | | | | | | | | Since all quads are already separated in non-intersecting geometries and ordered according to their depth by Chromium, there is no need to keep any z value once the perspective projection has been applied. Avoid the useless computation and project the quads to z=0 the same way that QMatrix4x4::toTransform() does when used to flatten QQuickItem::transform(). Change-Id: I3ec5dc2da23cf431e2d8d0bb8b1ed48f2f2d2d8e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Explicitly return false in WasAllocatedUsingRobustnessExtensionJocelyn Turcotte2014-06-162-0/+2
| | | | | | | | | | | | This is the default behavior of gfx::GLContext, but explicitly do it for documentation purpose and cover the case of the behavior of gfx::GLContext would change in the future. This also updates the submodule to include the change that uses this value. Change-Id: I214376d92b4f9f11bd491c2b1263cf8159e5779f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update .gitignore with build artifactsAndras Becsi2014-06-051-0/+2
| | | | | | | | This hides the prepared patches directory for upstream builds and gyp cache files produced for idl files. Change-Id: I340e5f6af5169810a780c9295d19bc7ce5fefd8c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix typos and warnings in the Quick testsSzabolcs David2014-06-056-18/+23
| | | | | | | | | - Add valid size to tst_faviconLoad.qml - Add missing files to qmltests.pro - Rename test cases and files from WebView to WebEngineView Change-Id: I40163117a11672b18230046a1604624bc4620dba Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix import versions in the Quick testsSzabolcs David2014-06-0514-14/+14
| | | | | Change-Id: I5f16a2f824112bdfa2c50b3e4d93d6d47e34ba1b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove separately maintained patches from repositoryAndras Becsi2014-06-0541-3447/+0
| | | | | | | | | | | | | | We maintain them on top of the Chromium snapshot. A new script tools/scripts/patch_upstream.py replaced patches/patch-chromium.sh with the recent snapshot update. The patches that we have on top of the baseline version are prepared from the chromium snapshot and applied on the upstream chromium checkout. A consequence of this is that init-repository.py -u from now on requires a snapshot checkout as well. Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update ninja and bump Chromium version to 33.0.1750.170Andras Becsi2014-06-054-10/+130
| | | | | | | | | | | | | | | | | | | This patch also changes the way we handle our patches. We'll always take a new snapshot without patching Chromium and rebase our patches on top of the snapshot. This removes the need for separate patch files for the ustream repository since we can use the patches of the snapshot and apply them on the upstream checkout if we want to use an upstream build. This makes it easier for us to have branches for the release and maintain and minimize the number of patches we need on top of upstream Chromium. For now a snapshot checkout is needed to be able to prepare the patches for an upstream build but in future we cold improve this to fetch the patches from the remote snapshot repository if needed. Change-Id: I6280ffbe2d50d25d252734bc76d19bfaaa081637 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add --baseline-upstream option to init-repository.pyAndras Becsi2014-06-051-1/+6
| | | | | | | | | This flag makes it possible to initialize an upstream repository without applying the QtWebEngine patches, which will be the used to take a new snapshot, on top of which we will rebase our patches. Change-Id: I89a6a135bb457edfc31c24a052f1732fb70299dc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Define mac_sdk_min and mac_deployment_target instead of mac_sdk_pathAndras Becsi2014-06-043-5/+8
| | | | | | | | | | With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set the proper flags for chromium to pick the right sdk. Also add clang_use_chrome_plugins=0 so we can remove it as well from the Mac-Use-libc-instead-of-stdlibc patch. Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add update_change_ids.py to update Change-Ids of a set of patchesAndras Becsi2014-06-041-0/+86
| | | | | | | | This will be useful when updating the snapshot and rebasing patches. These patches need updated IDs to keep the gerrit database happy. Change-Id: I62e9fc11a902f57497a2693cc59b873f13cfce12 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the build on MacAndras Becsi2014-06-041-0/+1
| | | | | | | clang complains about unknown scoped_refptr Change-Id: Iee7590f9ad45cab55a5918bf1c756aa769fa3fd9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix init-repository.py's --no-gerrit optionAndras Becsi2014-06-041-1/+1
| | | | | | | | | | The argument should not be added to the mutually exclusive group but to the parser itself to make it usable with upstream checkouts as well. Change-Id: If2361c7beb0463a471cea9ce01e18a51abeed4ee Reviewed-by: Jeff Rogers <jrogers@blackberry.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Support EGLStream video streaming on QNX platformMansoor Chishtie2014-06-025-13/+76
| | | | | | | | | | | | | | | | | | On QNX platform, we implement video streaming via OpenGL EGLStream streams. Changes were added to StreamVideo class to support EGLStream objects. For non-QNX platforms, we kept the StreamVideoNode class unchanged - assuming other platforms will continue to support streaming via EGLImage objects. On QNX, cc::StreamVideoDrawQuad contains an external OES texture that is associated with an EGLStream. Before we draw with that texture, an 'acquire' is performed to grab latest video frame. See EGL_KHR_stream specs from Khronos. Change-Id: Ia3fe25e9047f475594a55591e3e11caa0eab1e6a Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Move gyp defines to os specific config for WindowsZoltan Arvai2014-06-023-5/+9
| | | | | | | Currently some variables defined in os independent section. Change-Id: I661d840b2271dc4bccf98dc2a252feaf6907952c Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix "findNext" after having navigated to a new pageJocelyn Turcotte2014-05-283-4/+9
| | | | | | | | | | | | The findNext flag tells the frame to search starting from the current selection, but the code assumes that the flag won't be used when there isn't any find selection (like when the Frame changed). Make sure that we won't use that flag after we received a load committed signal. Change-Id: I10f0f84226232d150f19fd644d7afe78bc425f74 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Avoid black flashes when showing a new QWebEngineViewJocelyn Turcotte2014-05-281-1/+1
| | | | | | | | | | | | | | QPlatformBackingStore still doesn't enable blending when compositing a QOpenGLWidget with the rest of the widget tree. This means that a tranparent pixel will show as black. Until we get to properly go through the work of making it possible to render a transparent webview, set the glClear color to white in order to avoid seeing any black background before we get our first frame from Chromium. Change-Id: Idf7bb831a3b0d62b02f2527e2a15d830bf1e8ad4 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Also moc cpp files in gyp integrationPierre Rossi2014-05-221-5/+6
| | | | | | | | We had the logic in place to detect mocable cpp files all along, but only used it for headers. Change-Id: I00ea4e3ba081c5c7d37fe35ec78233e4961481e3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Windows: Fix typo: eglContextPeter Varga2014-05-221-1/+1
| | | | | | | | | | Use eglContext instead of eglcontext as a parameter of nativeResourceForContext() function on windows: qtbase/src/plugins/platforms/windows/qwindowsnativeinterface.cpp Change-Id: Id6b4b5b6b8befad5b8a20b44e1c2a80c034921f9 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove Cygwin from blacklist in snapshot creationZoltan Arvai2014-05-211-1/+0
| | | | | | | | | | Cygwin is still required for build on Windows. It was accidentally blacklisted. Utils in cygwin used by third_party/WebKit build and gyp uses cygwin for wrapping linux style commands on Windows. Change-Id: Ifac069c67ebd1bef2f41618e7688d3b64028517b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Windows: Use single process binary on Windows and fix GL contextPeter Varga2014-05-214-1/+12
| | | | | Change-Id: Iee7f3dc7fb9deba03e57a80ed48b74069490fe0d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a crash when running witout UI delegates.Pierre Rossi2014-05-201-8/+23
| | | | | | | | | Lookup the correct UIDelegates import path once lazily, and reuse this information. If there is none, then we don't expect any UI delegation to work, but it should not crash. Change-Id: I73be7273d83b8d89b74641dc550341cf2b7eb602 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Buildfix after Iacc6cff82c0f071d1c8901977748d6164fb0a87d.Zeno Albisser2014-05-201-0/+2
| | | | | | | We only do have the scoped_ptr m_surfaceFactory on Android. Change-Id: Ia377afa9a8662498fca005994bd5fbec5c41bc9e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Test for webenginewidgets, not widgetsLaszlo Agocs2014-05-192-2/+2
| | | | | Change-Id: Icecb6b716a45b4682ddd9b16383f3aa4a5acb312 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add patch for fixing thread issues on WindowsPeter Varga2014-05-191-0/+78
| | | | | Change-Id: I7a28ab0cf2a4e6d6235c9d6ab8f9bfc4839ea800 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the same switches for both embedded Linux and AndroidJocelyn Turcotte2014-05-192-2/+7
| | | | | | | | This also explicitly enables impl-side painting, which is enabled by default on Android, hard-coded behind an #if defined(OS_ANDROID). Change-Id: Iacc6cff82c0f071d1c8901977748d6164fb0a87d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix jerky pinch-zoomingJocelyn Turcotte2014-05-191-1/+0
| | | | | | | | | | | The kEnableScrollPrediction switch uses event timing to extrapolate events but this considerably reduces the smoothness of pinch-zooming. Assuming that this feature expects very well timed events, which we don't have in most of QPA platform plugins, disable the feature. Change-Id: I96bdd8b9e9cc870e232ad9c98bcad5857608870b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix some more documentation.Michael Brüning2014-05-194-110/+132
| | | | | | | | | Adds the license for Chromium to the legalese part. Adds some missing documentation to QWebEngineView and QWebEnginePage. Change-Id: Ie81aaa87db85bb72efb83680defbdb101a134df0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix up tabbed browser code.Michael Brüning2014-05-192-7/+8
| | | | | Change-Id: Ia1a92a7eb9b3568e8cb7ccf6c7056abba647fd8d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the build on eAdroidAndras Becsi2014-05-191-1/+1
| | | | | | | | | The eAndroid mkspec also sets linux, and since the qnx change we ended up including both android and linux configs. Make it more obvious why the else is there. Change-Id: Ia97483d410e280bbb4f4b56cf6fd351f6a4bbbca Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix the quicknanobrowser example's import versionJocelyn Turcotte2014-05-191-1/+1
| | | | | Change-Id: Ib1d855bab6c764c0341b39b374b00425645903ff Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix fling gesturesJocelyn Turcotte2014-05-192-2/+12
| | | | | | | | | | | | | | | InputHandlerProxy::HandleGestureFling assumes that the timestamp on the fling gesture is in the same system as base::TimeTicks. By giving it our smaller relative event timestamps (most often taken from a QElapsedTimer) this ends up here being calculated as a negative time on the fling animation curve. Fix the issue by applying a delta at the ui::TouchEvent conversion so that the resulting GestureFlingStart has a timestamp that can be reliably interpreted. Change-Id: I5e149bf64887305119643359495f89be6e0c3ffb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Prepend the namespace for ElideMiddle.Zeno Albisser2014-05-161-1/+1
| | | | | Change-Id: If2ac075f095c83fd53c939d3494c7807328ed2dc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* [Widgets] Tooltip word wrap fixupPierre Rossi2014-05-161-1/+6
| | | | | | | | | | | QTooltip's documentation states that "rich text displayed in a tool tip is implicitly word-wrapped". This seems to be a more desirable behavior for our needs. To mitigate any potential malicious tooltip contents, we escape any eventual html entities, and truncate to a reasonable size. Change-Id: Iae3ea80e7660840aae39d228d1177dcc56f4a032 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove the webpage snippet for now.Michael Brüning2014-05-163-115/+0
| | | | | | | | | | This snippet contains API that we might not support at all. It is better to remove it and add a new version in case we reintroduce this than to present a snippet that does not work or only works partially. Change-Id: Ia47ad69108ddcbe529aecff8e4f235b17d80514f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix a crash preventing us from using ImplSidePaintingJocelyn Turcotte2014-05-162-12/+18
| | | | | | | | | | | | | | Because of an uninvestigated reason, ImplSidePainting can cause more than one quad to use the same resource_id in one delegated frame. Fix the issue by first checking if m_data->mailboxTextures contains a texture for the resource_id before overwriting it. This also re-enables the feature on OS_ANDROID where it is enabled by default. Change-Id: Ie7842f958e1c049db71ffc2a0a768a5725102a3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Set the QtWebEngine modules version to 0.9.0Jocelyn Turcotte2014-05-166-8/+21
| | | | | | | | | | | | | | | | | | | | Also make sure that this version number appears in the user agent string and in the QML imports. The plan, unlike other Qt modules, is to keep our module and QML versions in sync to make it easy for developers to figure out what API is available in a given version. The QTWEBENGINECORE_VERSION_STR define is explicitly set in the .pro file since we don't call syncqt to generate a version header for the core module. The 0-major version currently causes the library name to start with libQt0 instead of libQt5, but this is something that we can fix in qtbase once we want to officially support linux desktop with QtWebEngine 1.0.0. Change-Id: I31915e84869b4db456416ef1f85a2296b8a06c99 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add initial build configuration for QNX.Jeff Rogers2014-05-163-0/+19
| | | | | | | | QNX is using Ozone, so exclude gl_context_ozone as well. Change-Id: Icdad9eed3211e9b095fbf884bc5e0243b551c1bb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
* Provide option to bypass adding the gerrit/commit hook remote.Jeff Rogers2014-05-161-2/+5
| | | | | | | | | For developers behind a firewall blocking ssh, the init-repository script will hang. Add a "--no-gerrit" argument that will skip adding the gerrit remote and commit hook. Change-Id: I130a5897f33925876922bbfea4976f24c484ef31 Reviewed-by: Andras Becsi <andras.becsi@digia.com>