summaryrefslogtreecommitdiffstats
path: root/lib/quick/qquickwebengineview.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-10-31 17:06:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-06 17:34:20 +0100
commitfb62607e950ac711f7366b378d8d5f952d4fd1b3 (patch)
tree5ceb5adaee848f63ec9f27188068e496fb099b8e /lib/quick/qquickwebengineview.cpp
parentfbf3e79512358a3eb1e6589b10ac01917b2e94d0 (diff)
Make RenderWidgetHostViewQtDelegate a pure interface.
RenderWidgetHostViewQtDelegate acts as a bidirectional interface to avoid exporting Chromium symbols outside of the core dynamic library. The problem is that, other than this, from the top layer point of view, its responsibilities are the same as RenderWidgetHostViewQt, and it would be better not to split its logic without properly defined responsibilities. Using it as a base class and interfacing through its protected methods is also cumbersome and make the destination of calls on the upper layer difficult to discern. Use instead a dual pure interface mechanism like WebContentsAdapter and pass the callback client interface directly in WebContentsAdapterClient::CreateRenderWidgetHostViewQtDelegate. This allows RenderWidgetHostViewQtDelegate to be solely what it should be, an interface. Change-Id: I4e55439ae7f9539cc9e360f0756fbf391405f3b7 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/quick/qquickwebengineview.cpp')
-rw-r--r--lib/quick/qquickwebengineview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/quick/qquickwebengineview.cpp b/lib/quick/qquickwebengineview.cpp
index 4b58c6c04..0fad5c985 100644
--- a/lib/quick/qquickwebengineview.cpp
+++ b/lib/quick/qquickwebengineview.cpp
@@ -57,13 +57,13 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
adapter->initialize(this);
}
-RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(CompositingMode mode)
+RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, CompositingMode mode)
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
if (mode == DelegatedCompositing)
- return new RenderWidgetHostViewQtDelegateQuick;
+ return new RenderWidgetHostViewQtDelegateQuick(client);
#endif
- return new RenderWidgetHostViewQtDelegateQuickPainted;
+ return new RenderWidgetHostViewQtDelegateQuickPainted(client);
}
void QQuickWebEngineViewPrivate::titleChanged(const QString &title)