summaryrefslogtreecommitdiffstats
path: root/src/core/web_contents_adapter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
-rw-r--r--src/core/web_contents_adapter.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 4b5af4cef..465c7be9d 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -418,15 +418,14 @@ QString WebContentsAdapter::getNavigationEntryTitle(int index)
void WebContentsAdapter::clearNavigationHistory()
{
Q_D(WebContentsAdapter);
- if (d->webContents->GetController().CanPruneAllButVisible())
- d->webContents->GetController().PruneAllButVisible();
+ if (d->webContents->GetController().CanPruneAllButLastCommitted())
+ d->webContents->GetController().PruneAllButLastCommitted();
}
void WebContentsAdapter::setZoomFactor(qreal factor)
{
Q_D(WebContentsAdapter);
- if (content::RenderViewHost *rvh = d->webContents->GetRenderViewHost())
- rvh->SetZoomLevel(content::ZoomFactorToZoomLevel(static_cast<double>(factor)));
+ d->webContents->SetZoomLevel(content::ZoomFactorToZoomLevel(static_cast<double>(factor)));
}
qreal WebContentsAdapter::currentZoomFactor() const
@@ -475,7 +474,7 @@ quint64 WebContentsAdapter::fetchDocumentInnerText()
quint64 WebContentsAdapter::findText(const QString &subString, bool caseSensitively, bool findBackward)
{
Q_D(WebContentsAdapter);
- WebKit::WebFindOptions options;
+ blink::WebFindOptions options;
options.forward = !findBackward;
options.matchCase = caseSensitively;
options.findNext = subString == d->lastSearchedString;