Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Fix crash when creating window from PopupWindow

Browse Source
This commit is contained in:
David Rosca 2015-08-30 16:53:51 +02:00
parent b53bf49f75
commit 1683d5aaaf
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lib/webengine/webpage.cpp
View File

@ -76,7 +76,6 @@ QStringList WebPage::s_ignoredSslErrors;
WebPage::WebPage(QObject* parent)
: QWebEnginePage(mApp->webProfile(), parent)
, m_view(0)
, m_fileWatcher(0)
, m_runningLoop(0)
, m_loadProgress(-1)
@ -86,6 +85,7 @@ WebPage::WebPage(QObject* parent)
{
connect(this, &QWebEnginePage::loadProgress, this, &WebPage::progress);
connect(this, &QWebEnginePage::loadFinished, this, &WebPage::finished);
connect(this, &QWebEnginePage::urlChanged, this, &WebPage::urlChanged);
connect(this, &QWebEnginePage::featurePermissionRequested, this, &WebPage::featurePermissionRequested);
connect(this, &QWebEnginePage::windowCloseRequested, this, &WebPage::windowCloseRequested);
@ -102,23 +102,6 @@ WebPage::~WebPage()
}
}
void WebPage::setWebView(TabbedWebView* view)
{
if (m_view == view) {
return;
}
if (m_view) {
delete m_view;
m_view = 0;
}
m_view = view;
m_view->setWebPage(this);
connect(m_view, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));
}
void WebPage::scheduleAdjustPage()
{
WebView* webView = qobject_cast<WebView*>(view());
@ -926,7 +909,7 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c
return false;
}
WebView* webView = qobject_cast<WebView*>(originatingFrame->page()->view());
WebView* webView = qobject_cast<WebView*>(view());
ResizableFrame* widget = new ResizableFrame(webView->overlayWidget());
widget->setObjectName("jsFrame");
@ -935,7 +918,7 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c
ui->message->setText(msg);
ui->lineEdit->setText(defaultValue);
ui->lineEdit->setFocus();
widget->resize(originatingFrame->page()->viewportSize());
widget->resize(webView->size());
widget->show();
connect(webView, SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize)));
@ -970,7 +953,7 @@ bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg)
return false;
}
WebView* webView = qobject_cast<WebView*>(originatingFrame->page()->view());
WebView* webView = qobject_cast<WebView*>(view());
ResizableFrame* widget = new ResizableFrame(webView->overlayWidget());
widget->setObjectName("jsFrame");
@ -978,7 +961,7 @@ bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg)
ui->setupUi(widget);
ui->message->setText(msg);
ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
widget->resize(originatingFrame->page()->viewportSize());
widget->resize(webView->size());
widget->show();
connect(webView, SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize)));
@ -1024,7 +1007,7 @@ void WebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg)
m_blockAlerts = dialog.isChecked();
#else
WebView* webView = qobject_cast<WebView*>(originatingFrame->page()->view());
WebView* webView = qobject_cast<WebView*>(view());
ResizableFrame* widget = new ResizableFrame(webView->overlayWidget());
widget->setObjectName("jsFrame");
@ -1032,7 +1015,7 @@ void WebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg)
ui->setupUi(widget);
ui->message->setText(msg);
ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
widget->resize(originatingFrame->page()->viewportSize());
widget->resize(webView->size());
widget->show();
connect(webView, SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize)));
@ -1062,11 +1045,14 @@ void WebPage::setJavaScriptEnabled(bool enabled)
QWebEnginePage* WebPage::createWindow(QWebEnginePage::WebWindowType type)
{
TabbedWebView *tView = qobject_cast<TabbedWebView*>(view());
BrowserWindow *window = tView ? tView->browserWindow() : mApp->getWindow();
switch (type) {
case QWebEnginePage::WebBrowserWindow: // TODO
case QWebEnginePage::WebBrowserTab: {
int index = m_view->browserWindow()->tabWidget()->addView(QUrl(), Qz::NT_CleanSelectedTab);
TabbedWebView* view = m_view->browserWindow()->weView(index);
int index = window->tabWidget()->addView(QUrl(), Qz::NT_CleanSelectedTab);
TabbedWebView* view = window->weView(index);
view->setPage(new WebPage);
return view->page();
}
@ -1076,7 +1062,7 @@ QWebEnginePage* WebPage::createWindow(QWebEnginePage::WebWindowType type)
view->setPage(new WebPage);
PopupWindow* popup = new PopupWindow(view);
popup->show();
m_view->browserWindow()->addDeleteOnCloseWidget(popup);
window->addDeleteOnCloseWidget(popup);
return view->page();
}

3
src/lib/webengine/webpage.h
View File

@ -30,7 +30,6 @@ class QWebEngineDownloadItem;
class BrowserWindow;
class AdBlockRule;
class TabbedWebView;
class SpeedDial;
class NetworkManagerProxy;
class DelayedFileWatcher;
@ -51,7 +50,6 @@ public:
WebPage(QObject* parent = 0);
~WebPage();
void setWebView(TabbedWebView* view);
void populateNetworkRequest(QNetworkRequest &request);
void setSSLCertificate(const QSslCertificate &cert);
@ -120,7 +118,6 @@ private:
static QStringList s_ignoredSslErrors;
NetworkManagerProxy* m_networkProxy;
TabbedWebView* m_view;
DelayedFileWatcher* m_fileWatcher;
QEventLoop* m_runningLoop;

1
src/lib/webtab/tabbedwebview.cpp
View File

@ -53,7 +53,6 @@ TabbedWebView::TabbedWebView(WebTab* webTab)
void TabbedWebView::setWebPage(WebPage* page)
{
page->setWebView(this);
page->setParent(this);
setPage(page);