Changeset 90837 in webkit

Timestamp:

Jul 12, 2011 11:55:41 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

[Qt][WK2] Navigation actions should react to web process availability.
​https://bugs.webkit.org/show_bug.cgi?id=64375

Reviewed by Benjamin Poulain.

When the web process is unavailable, the reload and stop actions should
behave slightly differently. Stop should always be disabled, and reload
should be enabled if there's a reloadable item in the back/forward list.

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

(tst_QDesktopWebView::navigationActionEnabledStatusAtStartup):

• UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp:

(tst_QTouchWebView::navigationActionEnabledStatusAtStartup):

• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::updateAction):
(QtWebPageProxy::didRelaunchProcess):
(QtWebPageProxy::processDidCrash):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp (modified) (3 diffs)
• UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-12  Andreas Kling  <kling@webkit.org>
+
+        [Qt][WK2] Navigation actions should react to web process availability.
+        https://bugs.webkit.org/show_bug.cgi?id=64375
+
+        Reviewed by Benjamin Poulain.
+
+        When the web process is unavailable, the reload and stop actions should
+        behave slightly differently. Stop should always be disabled, and reload
+        should be enabled if there's a reloadable item in the back/forward list.
+
+        * UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp:
+        (tst_QDesktopWebView::navigationActionEnabledStatusAtStartup):
+        * UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp:
+        (tst_QTouchWebView::navigationActionEnabledStatusAtStartup):
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::updateAction):
+        (QtWebPageProxy::didRelaunchProcess):
+        (QtWebPageProxy::processDidCrash):
+
 2011-07-12  Andreas Kling  <kling@webkit.org>
 

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

@@ -18 +18 @@
 */
 
+#include <QAction>
 #include <QScopedPointer>
 #include <QtTest/QtTest>
@@ -29 +30 @@
     void init();
     void cleanup();
+
+    void navigationActionsStatusAtStartup();
 
 private:
@@ -50 +53 @@
 }
 
+void tst_QDesktopWebView::navigationActionsStatusAtStartup()
+{
+    QAction* backAction = webView()->navigationAction(QtWebKit::Back);
+    QVERIFY(backAction);
+    QCOMPARE(backAction->isEnabled(), false);
+
+    QAction* forwardAction = webView()->navigationAction(QtWebKit::Forward);
+    QVERIFY(forwardAction);
+    QCOMPARE(forwardAction->isEnabled(), false);
+
+    QAction* stopAction = webView()->navigationAction(QtWebKit::Stop);
+    QVERIFY(stopAction);
+    QCOMPARE(stopAction->isEnabled(), false);
+
+    QAction* reloadAction = webView()->navigationAction(QtWebKit::Reload);
+    QVERIFY(reloadAction);
+    QCOMPARE(reloadAction->isEnabled(), false);
+}
+
 QTEST_MAIN(tst_QDesktopWebView)
 

trunk/Source/WebKit2/UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp

@@ -18 +18 @@
 */
 
+#include <QAction>
 #include <QtTest/QtTest>
 #include <qtouchwebpage.h>
@@ -34 +35 @@
 
     void accessPage();
+    void navigationActionsStatusAtStartup();
 
 private:
@@ -69 +71 @@
 }
 
+void tst_QTouchWebView::navigationActionsStatusAtStartup()
+{
+    QAction* backAction = webView()->page()->navigationAction(QtWebKit::Back);
+    QVERIFY(backAction);
+    QCOMPARE(backAction->isEnabled(), false);
+
+    QAction* forwardAction = webView()->page()->navigationAction(QtWebKit::Forward);
+    QVERIFY(forwardAction);
+    QCOMPARE(forwardAction->isEnabled(), false);
+
+    QAction* stopAction = webView()->page()->navigationAction(QtWebKit::Stop);
+    QVERIFY(stopAction);
+    QCOMPARE(stopAction->isEnabled(), false);
+
+    QAction* reloadAction = webView()->page()->navigationAction(QtWebKit::Reload);
+    QVERIFY(reloadAction);
+    QCOMPARE(reloadAction->isEnabled(), false);
+}
+
+
 QTEST_MAIN(tst_QTouchWebView)
 

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

@@ -34 +34 @@
 #include "NativeWebKeyboardEvent.h"
 #include "NotImplemented.h"
+#include "WebBackForwardList.h"
 #include "WebContext.h"
 #include "WebContextMenuProxyQt.h"
@@ -481 +482 @@
 
     RefPtr<WebKit::WebFrameProxy> mainFrame = m_webPageProxy->mainFrame();
-    if (!mainFrame)
-        return;
 
     bool enabled = a->isEnabled();
-    bool checked = a->isChecked();
 
     switch (action) {
@@ -495 +493 @@
         break;
     case QtWebPageProxy::Stop:
-        enabled = !(WebFrameProxy::LoadStateFinished == mainFrame->loadState());
+        enabled = mainFrame && !(WebFrameProxy::LoadStateFinished == mainFrame->loadState());
         break;
     case QtWebPageProxy::Reload:
-        enabled = (WebFrameProxy::LoadStateFinished == mainFrame->loadState());
+        if (mainFrame)
+            enabled = (WebFrameProxy::LoadStateFinished == mainFrame->loadState());
+        else
+            enabled = m_webPageProxy->backForwardList()->currentItem();
         break;
     default:
-        break;
+        ASSERT_NOT_REACHED();
     }
 
     a->setEnabled(enabled);
-
-    if (a->isCheckable())
-        a->setChecked(checked);
 }
 
@@ -529 +527 @@
 void QtWebPageProxy::didRelaunchProcess()
 {
+    updateNavigationActions();
     m_viewInterface->didRelaunchProcess();
     setDrawingAreaSize(m_viewInterface->drawingAreaSize());
@@ -535 +534 @@
 void QtWebPageProxy::processDidCrash()
 {
+    updateNavigationActions();
     m_viewInterface->processDidCrash();
 }