| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I14dbc2d4770cb0efe9a227e4f113e83c50e00283
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I8df487f3abcdaae9303c8353b6a9f26c88bc6840
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Removing some duplicate lines
Change-Id: I92059eb42cedf5f912a595bbab4a73a1011d6dae
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I6092483d46b8d0db6193b92f2744bd836beb4912
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I403e7e3c89bd1881b96b1cc345ccdf115ceea5e9
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I146df83948017b5ad72e40d16a8cc7105691c309
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I3bdad02a2ef69d242980e34774a8219ef0c74ea9
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
This patch also updates src/3rparty to the new snapshot.
Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
Later we can add 'win' here as well.
Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I5130a10d56cc7c25da0eabf51c3657ef58cebaa7
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ib5ec11a23d609414f609969dbb2933d83eb6e3bd
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I4fabc860ad586755e28bd579df743822bcc2bf47
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
sys.path.insert(0,... can be harmful, let's not take that chance
Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Also whitelist core.gyp in prevision for a handwritten one.
Change-Id: I8122d71893158e745f1368fc1b9d0d7aab3d220b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|