Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 146 insertions, 0 deletions

diff --git a/Source/WebCore/platform/network/NetworkStateNotifier.h b/Source/WebCore/platform/network/NetworkStateNotifier.h
new file mode 100644
index 0000000..21d0067
--- /dev/null
+++ b/Source/WebCore/platform/network/NetworkStateNotifier.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef NetworkStateNotifier_h
+#define NetworkStateNotifier_h
+
+#include <wtf/Noncopyable.h>
+#if PLATFORM(ANDROID)
+// TODO: Upstream to webkit.org
+#include "Connection.h"
+#endif
+
+#if PLATFORM(MAC)
+
+#include <wtf/RetainPtr.h>
+#include "Timer.h"
+
+typedef const struct __CFArray * CFArrayRef;
+typedef const struct __SCDynamicStore * SCDynamicStoreRef;
+
+#elif PLATFORM(CHROMIUM)
+
+#include "NetworkStateNotifierPrivate.h"
+
+#elif PLATFORM(WIN)
+
+#include <windows.h>
+
+#elif PLATFORM(QT)
+
+#include <QtCore/qglobal.h>
+
+#ifdef QT_NO_BEARERMANAGEMENT
+#undef ENABLE_QT_BEARER
+#define ENABLE_QT_BEARER 0
+#endif
+
+#endif
+
+namespace WebCore {
+
+#if (PLATFORM(QT) && ENABLE(QT_BEARER))
+class NetworkStateNotifierPrivate;
+#endif
+
+class NetworkStateNotifier : public Noncopyable {
+public:
+    NetworkStateNotifier();
+    void setNetworkStateChangedFunction(void (*)());
+    
+    bool onLine() const { return m_isOnLine; }
+
+#if (PLATFORM(QT) && ENABLE(QT_BEARER))
+    void setNetworkAccessAllowed(bool);
+#endif
+
+#if PLATFORM(ANDROID)
+    // TODO: Upstream to webkit.org
+    Connection::ConnectionType type() const { return m_type; }
+#endif
+
+private:    
+    bool m_isOnLine;
+#if PLATFORM(ANDROID)
+    // TODO: Upstream to webkit.org
+    Connection::ConnectionType m_type;
+#endif
+    void (*m_networkStateChangedFunction)();
+
+    void updateState();
+
+#if PLATFORM(MAC)
+    void networkStateChangeTimerFired(Timer<NetworkStateNotifier>*);
+
+    static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info); 
+
+    RetainPtr<SCDynamicStoreRef> m_store;
+    Timer<NetworkStateNotifier> m_networkStateChangeTimer;
+
+#elif PLATFORM(WIN)
+    static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut);
+    static void callAddressChanged(void*);
+    void addressChanged();
+    
+    void registerForAddressChange();
+    HANDLE m_waitHandle;
+    OVERLAPPED m_overlapped;
+
+#elif PLATFORM(CHROMIUM)
+    NetworkStateNotifierPrivate p;
+
+#elif PLATFORM(ANDROID)
+public:
+    void networkStateChange(bool online);
+    // TODO: Upstream to webkit.org
+    void networkTypeChange(Connection::ConnectionType type);
+
+#elif PLATFORM(QT) && ENABLE(QT_BEARER)
+    friend class NetworkStateNotifierPrivate;
+    NetworkStateNotifierPrivate* p;
+#endif
+};
+
+#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(CHROMIUM) && !(PLATFORM(QT) && ENABLE(QT_BEARER))
+
+inline NetworkStateNotifier::NetworkStateNotifier()
+    : m_isOnLine(true)
+#if PLATFORM(ANDROID)
+    // TODO: Upstream to webkit.org
+    , m_type(Connection::UNKNOWN)
+#endif
+    , m_networkStateChangedFunction(0)
+{    
+}
+
+inline void NetworkStateNotifier::updateState() { }
+
+#endif
+
+NetworkStateNotifier& networkStateNotifier();
+    
+};
+
+#endif // NetworkStateNotifier_h