wilderjds
/
falkon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when render process crashes

Browse Source 
Tab crash page is now correctly loaded and offers user to reload the
page.
remotes/origin/falkon
David Rosca 9 years ago
parent 45f37a3a64
commit 4878265ff6
2 changed files with 4 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/lib/data/html/tabcrash.html
  2. 11
      src/lib/webengine/webpage.cpp

2
src/lib/data/html/tabcrash.html
Unescape View File

@ -15,7 +15,7 @@ li {padding: 5px;}
</head>
<body>
<div id="box">
<img src="%IMAGE%" >
<img src="%IMAGE%" width=45>
<h1>%HEADING%</h1>
<ul>
<li>%LI-1%</li>

11
src/lib/webengine/webpage.cpp
Unescape View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* QupZilla - Qt web browser
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -376,21 +376,16 @@ void WebPage::renderProcessTerminated(QWebEnginePage::RenderProcessTerminationSt
if (terminationStatus == NormalTerminationStatus)
return;
if (qstrcmp(qVersion(), "5.7.0") == 0) {
// Crashes with QtWebEngine 5.7.0
return;
}
QTimer::singleShot(0, this, [this]() {
QString page = QzTools::readAllFileContents(":html/tabcrash.html");
page.replace(QL1S("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString());
page.replace(QL1S("%FAVICON%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16)).toString());
page.replace(QL1S("%TITLE%"), tr("Failed loading page"));
page.replace(QL1S("%HEADING%"), tr("Failed loading page"));
page.replace(QL1S("%LI-1%"), tr("Something went wrong while loading this page."));
page.replace(QL1S("%LI-2%"), tr("Try reloading the page or closing some tabs to make more memory available."));
page.replace(QL1S("%RELOAD-PAGE%"), tr("Reload page"));
page = QzTools::applyDirectionToPage(page);
load(url()); // Workaround for QtWebEngine crash
setHtml(page.toUtf8(), url());
});
}

Write Preview
Loading…
Cancel
Save