Keep page's zoom level on loading new urls

Ammends d236c5a8a3. Zoom level was set as a temporal one, which is
invalidated each time when a renderer process or widget are changed
(on new navigation, for example), so it needs to be reapplied.

Fixes: QTBUG-101030
Change-Id: Iecff9686fbe2b79e99b46f67cab92f66127be085
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 1e27d42a8071532b6cc30a9bcc5f700edc56952a)

2 files changed, 70 insertions, 22 deletions

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 09998eaca..c3796062b 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -791,20 +791,44 @@ void tst_QQuickWebEngineView::inputMethodHints()
 void tst_QQuickWebEngineView::setZoomFactor()
 {
     QQuickWebEngineView *view = webEngineView();
+    m_window->show();
+    view->setSize(QSizeF(320, 240));
 
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 1.0));
+    QCOMPARE(view->zoomFactor(), 1.0);
     view->setZoomFactor(2.5);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
-    view->setUrl(urlFromTestPath("html/basic_page.html"));
+    const QUrl url1 = urlFromTestPath("html/basic_page.html"), url2 = urlFromTestPath("html/basic_page2.html");
+
+    view->setUrl(url1);
     QVERIFY(waitForLoadSucceeded(view));
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
     view->setZoomFactor(0.1);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
     view->setZoomFactor(5.5);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
+
+    QScopedPointer<QQuickWebEngineView> view2(newWebEngineView());
+    view2->setSize(QSizeF(320, 240));
+    view2->setParentItem(m_window->contentItem());
+
+    // try loading different url and check new values after load
+    for (auto &&p : {
+            qMakePair(view, 2.5), // navigating away to different url should keep zoom
+            qMakePair(view2.get(), 1.0), // same url navigation in diffent page shouldn't be affected
+        }) {
+        auto &&view = p.first; auto zoomFactor = p.second;
+        view->setUrl(url2);
+        QVERIFY(waitForLoadSucceeded(view));
+        QCOMPARE(view->zoomFactor(), zoomFactor);
+    }
+
+    // should have no influence on first page
+    view2->setZoomFactor(3.5);
+    for (auto &&p : { qMakePair(view, 2.5), qMakePair(view2.get(), 3.5), })
+        QCOMPARE(p.first->zoomFactor(), p.second);
 }
 
 void tst_QQuickWebEngineView::printToPdf()
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 5df09357f..78d0a9862 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -73,6 +73,13 @@ static void removeRecursive(const QString& dirname)
     QDir().rmdir(dirname);
 }
 
+struct TestBasePage : QWebEnginePage
+{
+    explicit TestBasePage(QWebEngineProfile *profile, QObject *parent = nullptr) : QWebEnginePage(profile, parent) { }
+    explicit TestBasePage(QObject *parent = nullptr) : QWebEnginePage(parent) { }
+    QSignalSpy loadSpy { this, &QWebEnginePage::loadFinished };
+};
+
 class tst_QWebEnginePage : public QObject
 {
     Q_OBJECT
@@ -3038,25 +3045,42 @@ void tst_QWebEnginePage::toPlainTextLoadFinishedRace()
 
 void tst_QWebEnginePage::setZoomFactor()
 {
-    QWebEnginePage page;
+    TestBasePage page, page2;
 
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 1.0));
+    QCOMPARE(page.zoomFactor(), 1.0);
     page.setZoomFactor(2.5);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
-
-    const QUrl urlToLoad("qrc:/resources/test1.html");
-
-    QSignalSpy finishedSpy(&page, SIGNAL(loadFinished(bool)));
-    page.load(urlToLoad);
-    QTRY_COMPARE(finishedSpy.count(), 1);
-    QVERIFY(finishedSpy.at(0).first().toBool());
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
-
-    page.setZoomFactor(5.5);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    const QUrl url1("qrc:/resources/test1.html"), url2(QUrl("qrc:/resources/test2.html"));
+
+    page.load(url1);
+    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QVERIFY(page.loadSpy.at(0).first().toBool());
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    page.setZoomFactor(5.5); // max accepted zoom: kMaximumPageZoomFactor = 5.0
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    page.setZoomFactor(0.1); // min accepted zoom: kMinimumPageZoomFactor = 0.25
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    // try loading different url and check new values after load
+    page.loadSpy.clear();
+    for (auto &&p : {
+            qMakePair(&page, 2.5), // navigating away to different url should keep zoom
+            qMakePair(&page2, 1.0), // same url navigation in diffent page shouldn't be affected
+        }) {
+        auto &&page = *p.first; auto zoomFactor = p.second;
+        page.load(url2);
+        QTRY_COMPARE(page.loadSpy.count(), 1);
+        QVERIFY(page.loadSpy.last().first().toBool());
+        QCOMPARE(page.zoomFactor(), zoomFactor);
+    }
 
-    page.setZoomFactor(0.1);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    // should have no influence on first page
+    page2.setZoomFactor(3.5);
+    for (auto &&p : { qMakePair(&page, 2.5), qMakePair(&page2, 3.5), })
+        QCOMPARE(p.first->zoomFactor(), p.second);
 }
 
 void tst_QWebEnginePage::mouseButtonTranslation()