Changeset 52928 in webkit

Timestamp:

Jan 7, 2010 9:29:22 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Allow the application to override online/offline network status
​https://bugs.webkit.org/show_bug.cgi?id=32684

Patch by Yael Aharon <​yael.aharon@nokia.com> on 2010-01-07
Reviewed by Kenneth Rohde Christiansen.

WebCore:

Added API to NetworkStateNotifier for forcing network status.

• platform/network/NetworkStateNotifier.h:
• platform/network/qt/NetworkStateNotifierPrivate.h:
• platform/network/qt/NetworkStateNotifierQt.cpp:

(WebCore::NetworkStateNotifierPrivate::NetworkStateNotifierPrivate):
(WebCore::NetworkStateNotifierPrivate::onlineStateChanged):
(WebCore::NetworkStateNotifierPrivate::networkAccessPermissionChanged):
(WebCore::NetworkStateNotifier::updateState):
(WebCore::NetworkStateNotifier::NetworkStateNotifier):
(WebCore::NetworkStateNotifier::setNetworkAccessAllowed):

WebKit/qt:

Add a setting so that applications can overide the network status.
Applications that use this setting still need to block network access
through QNAM.

• Api/qwebsettings.cpp:

(qt_networkAccessAllowed):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/NetworkStateNotifier.h (modified) (1 diff)
• WebCore/platform/network/qt/NetworkStateNotifierPrivate.h (modified) (1 diff)
• WebCore/platform/network/qt/NetworkStateNotifierQt.cpp (modified) (4 diffs)
• WebKit/qt/Api/qwebsettings.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-07  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Allow the application to override online/offline network status
+        https://bugs.webkit.org/show_bug.cgi?id=32684
+
+        Added API to NetworkStateNotifier for forcing network status.
+
+        * platform/network/NetworkStateNotifier.h:
+        * platform/network/qt/NetworkStateNotifierPrivate.h:
+        * platform/network/qt/NetworkStateNotifierQt.cpp:
+        (WebCore::NetworkStateNotifierPrivate::NetworkStateNotifierPrivate):
+        (WebCore::NetworkStateNotifierPrivate::onlineStateChanged):
+        (WebCore::NetworkStateNotifierPrivate::networkAccessPermissionChanged):
+        (WebCore::NetworkStateNotifier::updateState):
+        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
+        (WebCore::NetworkStateNotifier::setNetworkAccessAllowed):
+
 2010-01-07  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/platform/network/NetworkStateNotifier.h

@@ -59 +59 @@
     
     bool onLine() const { return m_isOnLine; }
-    
+
+#if (PLATFORM(QT) && ENABLE(QT_BEARER))
+    void setNetworkAccessAllowed(bool);
+#endif
+
 private:    
     bool m_isOnLine;

trunk/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h

@@ -38 +38 @@
 public slots:
     void onlineStateChanged(bool);
+    void networkAccessPermissionChanged(bool);
 
 public:
     QtMobility::QNetworkConfigurationManager* m_configurationManager;
     bool m_online;
+    bool m_networkAccessAllowed;
     NetworkStateNotifier* m_notifier;
 };

trunk/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp

@@ -31 +31 @@
     : m_configurationManager(new QNetworkConfigurationManager())
     , m_online(m_configurationManager->isOnline())
+    , m_networkAccessAllowed(true)
     , m_notifier(notifier)
 {
@@ -43 +44 @@
 
     m_online = isOnline;
-    m_notifier->updateState();
+    if (m_networkAccessAllowed)
+        m_notifier->updateState();
+}
+
+void NetworkStateNotifierPrivate::networkAccessPermissionChanged(bool isAllowed)
+{
+    if (isAllowed == m_networkAccessAllowed)
+        return;
+
+    m_networkAccessAllowed = isAllowed;
+    if (m_online)
+        m_notifier->updateState();
 }
 
@@ -53 +65 @@
 void NetworkStateNotifier::updateState()
 {
-    if (m_isOnLine == p->m_online)
+    if (m_isOnLine == (p->m_online && p->m_networkAccessAllowed))
         return;
 
-    m_isOnLine = p->m_online;
+    m_isOnLine = p->m_online && p->m_networkAccessAllowed;
     if (m_networkStateChangedFunction)
         m_networkStateChangedFunction();
@@ -66 +78 @@
 {
     p = new NetworkStateNotifierPrivate(this);
-    m_isOnLine = p->m_online;
+    m_isOnLine = p->m_online && p->m_networkAccessAllowed;
+}
+
+void NetworkStateNotifier::setNetworkAccessAllowed(bool isAllowed)
+{
+    p->networkAccessPermissionChanged(isAllowed);
 }
 

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -47 +47 @@
 #include <QUrl>
 #include <QFileInfo>
+
+#if ENABLE(QT_BEARER)
+#include "NetworkStateNotifier.h"
+#endif
+
+void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed)
+{
+#if ENABLE(QT_BEARER)
+    WebCore::networkStateNotifier().setNetworkAccessAllowed(isAllowed);
+#endif
+}
 
 class QWebSettingsPrivate {

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-01-07  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Allow the application to override online/offline network status
+        https://bugs.webkit.org/show_bug.cgi?id=32684
+
+        Add a setting so that applications can overide the network status.
+        Applications that use this setting still need to block network access
+        through QNAM.
+
+        * Api/qwebsettings.cpp:
+        (qt_networkAccessAllowed):
+
 2010-01-07  Yongjun Zhang  <yongjun.zhang@nokia.com>, Laszlo Gombos  <laszlo.1.gombos@nokia.com>