Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev

1 files changed, 10 insertions, 2 deletions

diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 6576a9c3b..68481dccc 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -600,6 +600,8 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
     }
 
     d->webContents->GetController().LoadURLWithParams(params);
+    // Follow chrome::Navigate and invalidate the URL immediately.
+    d->webContentsDelegate->NavigationStateChanged(d->webContents.get(), content::INVALIDATE_TYPE_URL);
     focusIfNecessary();
 }
 
@@ -641,7 +643,7 @@ void WebContentsAdapter::save(const QString &filePath, int savePageFormat)
 QUrl WebContentsAdapter::activeUrl() const
 {
     Q_D(const WebContentsAdapter);
-    return toQt(d->webContents->GetLastCommittedURL());
+    return d->webContentsDelegate->url();
 }
 
 QUrl WebContentsAdapter::requestedUrl() const
@@ -676,7 +678,7 @@ QUrl WebContentsAdapter::iconUrl() const
 QString WebContentsAdapter::pageTitle() const
 {
     Q_D(const WebContentsAdapter);
-    return toQt(d->webContents->GetTitle());
+    return d->webContentsDelegate->title();
 }
 
 QString WebContentsAdapter::selectedText() const
@@ -1469,6 +1471,12 @@ void WebContentsAdapter::focusIfNecessary()
         d->webContents->Focus();
 }
 
+bool WebContentsAdapter::isFindTextInProgress() const
+{
+    Q_D(const WebContentsAdapter);
+    return d->lastFindRequestId != d->webContentsDelegate->lastReceivedFindReply();
+}
+
 WebContentsAdapterClient::RenderProcessTerminationStatus
 WebContentsAdapterClient::renderProcessExitStatus(int terminationStatus) {
     auto status = WebContentsAdapterClient::RenderProcessTerminationStatus(-1);