Changeset 161830 in webkit

Timestamp:

Jan 12, 2014, 12:59:30 PM (12 years ago)

Author:

andersca@apple.com

Message:

Clean up NetworkStateNotifier class
​https://bugs.webkit.org/show_bug.cgi?id=126850

Reviewed by Andreas Kling.

Use std::call_once instead of AtomicallyInitializedStatic and a std::function
instead of a custom function pointer typedef.

• platform/network/NetworkStateNotifier.cpp:

(WebCore::networkStateNotifier):
(WebCore::NetworkStateNotifier::addNetworkStateChangeListener):
(WebCore::NetworkStateNotifier::notifyNetworkStateChange):

• platform/network/NetworkStateNotifier.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/NetworkStateNotifier.cpp (modified) (2 diffs)
• platform/network/NetworkStateNotifier.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-12  Anders Carlsson  <andersca@apple.com>
+
+        Clean up NetworkStateNotifier class
+        https://bugs.webkit.org/show_bug.cgi?id=126850
+
+        Reviewed by Andreas Kling.
+
+        Use std::call_once instead of AtomicallyInitializedStatic and a std::function
+        instead of a custom function pointer typedef.
+
+        * platform/network/NetworkStateNotifier.cpp:
+        (WebCore::networkStateNotifier):
+        (WebCore::NetworkStateNotifier::addNetworkStateChangeListener):
+        (WebCore::NetworkStateNotifier::notifyNetworkStateChange):
+        * platform/network/NetworkStateNotifier.h:
+
 2014-01-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp

@@ -27 +27 @@
 #include "NetworkStateNotifier.h"
 
+#include <mutex>
 #include <wtf/Assertions.h>
 #include <wtf/StdLibExtras.h>
-#include <wtf/Threading.h>
 
 namespace WebCore {
@@ -35 +35 @@
 NetworkStateNotifier& networkStateNotifier()
 {
-    AtomicallyInitializedStatic(NetworkStateNotifier*, networkStateNotifier = new NetworkStateNotifier);
+    static std::once_flag onceFlag;
+    static NetworkStateNotifier* networkStateNotifier;
+
+    std::call_once(onceFlag, []{
+        networkStateNotifier = std::make_unique<NetworkStateNotifier>().release();
+    });
 
     return *networkStateNotifier;
 }
 
-void NetworkStateNotifier::addNetworkStateChangeListener(NetworkStateChangeListener listener)
+void NetworkStateNotifier::addNetworkStateChangeListener(std::function<void (bool)> listener)
 {
     ASSERT(listener);
-    m_listeners.append(listener);
+
+    m_listeners.append(std::move(listener));
 }
 
 void NetworkStateNotifier::notifyNetworkStateChange()
 {
-    Vector<NetworkStateChangeListener>::iterator end = m_listeners.end();
-    for (Vector<NetworkStateChangeListener>::iterator it = m_listeners.begin(); it != end; ++it)
-        (*it)(m_isOnLine);
+    for (const auto& listener : m_listeners)
+        listener(m_isOnLine);
 }
 
-}
+} // namespace WebCore

trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

@@ -59 +59 @@
     ~NetworkStateNotifier();
 #endif
-    typedef void (*NetworkStateChangeListener)(bool m_isOnLine);
-    void addNetworkStateChangeListener(NetworkStateChangeListener);
+    void addNetworkStateChangeListener(std::function<void (bool isOnLine)>);
 
     bool onLine() const { return m_isOnLine; }
@@ -70 +69 @@
 private:
     bool m_isOnLine;
-    Vector<NetworkStateChangeListener> m_listeners;
+    Vector<std::function<void (bool)>> m_listeners;
 
     void notifyNetworkStateChange();