diff options
author | Steve Block <steveblock@google.com> | 2010-02-02 18:24:12 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:58 +0000 |
commit | 8c1e946b47db286076da27bd0bb86fbdf8cf26ba (patch) | |
tree | d371b058692d1a89efebaa8d1d702ebfc2e2ad93 /WebCore/platform | |
parent | 6140756452d66f35970067d531fbcd4391001994 (diff) | |
download | external_webkit-8c1e946b47db286076da27bd0bb86fbdf8cf26ba.zip external_webkit-8c1e946b47db286076da27bd0bb86fbdf8cf26ba.tar.gz external_webkit-8c1e946b47db286076da27bd0bb86fbdf8cf26ba.tar.bz2 |
Merge webkit.org at r54127 : Network type access has not yet been upstreamed
Have marked these additions with TODOs until upstreamed.
See https://android-git.corp.google.com/g/#change,37402
Change-Id: I0cae1865546797bd17dc76d0c1517f065cae32b1
Diffstat (limited to 'WebCore/platform')
-rw-r--r-- | WebCore/platform/network/NetworkStateNotifier.h | 19 | ||||
-rw-r--r-- | WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp | 4 |
2 files changed, 10 insertions, 13 deletions
diff --git a/WebCore/platform/network/NetworkStateNotifier.h b/WebCore/platform/network/NetworkStateNotifier.h index 77235b8..7b94ac8 100644 --- a/WebCore/platform/network/NetworkStateNotifier.h +++ b/WebCore/platform/network/NetworkStateNotifier.h @@ -28,6 +28,7 @@ #include <wtf/Noncopyable.h> #if PLATFORM(ANDROID) +// TODO: Upstream to webkit.org #include "Connection.h" #endif @@ -61,21 +62,20 @@ public: void setNetworkStateChangedFunction(void (*)()); bool onLine() const { return m_isOnLine; } -<<<<<<< HEAD -#if PLATFORM(ANDROID) - Connection::ConnectionType type() const { return m_type; } -#endif - -======= #if (PLATFORM(QT) && ENABLE(QT_BEARER)) void setNetworkAccessAllowed(bool); #endif ->>>>>>> webkit.org at r54127 +#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)(); @@ -105,14 +105,12 @@ private: #elif PLATFORM(ANDROID) public: void networkStateChange(bool online); -<<<<<<< HEAD + // TODO: Upstream to webkit.org void networkTypeChange(Connection::ConnectionType type); -======= #elif PLATFORM(QT) && ENABLE(QT_BEARER) friend class NetworkStateNotifierPrivate; NetworkStateNotifierPrivate* p; ->>>>>>> webkit.org at r54127 #endif }; @@ -121,6 +119,7 @@ public: inline NetworkStateNotifier::NetworkStateNotifier() : m_isOnLine(true) #if PLATFORM(ANDROID) + // TODO: Upstream to webkit.org , m_type(Connection::Unknown) #endif , m_networkStateChangedFunction(0) diff --git a/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp b/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp index 177ba75..7cc6ceb 100644 --- a/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp +++ b/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp @@ -39,7 +39,7 @@ void NetworkStateNotifier::networkStateChange(bool online) m_networkStateChangedFunction(); } -<<<<<<< HEAD +// TODO: Upstream to webkit.org void NetworkStateNotifier::networkTypeChange(Connection::ConnectionType type) { if (m_type == type) @@ -51,6 +51,4 @@ void NetworkStateNotifier::networkTypeChange(Connection::ConnectionType type) m_networkStateChangedFunction(); } -======= ->>>>>>> webkit.org at r54127 } |