mirror of https://github.com/vitalif/phantomjs
This reverts commit 5acaa6b42d
.
Conflicts:
src/phantom.cpp
src/phantom.h
removed m_page deletion.
http://code.google.com/p/phantomjs/issues/detail?id=719
1.8
parent
9f8056334e
commit
ecda224233
|
@ -93,7 +93,6 @@ void Phantom::init()
|
||||||
CookieJar::instance(m_config.cookiesFile());
|
CookieJar::instance(m_config.cookiesFile());
|
||||||
|
|
||||||
m_page = new WebPage(this, QUrl::fromLocalFile(m_config.scriptFile()));
|
m_page = new WebPage(this, QUrl::fromLocalFile(m_config.scriptFile()));
|
||||||
m_pages.append(m_page);
|
|
||||||
|
|
||||||
QString proxyType = m_config.proxyType();
|
QString proxyType = m_config.proxyType();
|
||||||
if (proxyType != "none") {
|
if (proxyType != "none") {
|
||||||
|
@ -265,10 +264,6 @@ void Phantom::setCookiesEnabled(const bool value)
|
||||||
QObject *Phantom::createWebPage()
|
QObject *Phantom::createWebPage()
|
||||||
{
|
{
|
||||||
WebPage *page = new WebPage(this);
|
WebPage *page = new WebPage(this);
|
||||||
|
|
||||||
// Store pointer to the page for later cleanup
|
|
||||||
m_pages.append(page);
|
|
||||||
// Apply default settings to the page
|
|
||||||
page->applySettings(m_defaultPageSettings);
|
page->applySettings(m_defaultPageSettings);
|
||||||
|
|
||||||
// Show web-inspector if in debug mode
|
// Show web-inspector if in debug mode
|
||||||
|
@ -407,9 +402,6 @@ void Phantom::doExit(int code)
|
||||||
emit aboutToExit(code);
|
emit aboutToExit(code);
|
||||||
m_terminated = true;
|
m_terminated = true;
|
||||||
m_returnValue = code;
|
m_returnValue = code;
|
||||||
qDeleteAll(m_pages);
|
|
||||||
m_pages.clear();
|
|
||||||
m_page = 0;
|
|
||||||
QApplication::instance()->exit(code);
|
QApplication::instance()->exit(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,7 +182,6 @@ private:
|
||||||
QVariantMap m_defaultPageSettings;
|
QVariantMap m_defaultPageSettings;
|
||||||
FileSystem *m_filesystem;
|
FileSystem *m_filesystem;
|
||||||
System *m_system;
|
System *m_system;
|
||||||
QList<QPointer<WebPage> > m_pages;
|
|
||||||
QList<QPointer<WebServer> > m_servers;
|
QList<QPointer<WebServer> > m_servers;
|
||||||
Config m_config;
|
Config m_config;
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,6 @@ protected:
|
||||||
newPage = new WebPage(m_webPage);
|
newPage = new WebPage(m_webPage);
|
||||||
} else {
|
} else {
|
||||||
newPage = new WebPage(Phantom::instance());
|
newPage = new WebPage(Phantom::instance());
|
||||||
Phantom::instance()->m_pages.append(newPage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply default settings
|
// Apply default settings
|
||||||
|
|
Loading…
Reference in New Issue