diff options
author | Adam Kallai <kadam@inf.u-szeged.hu> | 2014-09-15 02:18:01 -0700 |
---|---|---|
committer | Adam Kallai <kadam@inf.u-szeged.hu> | 2014-09-23 22:07:03 +0200 |
commit | a193b3b9abb6d742b40d0a8067155932a5c2c2d3 (patch) | |
tree | f66e946da6921fd0f0f2ab80fbbfa1d48f58802a /src/core/web_contents_delegate_qt.h | |
parent | 599df4b32bffedcaebb3dbd1605d919642e72e69 (diff) |
Fix an assertion in web_content_delegates_qt.cpp
If we get a replacement content, we can see a DidFinishLoad event for a frame.
This error page should be ignored based on the frame.
Change-Id: I3e1cd1773e8c5fc608605197c957011ddf258123
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/web_contents_delegate_qt.h')
-rw-r--r-- | src/core/web_contents_delegate_qt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h index b7a23d3c2..2ab5fc8cd 100644 --- a/src/core/web_contents_delegate_qt.h +++ b/src/core/web_contents_delegate_qt.h @@ -60,6 +60,7 @@ class WebContentsDelegateQt : public content::WebContentsDelegate { public: WebContentsDelegateQt(content::WebContents*, WebContentsAdapterClient *adapterClient); + ~WebContentsDelegateQt() { Q_ASSERT(m_loadingErrorFrameList.isEmpty()); } QString lastSearchedString() const { return m_lastSearchedString; } void setLastSearchedString(const QString &s) { m_lastSearchedString = s; } int lastReceivedFindReply() const { return m_lastReceivedFindReply; } @@ -94,7 +95,7 @@ private: WebContentsAdapterClient *m_viewClient; QString m_lastSearchedString; int m_lastReceivedFindReply; - bool m_isLoadingErrorPage; + QList<int64> m_loadingErrorFrameList; }; #endif // WEB_CONTENTS_DELEGATE_QT_H |