diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-10 13:55:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-10 12:33:44 +0000 |
| commit | d3978d733ffba103bfd60b53ded1e47fc5b03075 (patch) | |
| tree | dbfcc027e6b6e27c898cdbcb613a84c6d4d14a87 /src/core/web_contents_delegate_qt.cpp | |
| parent | f590b159c56d9112ae8f6f2aeb960a365a881ac5 (diff) | |
Fix assert on exit
Remove frame loading error-page when frame is deleted, and make sure
WebContents is destroyed before the observer so the observer can observe
the full live-span including deletions..
Task-number: QTBUG-47945
Change-Id: I56bec611b8bfbfc6f75a1bc2108efbc80a81729b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index f9db91b3e..c16c76f75 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -143,6 +143,11 @@ void WebContentsDelegateQt::HandleKeyboardEvent(content::WebContents *, const co m_viewClient->unhandledKeyEvent(reinterpret_cast<QKeyEvent *>(event.os_event)); } +void WebContentsDelegateQt::RenderFrameDeleted(content::RenderFrameHost *render_frame_host) +{ + m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID()); +} + void WebContentsDelegateQt::DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, const GURL& validated_url, bool is_error_page, bool is_iframe_srcdoc) { if (is_error_page) { |