src/WebPage.cpp in capybara-webkit-0.14.0 vs src/WebPage.cpp in capybara-webkit-0.14.1
- old
+ new
@@ -68,11 +68,11 @@
m_capybaraJavascript = javascriptString;
}
}
void WebPage::setUserStylesheet() {
- QString data = QString("*, :first-line, :first-letter, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64();
+ QString data = QString("*, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64();
QUrl url = QUrl(QString("data:text/css;charset=utf-8;base64,") + data);
settings()->setUserStyleSheetUrl(url);
}
QString WebPage::userAgentForUrl(const QUrl &url ) const {
@@ -191,15 +191,16 @@
return message;
else
return message + m_errorPageMessage;
}
-bool WebPage::render(const QString &fileName) {
+bool WebPage::render(const QString &fileName, const QSize &minimumSize) {
QFileInfo fileInfo(fileName);
QDir dir;
dir.mkpath(fileInfo.absolutePath());
QSize viewportSize = this->viewportSize();
+ this->setViewportSize(minimumSize);
QSize pageSize = this->mainFrame()->contentsSize();
if (pageSize.isEmpty()) {
return false;
}