summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Minor correction of log message in qtwebengine_utils.py.Zeno Albisser2014-01-131-1/+1
| | | | | Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix RenderWidgetHostViewQt::GetCompositingSurface() on WindowsZoltan Arvai2014-01-131-0/+4
| | | | | | | | | gfx::GLSurfaceHandle needs reinterpret_cast for the first parameter to match an overload. Change-Id: I4b89c38b9694ab649e1e623049573675c926a4a7 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix WebEngineContext on WindowsZoltan Arvai2014-01-131-0/+4
| | | | | | | | | | | | AppendSwitchASCII won't accept WChars, it would need WideToASCII conversion. But on OS_WIN AppendSwitchASCII method only wraps parameters for AppendSwitchNative with ASCIIToWide. Doing ASCIIToWide(WideToASCII()) not seems to be a useful idea, so we should call directly AppendSwitchNative on Windows. See chromium/base/command_line.cc. Change-Id: I9733993840ddaef2dbb3176135977c39a967e381 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* init-repository.py should only be used when cloning with git.Zeno Albisser2014-01-131-0/+16
| | | | | Change-Id: I8df487f3abcdaae9303c8353b6a9f26c88bc6840 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Handle exception thrown by subprocess.check_output.Michael BrĂ¼ning2014-01-131-2/+5
| | | | | | | | | The || true syntax does not work on Windows. Also, normalize the paths to the underlying OS style. Change-Id: Ie13d2646fe239fccb9ab7b558a6c8d56b779b206 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable Werror by defaultPierre Rossi2014-01-112-13/+4
| | | | | | | | | We don't want everybody to have to go and tweak ~/.gyp/include.gypi just for that purpose. Change-Id: I67533a62246dea45c4b5a5a454f43d01328d472f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix gpu::gles2::MailboxName on WindowsZoltan Arvai2014-01-111-1/+1
| | | | | | | | | | It is "struct GPU_EXPORT MailboxName" in chromium/gpu/command_buffer/service/mailbox_manager.h. MSVC won't accept class. Change-Id: I979808f357b32e1d99fe70a1138bf292b54c4e76 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix overrides for WindowsZoltan Arvai2014-01-112-1/+6
| | | | | | | | | | Add not yet implemented overrides to render_widget_host_view_qt.h. Remove ambiguous and unneeded override from browser_context_qt.h. Change-Id: Id1cac9bf811d8e128e5ba8df059f7ca3bdd919dc Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Little cleanup in take_snapshot.py scriptPierre Rossi2014-01-101-6/+0
| | | | | | | Removing some duplicate lines Change-Id: I92059eb42cedf5f912a595bbab4a73a1011d6dae Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix type conversion for WindowsZoltan Arvai2014-01-101-3/+11
| | | | | | | | | | MSVC uses WString instead of Utf16 so this needs different conversion in type_conversion.h. Change-Id: I987acb4ea5ad5a98c94fd992a9de05f602be825d Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix DownloadTargetHelper::determineDownloadTarget on WindowsZoltan Arvai2014-01-101-1/+1
| | | | | | | | | filePathForCallback.AddExtension won't accept const char[] with MSVC. It needs to be converted with the appropriate function. Change-Id: I95506de702eab4d7b61ddf051c7a122c793da35b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Implement WebEngineError class for handling ErrorDomainAdam Kallai2014-01-103-0/+154
| | | | | | Change-Id: I6092483d46b8d0db6193b92f2744bd836beb4912 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add placeholders for missing repack_locales switchesAndras Becsi2014-01-101-0/+4
| | | | | | | | | | | | | On some embedded setups and Windows unittest targets bring in new locale repack actions which use the -g and -b switches of repack_locals.py with @pymod_do_main. Since we did not implement these options the script execution failed. Add placeholders for these options. Change-Id: Ie11928b025448bc059fb1e3f2e695fb7698a7937 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove Q_UNUSED(uri) from webengine/plugin/plugin.cppAdam Kallai2014-01-081-1/+0
| | | | | | Change-Id: I403e7e3c89bd1881b96b1cc345ccdf115ceea5e9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* quicknanobrowser: reset progress bar when reaching 100%Zeno Albisser2013-12-231-1/+1
| | | | | Change-Id: I146df83948017b5ad72e40d16a8cc7105691c309 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* createWindow QML API for QQuickWebEngineViewJocelyn Turcotte2013-12-235-21/+168
| | | | | | | | | | | | | | | | | | | | | | | | | This implements adoptNewWindow for QQuickWebEngineView. The API is only intended to be used through QML to avoid delegating the QQuickWebEngineViewHandle ownership through a signal parameter. Another limitation of the implementation is currently to fail the handle adoption unless it is done synchronously within the adoptNewWindow call. To support this we would need to delay the call to WebContentsAdapter::initialize which will leave the adapter without a client when returning to the event loop and would require putting null checks everywhere it is used. So I would prefer to keep the API limited and avoid potential crashes. If we want to support asynchronous Loader elements or QML files fetched from the network in the future, the API should be able to scale to the task once we've adjusted the implementation. This also adds basic tabs support in the quicknanobrowser example. The url property is now set imperatively to avoid overwriting the adopted WebContentsAdapter's loading URL. Change-Id: Iba5c5dc3ffa21045f356be131ca15c01b9aee7c8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Make inspector listening port configurableXiaobo Wang2013-12-211-1/+14
| | | | | | | | | | | | Currently we use fixed port 1337 as inspector port. When weblauncher is launched by chromedriver it passes the inspector port as commandline argument --remote-debugging-port=<port>. Later on chromedriver will try to communicate with chrome via that port. We should use that port when starting devtools HTTP handler. Change-Id: I83e3341a535d50a129670bd0056b3ca448c8e2e5 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix the QQuickWebEngineView rendering with 1650.Jocelyn Turcotte2013-12-201-0/+12
| | | | | | | | | This is now initialized by Chromium in ContentMainRunnerImpl::Run, which we bypass for our browser process. Change-Id: Id8233df3fe12048cd2b6eaf870b161ab5d1eb089 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update chromium patches to apply on current stable (1650)Andras Becsi2013-12-2018-566/+179
| | | | | Change-Id: I3bdad02a2ef69d242980e34774a8219ef0c74ea9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Improve init-repository.py to fetch up-to-date dependency listAndras Becsi2013-12-204-89/+306
| | | | | | | | | | | | | | | | | | | | | This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: I333ada4250999b442cd244821818bace9e6136f4 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Adapt to chromium API changes in refs/branch-heads/1650Andras Becsi2013-12-207-14/+17
| | | | | | | This patch also updates src/3rparty to the new snapshot. Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update take_snapshot.pyAndras Becsi2013-12-172-16/+73
| | | | | | | | | Add additional conditions to the blacklist function so that we include files needed for Boot2Qt-Android but exclude other files not needed for the build. Change-Id: I7cda448a943dc776ad6d29c872048cf256da599e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Avoid errors when closing the applicationJocelyn Turcotte2013-12-161-2/+9
| | | | | | | | | | This also fixes the crash on shutdown encountered when returning a TEXTURE_TRANSPORT GLSurfaceHandle from RenderWidgetHostViewQt::GetCompositingSurface. Change-Id: Ic92238907a3e7f9d0db4bf114269c1ca5cca5aa6 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a crash when opening a window.Jocelyn Turcotte2013-12-161-1/+1
| | | | | | | | | | RenderWidgetHostViewQt::GetViewBounds gets called early than RenderWidgetHostViewQt::setAdapterClient when a new window is created by Chromium. Change-Id: I5ad61fc54ae773200403b222110a1d0ad541f941 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Revert "Improve init-repository.py to fetch up-to-date dependency list"Jocelyn Turcotte2013-12-164-306/+89
| | | | | | | | | Let's make sure that the submodule integration succeeds first. This reverts commit 584a8c3c637997fbb6772ab75aea1bd587b82a37. Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Revert "Update chromium patches to apply on current stable (1650)"Jocelyn Turcotte2013-12-1618-129/+543
| | | | | | | | | Let's make sure that the submodule integration succeeds first. This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e. Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the utility process launching.Jocelyn Turcotte2013-12-131-0/+2
| | | | | | | | | | | | | This would cause a crash of the render process while loading facebook.com since the utility process would try to use /proc/self/exe on linux. Bring back the kBrowserSubprocessPath switch to specify our subprocess executable. Change-Id: I4822d43f4a2b5ee86b941721da5ebb47d7a97c5d Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update chromium patches to apply on current stable (1650)Andras Becsi2013-12-1318-543/+129
| | | | | Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove --android and download the android and mac files by defaultAndras Becsi2013-12-132-4/+1
| | | | | | | Later we can add 'win' here as well. Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Improve init-repository.py to fetch up-to-date dependency listAndras Becsi2013-12-134-89/+306
| | | | | | | | | | | | | | | | | | | | | This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: Ibbf565f876af79dc008bcd161fddcbdd8bc73977 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the build on ARMAndras Becsi2013-12-112-2/+2
| | | | | Change-Id: I5130a10d56cc7c25da0eabf51c3657ef58cebaa7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix wrong cwd in getChromiumSrcDir().Zoltan Arvai2013-12-101-0/+4
| | | | | | | | | | | | | | | Working directory can be wrong when calling getChromiumSrcDir. On Windows cwd is inside Chrome source directory when it called from repack_locales.py that causes git config to return empty value. This causes the function to fall back to snapshot directory even if upstream is used. Changing cwd to qtwebengine_root, running git config and restoring original cwd resolves the problem. Change-Id: I1bef84ce791f63d3c9e7d6c9506e99c0c53cfc3e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add ftp protocol handler.Xiao Zhang2013-12-104-17/+15
| | | | | Change-Id: Ib5ec11a23d609414f609969dbb2933d83eb6e3bd Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Introduce WebEngineLibraryInfo for providing pathsArvid Nilsson2013-12-095-35/+179
| | | | | | | | | This allows us to customize paths on BlackBerry, where QtWebEngine is currently installed to an different location than the rest of Qt5. Change-Id: I7144c992bed9fe4d7543ce0d23ee8cd5f5669dd9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Minor clean-up in core_gyp_generator.pro and gyp_run.proAndras Becsi2013-12-092-4/+7
| | | | | | | | | | - Use QMAKE_RESOLVED_TARGET to find out the core lib target name - Pass the NINJAFLAGS env var to ninja instead of passing the content - Remove invalid dependency rule for the ninja target, which is only parsed because it looks like a qmake condition. Change-Id: I09bba8f350308d3249369171d0a3d5824f184590 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add qrc protocol handler.Xiao Zhang2013-12-066-2/+346
| | | | | | | | | | Support qrc resources in html. For example: <script type="text/javascript" src="qrc:///xx.js"></script> <image src="qrc:///xx.png"></image> Change-Id: I490efb7cc300bf894659e79948b65729a12ad73d Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Use files for install instead of extraPierre Rossi2013-12-052-12/+7
| | | | | | | | | | We need to add the no_check_exist value in order for qmake to just accept that those files will eventually exist. This has the benefits of not messing with $(INSTALL_ROOT) and also stripping the library, which could prove useful. Change-Id: I43c230f185420ba92ff8e86f49b4e838ca5dd917 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove unused include_dirPierre Rossi2013-12-051-1/+0
| | | | | Change-Id: I4fabc860ad586755e28bd579df743822bcc2bf47 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use QVector when creating argv for the command lineAndras Becsi2013-12-041-2/+4
| | | | | | | | MSVC does not support variable length arrays. Change-Id: I59ef844256eb1b2666331e5ed0411f63e36883ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Android specific build settings and command line switchesAndras Becsi2013-12-043-0/+22
| | | | | | | | Although this is an unsupported platfrom for QtWebEngine it is needed for Boot2Qt-Android and can live upstream. Change-Id: I21fea1fd00c1206e3b56373349b30df5ee121fda Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Quick: Add experimental.viewport.devicePixelRatioArvid Nilsson2013-12-0413-21/+157
| | | | | | | | | | | | | | | | | | | | This specifies a devicePixelRatio to be used by web content instead of the QScreen::devicePixelRatio(). This is necessary on non-iOS mobile devices to remain compatible with the mobile web which assumes devicePixelRatio is computed as the ratio of actual dpi to 160 dpi. Non-iOS mobile platforms may use different criteria to determine the QScreen::devicePixelRatio(), depending on the history of the platform, or simply leave it at 1.0. For QNX, this setting gets a reasonable default value so developers don't have to regularly use this experimental API. These changes were inspired by the Android Chromium port which uses a GetDpiScale() to accomplish the same in content/browser/android/content_view_core_impl.cc. Change-Id: I1bc8878a47dabcdb6986c4fe5c8c4ac230ae2514 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Unify the inclusion of *_extra.gypi files from src/coreAndras Becsi2013-12-031-5/+6
| | | | | | | | This makes it possible to use drop-in files for platform specific options needed for example for Boot2Qt. Change-Id: If9db228ac4be414bfea6f4eafe5199ffee495a48 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Python correctnessPierre Rossi2013-12-031-2/+2
| | | | | | | sys.path.insert(0,... can be harmful, let's not take that chance Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the process we install to libexecPierre Rossi2013-12-033-27/+14
| | | | | | | | | Via QLibraryInfo. Also pick the name from qmake, and drop the hardcoded value. Add better error reporting when this fails. Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get localized strings in the render processPierre Rossi2013-12-038-13/+324
| | | | | | | | Building on top of the repacking of .pak files, we now ship the whole array of repacked locales and pick the appropriate one at runtime. Change-Id: I0096e3eac6a1fc83885fd11e0fa55a746f8e45d8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Ship repacked .pak filesPierre Rossi2013-12-0313-252/+79
| | | | | | | | | | | | | We used to wrap various .pak files in qrc files, but it turns out to be very memory inefficient compared to chromium's approach of mmaping those files. Drop the pak->qrc logic and instead add some pure gyp targets to repack the resources. We then install those with qmake and look them up with QLibraryInfo. Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* More gitignore patternsPierre Rossi2013-12-031-1/+3
| | | | | | | Also whitelist core.gyp in prevision for a handwritten one. Change-Id: I8122d71893158e745f1368fc1b9d0d7aab3d220b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use ContentMainDelegateQt also for child processesPierre Rossi2013-12-035-51/+169
| | | | | | | | This will be necessary in order for the render process to load localized strings among other things. Change-Id: Ibb75e49f0bc583c158af61817e5b350f3534ec16 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Implement DidFailProvisionalLoad functionAdam Kallai2013-12-022-0/+7
| | | | | | | | | | | The WebContentObserver::DidFailLoad event doesn't handle all of the errors during the web content loading (eg. network errors). Thus WebContentObserver::DidFailProvisionalLoad should be binded on Qt side to handle these errors too. This event is handled by the WebContentsDelegateQt::DidFailLoad function now. Change-Id: I1421214dd94481a1e27cda8d35a35d418289b604 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build with a neon enabled setup to pass arm_neon=1 to gypAndras Becsi2013-12-021-1/+1
| | | | | | Change-Id: Ibe0bab32fb215bc4de58a474ca7b77a289dea2f0 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>