From 65c56752a05b5167bdd4d74ce0d7325a5512c703 Mon Sep 17 00:00:00 2001 From: Joan Karadimov Date: Sun, 26 Mar 2017 23:31:29 +0300 Subject: [PATCH] Move the call to cache initialization to the WebPageManager --- src/WebPage.cpp | 4 ---- src/WebPageManager.cpp | 3 +++ src/WebPageManager.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/WebPage.cpp b/src/WebPage.cpp index d0f1b15..a77db6f 100644 --- a/src/WebPage.cpp +++ b/src/WebPage.cpp @@ -40,10 +40,6 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) { settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true); settings()->setAttribute(QWebSettings::JavascriptCanCloseWindows, true); settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true); - - manager->initOfflineWebApplicationCache(); - - createWindow(); } void WebPage::createWindow() { diff --git a/src/WebPageManager.cpp b/src/WebPageManager.cpp index d7b6b19..36896d6 100644 --- a/src/WebPageManager.cpp +++ b/src/WebPageManager.cpp @@ -57,6 +57,9 @@ WebPage *WebPageManager::currentPage() const { WebPage *WebPageManager::createPage() { WebPage *page = new WebPage(this); + initOfflineWebApplicationCache(); + page->createWindow(); + connect(page, SIGNAL(loadStarted()), this, SLOT(emitLoadStarted())); connect(page, SIGNAL(pageFinished(bool)), diff --git a/src/WebPageManager.h b/src/WebPageManager.h index ba6872e..39a3817 100644 --- a/src/WebPageManager.h +++ b/src/WebPageManager.h @@ -42,7 +42,6 @@ class WebPageManager : public QObject { void setUnknownUrlMode(UnknownUrlHandler::Mode); void allowUrl(const QString &); void blockUrl(const QString &); - void initOfflineWebApplicationCache(); public slots: void emitLoadStarted(); @@ -58,6 +57,7 @@ class WebPageManager : public QObject { private: void emitPageFinished(); static void handleDebugMessage(QtMsgType type, const char *message); + void initOfflineWebApplicationCache(); QList m_pages; QList m_pendingReplies;