diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-10-29 11:22:51 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-12-11 20:51:50 +0100 |
commit | b2325276152766de8b8aa87e5e5daeb7c2114b35 (patch) | |
tree | 5510365c5580a43d51b4767834f475299e39ac16 /src/core/renderer/content_renderer_client_qt.cpp | |
parent | c175a7fbea6b707de9544ff02eb7351600a3a71b (diff) |
Migrate render_view_observer_qt to mojo
Since mojo interface no longer works on render view, but
on render frame rename the class to be WebEnginePageHost
and WebEnginePageRenderFrame
Keep SetBackgroundColor render message, since it is required
to things work.
Change-Id: I4d6b70dd448926f8ac2d75d2b87f3d490a4cfefb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 62c837cf0..103c73ed0 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -83,7 +83,7 @@ #include "common/qt_messages.h" #include "renderer/render_frame_observer_qt.h" -#include "renderer/render_view_observer_qt.h" +#include "renderer/web_engine_page_render_frame.h" #include "renderer/render_configuration.h" #include "renderer/user_resource_controller.h" #if QT_CONFIG(webengine_webchannel) @@ -188,20 +188,16 @@ void ContentRendererClientQt::ExposeInterfacesToBrowser(mojo::BinderMap* binders #endif } -void ContentRendererClientQt::RenderViewCreated(content::RenderView *render_view) -{ - // RenderViewObservers destroy themselves with their RenderView. - new RenderViewObserverQt(render_view); -} - void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame *render_frame) { QtWebEngineCore::RenderFrameObserverQt *render_frame_observer = new QtWebEngineCore::RenderFrameObserverQt(render_frame, m_webCacheImpl.data()); + if (render_frame->IsMainFrame()) { #if QT_CONFIG(webengine_webchannel) - if (render_frame->IsMainFrame()) new WebChannelIPCTransport(render_frame); #endif + new WebEnginePageRenderFrame(render_frame); + } m_userResourceController->renderFrameCreated(render_frame); |