| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I8b188fb1c6167612307d4db3272f5ae6f85705c7
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I9fb191a5a2351c5c953f640a6cf1a33609385cc9
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
To allow QWebEnginePage to act on its own, let it own the WebContentsAdapter
and let the view delegate its calls through the page.
Change-Id: I851c753d068992e387edab0e1ea8018732af1fd7
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Chromium doesn't allow managing sub-frames from the contents API.
To support operations that were made on the main frame, merge the frame
API into the page. Methods should be later either be removed or
implemented one by one.
Change-Id: I52de89a48c00efb9dd0cf0a2c1fdf09d735d2381
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the first step toward re-implementing part of the QWebView
API on top of QtWebEngine. The plan is to import the complete headers
to facilitate diffs and progress tracking.
Changes squashed in this commit:
- Use the QWebEngine prefix for class names
- Strip out non-public members and directives
- Allow building using those headers by disabling the Q_PROPERTY
macros and by adding a dummy implementation for virtual methods
directly in the header
- Update the widgetsnanobrowser example to comply with the slight
changes from the previous API
Change-Id: Ia7efa5430f775d09b493544430a04856cc7928f6
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This follows the model used by the rest of Qt, potentially
avoiding binary compatibility issues.
The compromise is that we now depend on core-private, thus
forcing us to follow Qt's release cycle.
Change-Id: Ib2df51071fc35935ac99edf7b9c5562949cb43e2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I58d83f4f33728f92e4bf13b6be30b15528fdd033
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
| |
Change-Id: Id760a1b39b5f9efeea49e49183b1fcc68fd54f8f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
| |
Since the macro is used in public headers, it should also be
declared in one of the webenginewidgets module's public headers.
Change-Id: I5cd56196e95c78fac2ba8df076f2cd683b01a5ac
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
Chromium isn't expecting the destruction and reconstruction of the
ContentMainRunner and BrowserMainRunner. This will need a few tweaks
before we can do this without hitting asserts in debug builds.
Change-Id: I0c46a2db27350b3f6352e3eb8a5ec7ecff06784e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
| |
This mimicks the Shell's behavior to avoid an assert.
Change-Id: I31fdb4ff9c1ee9a359db84978da313489e93e30a
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The WebEngineContext member was declared after the WebContentsDelegateQt
in WebContentsAdapter. This means that the delegate was destroyed after
the context and would cause the crash.
Reorder the declaration and move the WebContentsDelegateQt also to the
private class to reduce future confusion.
Change-Id: I343504d4fd1ede80feb710446368fdf12f360b15
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
This avoids the RWHV being accessed before being attached to
the delegate when attaching the later to the view's layout.
Change-Id: I5fffef60fdd7203cfb4ced807b5475aac676ea09
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Let the RWHVQt explicitly own its delegate.
Keep the same behavior by letting RWHVQt::Destroy delete itself directly
like done in RWHVGtk instead of deleting the RWHVDelegate which would
then delete its RWHV.
Change-Id: I051c95d608964ebcd66d3ccbe728f63c0ca397ae
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
There can be multiple RWHVDelegates within one WebContentsViewQt
during navigation. Avoid keeping a pointer by sending the focus
call to the client directly, which fits the purpose better.
Change-Id: I863c174e9a2567f3580f3cb525bc5353ab2a4417
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
Prevents the the web engine from crashing by providing an
implementation and generating download Ids for downloads.
Change-Id: Iac1e98b74ec1fdc9d913951fbfed4b7ba394170f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
Changed the header #defines to UPPERCASE_CLASS_NAME_H.
Change-Id: I49dec91d7a97808c1b9618df6d985939fd84babb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was causing trouble when QEvents were forwarded from the
RenderWidgetHostViewDelegateQtWidget event handler method before
the RenderWidgetHostView had been initialised.
forwardEvent checks for a pointer to the view being set anyway, so
the ASSERT does more harm than good.
Change-Id: I59035d2fc053054400f85b3b9c2b8ad065f22627
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add WebContentsObserver as a base class of WebContentsDelegateQt
to be able to get more information about the WebContents (loading
state etc.).
Also implements load finished with a success value to be able to
show when a load has failed.
Change-Id: Ic2ad698d180b395cf3d9fb6cd49b12c9cb4fb493
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As this looks like a layering violation.
Instead, rely on WebContentsViewImpl::CreateRenderViewForRenderManager
querying the WebContentsView's size before setting it on the
RenderWidgetHostView. The WebContentsView now gets the size of the
actual view through the Adapter interface.
Then, in RenderWidgetHostViewQt, we now forward the resize request
to the delegate.
Change-Id: Ide679f6d114508cc7c9ffac83daad19d16764a4d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: Ic08f83db03454542554fac9e590d79a4440a4b28
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: I5ce13af04de8520bb0ab93c48a2493822aa42294
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This enables panning and zooming using touch events.
Also map touch IDs given by Qt to 0-based IDs since the
gesture recognizer expects it.
It currently needs the following command line switches to be enabled:
--force-compositing-mode --enable-threaded-compositing --enable-pinch
Change-Id: I34db3203529470aef5426ddfaa65af7d67e4b017
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
WebTouchEvents have a slightly different behavior than QTouchEvent in
that the type of the event is TouchStart for each new point press,
while Qt sends a TouchBegin only for the first point press.
Since we already need to use ui::TouchEvent to be able to use
ui::GestureRecognizer, always do this conversion first to also let
UpdateWebTouchEventAfterDispatch chose the proper event type.
Some of the code from render_widget_host_view_aura.cc was copied into
render_widget_host_view_qt.cpp to fill the needed functionality.
Change-Id: Iab1ca0c449b5256a39b5479ce89b662d4e133935
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Only enable it when the --force-compositing-mode switch is
used. The purpose of this is only to allow testing pinch-zooming
until we are able to use the delegated renderer in the QtQuick view.
Change-Id: I2ca265c84c8fe6a74299f1b2757ad525f33fae17
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the first step to making proper Qt Modules out of QtWebEngine.
The Widgets integration becomes a proper C++ Qt Module while we make
the QtQuick side a QML plugin for now (could probably be promoted if
the need arises).
Code-wise, this means the introduction of a WebContentsAdapterClient
interface that is subclassed by the private implementation of our API
classes for delegation of things that are UI specific. Functionality
from WebContents and the like is exposed via the WebContentsAdapter.
Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
This lets the page receive touch events sent to the QWidget/QQuickItem.
Change-Id: Ic358d4963d6af3df57d37a02b471cd442e8947ce
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
base::FILE_EXE isn't used by this process and we therefore also need
to set the kBrowserSubprocessPath switch.
Change-Id: I5a5e721c765cc1990d155f6c6d9ac1b442dc44b0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Move resource_bundle_qt.cpp to the shared lib since the process also needs its symbols.
The qrc file should normally follow, but Windows doesn't support them
in static files, so keep them separated until it's a problem.
Change-Id: I4963e4609592df90126f8b8a18a4d368907f205f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
| |
Build fix when using a C++11 enabled compiler.
Change-Id: I516b96459fae050b95fd944814d8d497add06f72
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
| |
Change-Id: I36007b0c0fbf194df1941e72ae2a93adf5ed6d0b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
This is a whitespace-only change.
Change-Id: I50ac5879f13c32b2603da45fb110b00b6f9c57db
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
Besides returning a proper application specific user data directory,
this patch removes the duplicate definition of GetPath() which
was added by accident with the recent chromium update.
Change-Id: Ia30d598e3ef99eb88000498ef3a00ccae0593ff8
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
Remove unused variables, add missing return and avoid comparing
unsigned integers with signed ones.
Change-Id: I9b295a5dc10927ec89471a424c93cf3b168cf078
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Implement recently added pure virtual members:
BrowserContextQt::GetPath() const
BrowserContextQt::RequestMIDISysExPermission(...)
- Remove obsolete function GetSpeechRecognitionPreferences.
- Rename usage of GetActiveURL() to GetVisibleURL().
- Update namespace for usage of type WebPluginGeometry.
- Adjust parameters of RenderWidgetHostViewQt::TextInputChanged.
- Rename RenderWidgetHostViewQt::RenderViewGone to RenderProcessGone
- set_http_server_properties now takes a scoped_ptr.
- Rename WebDropData to content::DropData.
- Rename WebMenuItem to content::MenuItem.
- webkit/support/webkit_support.gyp has been moved to
webkit/webkit_resources.gyp.
Change-Id: I6d5d281b797a8f6197ecb53a08798bd1f6845754
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
As this function is excluded using a !defined(OS_MACOSX) in
resource_bundle.cc, we have to add a replacement for it in
resource_bundle_qt.cpp using the inverted logic.
Change-Id: I9b19977c61113280d2af75ba51a5466ecfc0e033
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
resource_bundle_*.cc weren't excluded properly and
ResourceBundle::GetLocaleFilePath is in resource_bundle.cc
rather than resource_bundle_gtk.cc.
Change-Id: I9e56a7d88e859354a4d7115a61b99f7487fc7a39
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
This is necessary, because the pak files must be available
when qmake checks for the dependencies for RESOURCES in lib.pro.
Change-Id: Ia173c70746402b2fee09bfa035a9f8780e88cc94
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Local file and data url support can simply be added
by registering the appropriate ProtocolHandlers.
Displaying the contents of a directory is slightly
more complex. This requires access to some html
resource files that can be used to list the contents
in rows. For Chromium such resource files are usually
contained in a .pak file which is shipped with the binary.
Since deploying additional files is very complicated for Qt,
we want to use the Qt Resource System to bundle .pak files.
Therefore this patch adds handling of rcc content generated
from a .qrc file to our gyp_generator.prf.
Further it replaces the regular ResourceBundle implementation
with a Qt specific one.
And it also implements a DataPackQt class that allows
using DataPack instances with data from a QByteArray and
therefore from the Qt Resource System.
Change-Id: Ic41e34fbd9aec8596cbc85666a762ecdaa604edc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Trying to connect to an ssl socket will trigger an assertion
now if there is no valid TransportSecurityState specified.
Hence, we create one now and pass it with the
HttpNetworkSession::Params.
Change-Id: I61cda2d0b662a95d32085092e74e0499c008c57f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: Iac3ea8525bb70f6f6bc442f486b72dad16e3f545
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
Remove code that would only be needed for content_browsertests
that we do not require for now.
Change-Id: I2cabbcfe63bcc0da838462eb97ab8c7eaf7289c7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Prevent leaking ContentMainDelegateQt, ContentMainRunner
and BrowserMainRunner in WebEngineContext so that resources
are cleaned up and corresponding notifications are executed.
Change-Id: Ib4a13b5e739ed0e60c90bf721a943a3ad19c206c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Move parts of the initialization from the WebEngineContext
ctor to ContentMainDelegateQt and BrowserMainPartsQt members
so that they are executed in their respective stages of startup.
Change-Id: Iefa288c6bf775ac530f183c0dcfebb6a3230d68d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Override base::FILE_EXE in ContentMainDelegateQt::PreSandboxStartup()
with the path to our child process and get rid of the command line
argument and the content::CHILD_PROCESS_EXE override.
This reduces 0001-My-local-fixes.patch to export ContentMainRunner
so the patch can be renamed to better reflect it's purpose.
This hunk is still needed since we need to access ContentMainRunner's
Initialize() to set our ContentMainDelegate.
Change-Id: I808cb114100300a33f8cb1b154c6cde89cbf5d98
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
ContentBrowserClientQt is a singleton which makes it possible
to access it from WebContentsViewQt and removes the need for
patching chromium.
This is similar to how ShellContentBrowserClient is managed
in the content shell.
Change-Id: I67f35520935388888c7230806ad543a58b3211c3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Add proper support for GYPINCLUDES in gyp_generation.
Rename the exclusion gypi to a more generic name so we
can use it for more intrusive changes (we'll need it for mac).
Change-Id: Ie26f579c33d5e35b8c904fab9f448cde11bf0072
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the global factory function content::CreateWebContentsView
is also needed by the web process and we exclude all implementations
we have to place the definition of it in the shared static lib.
However, to prevent the need for moving platform layer classes
back to the shared static lib we have to revert back to use
ContentBrowserClient::OverrideCreateWebContentsView in the API layer
to create our platform WebContentsViewQt and make the global factory
function definition empty.
Change-Id: I9d46524b22458b26a043c80df02b4a5fa7d91a55
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
| |
Do not start the plugin process since pages with flash content
do not load. We need to look into plugin support at some point.
Change-Id: Ia888fc07531d1b904d43dd4e1e97b7a0f5dcf443
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
Use the content::CreateWebContentsView factory function to create the
contents view since we already have to implement it.
Change-Id: Ib60cb29604ac84877e154a47ae27f44672284726
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|