Changeset 90844 in webkit

Timestamp:

Jul 12, 2011 1:25:22 PM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

[Qt][WK2] Navigation actions in incorrect state when loadStarted() is emitted.
​https://bugs.webkit.org/show_bug.cgi?id=64383

Reviewed by Kenneth Rohde Christiansen.

Update the navigation actions before emitting loadStarted().

• UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp:

(LoadStartedCatcher::LoadStartedCatcher):
(LoadStartedCatcher::onLoadStarted):
(tst_QDesktopWebView::stopActionEnabledAfterLoadStarted):

• UIProcess/qt/ClientImpl.cpp:

(qt_wk_didStartProvisionalLoadForFrame):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp (modified) (3 diffs)
• UIProcess/qt/ClientImpl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-12  Andreas Kling  <kling@webkit.org>
+
+        [Qt][WK2] Navigation actions in incorrect state when loadStarted() is emitted.
+        https://bugs.webkit.org/show_bug.cgi?id=64383
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Update the navigation actions before emitting loadStarted().
+
+        * UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp:
+        (LoadStartedCatcher::LoadStartedCatcher):
+        (LoadStartedCatcher::onLoadStarted):
+        (tst_QDesktopWebView::stopActionEnabledAfterLoadStarted):
+        * UIProcess/qt/ClientImpl.cpp:
+        (qt_wk_didStartProvisionalLoadForFrame):
+
 2011-07-12  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp

@@ -23 +23 @@
 #include <qdesktopwebview.h>
 #include "../testwindow.h"
+#include "../util.h"
 
 class tst_QDesktopWebView : public QObject {
@@ -32 +33 @@
 
     void navigationActionsStatusAtStartup();
+    void stopActionEnabledAfterLoadStarted();
 
 private:
@@ -72 +74 @@
 }
 
+class LoadStartedCatcher : public QObject {
+    Q_OBJECT
+public:
+    LoadStartedCatcher(QDesktopWebView* webView)
+        : m_webView(webView)
+    {
+        connect(m_webView, SIGNAL(loadStarted()), this, SLOT(onLoadStarted()));
+    }
+
+public slots:
+    void onLoadStarted()
+    {
+        QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
+
+        QAction* stopAction = m_webView->navigationAction(QtWebKit::Stop);
+        QVERIFY(stopAction);
+        QCOMPARE(stopAction->isEnabled(), true);
+    }
+
+signals:
+    void finished();
+
+private:
+    QDesktopWebView* m_webView;
+};
+
+void tst_QDesktopWebView::stopActionEnabledAfterLoadStarted()
+{
+    QAction* stopAction = webView()->navigationAction(QtWebKit::Stop);
+    QVERIFY(stopAction);
+    QCOMPARE(stopAction->isEnabled(), false);
+
+    LoadStartedCatcher catcher(webView());
+    webView()->load(QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")));
+    waitForSignal(&catcher, SIGNAL(finished()));
+
+    QCOMPARE(stopAction->isEnabled(), true);
+
+    waitForSignal(webView(), SIGNAL(loadSucceeded()));
+}
+
 QTEST_MAIN(tst_QDesktopWebView)
 

trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp

@@ -70 +70 @@
     if (!WKFrameIsMainFrame(frame))
         return;
+
+    toQtWebPageProxy(clientInfo)->updateNavigationActions();
     toQtWebPageProxy(clientInfo)->loadDidBegin();
-    toQtWebPageProxy(clientInfo)->updateNavigationActions();
 }