Import WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12

Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

2 files changed, 7 insertions, 9 deletions

diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index ab15c6315..a4056f996 100644
--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -170,12 +170,7 @@ void tst_QWebFrame::progressSignal()
 
     ::waitForSignal(m_view, SIGNAL(loadFinished(bool)));
 
-    QVERIFY(progressSpy.size() >= 2);
-
-    // WebKit defines initialProgressValue as 10%, not 0%
-    QCOMPARE(progressSpy.first().first().toInt(), 10);
-
-    // But we always end at 100%
+    QVERIFY(progressSpy.size() >= 1);
     QCOMPARE(progressSpy.last().first().toInt(), 100);
 }
 
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 73427cb4b..760a242af 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -3329,9 +3329,12 @@ void tst_QWebPage::contextMenuPopulatedOnce()
     QList<QAction *> list = contextMenu->actions();
     QStringList entries;
     while (!list.isEmpty()) {
-        QString entry = list.takeFirst()->text();
-        QVERIFY(!entries.contains(entry));
-        entries << entry;
+        const QAction* action = list.takeFirst();
+        if (!action->isSeparator()) {
+            QString entry = action->text();
+            QVERIFY(!entries.contains(entry));
+            entries << entry;
+        }
     }
 }