diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-15 11:30:19 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-18 10:29:40 +0000 |
commit | 65909d55417c78e88308644dea30a65fae2d9c4a (patch) | |
tree | fba86d055bc31f5f00f704aec3f953edbeabd08b /src/core/web_contents_view_qt.h | |
parent | e9f3b5a7d1609a169a6b6339b7b8a3c0be191efb (diff) |
Remove hack with passing WebContentsAdapterClient as NativeView
Instead delay creating our render view just a little bit further in
WebContentImpl::OpenWindow until it calls delegate->WebContentsCreated()
Change-Id: Idd911d208bbfe419a2567220933eccb2ba726347
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_contents_view_qt.h')
-rw-r--r-- | src/core/web_contents_view_qt.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h index c7bac1d97..7cd3910f2 100644 --- a/src/core/web_contents_view_qt.h +++ b/src/core/web_contents_view_qt.h @@ -65,7 +65,8 @@ public: , m_factoryClient(nullptr) { } - void initialize(WebContentsAdapterClient* client); + void setFactoryClient(WebContentsAdapterClient* client); + void setClient(WebContentsAdapterClient* client); WebContentsAdapterClient *client() { return m_client; } content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override; @@ -86,9 +87,9 @@ public: gfx::NativeView GetNativeView() const override; - gfx::NativeView GetContentNativeView() const override { return 0; } + gfx::NativeView GetContentNativeView() const override { return nullptr; } - gfx::NativeWindow GetTopLevelNativeWindow() const override { return 0; } + gfx::NativeWindow GetTopLevelNativeWindow() const override { return nullptr; } void GetContainerBounds(gfx::Rect* out) const override; |