From 9a1a09bf82ea98a2b69b351120619c787ce990a8 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 20 Mar 2014 16:05:49 +0100 Subject: Adapt to API changes in new stable branch 1750 Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4 Reviewed-by: Pierre Rossi Reviewed-by: Zeno Albisser --- src/core/web_contents_adapter.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/core/web_contents_adapter.cpp') 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(factor))); + d->webContents->SetZoomLevel(content::ZoomFactorToZoomLevel(static_cast(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; -- cgit v1.2.3