Changeset 121170 in webkit

Timestamp:

Jun 25, 2012 11:01:42 AM (12 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[EFL] Implement Network Information API
​https://bugs.webkit.org/show_bug.cgi?id=87067

Reviewed by Kenneth Rohde Christiansen.

.:

• Source/cmake/FindEFL.cmake: Find eeze library in build system.

Source/WebKit:

• PlatformEfl.cmake: Add dependency of eeze library.

Source/WebKit/efl:

Implement NetworkInfoClientEfl.cpp using eeze library. However, this patch only
supports this feature on ethernet interface.

• WebCoreSupport/NetworkInfoClientEfl.cpp:

(WebCore):
(WebCore::NetworkInfoClientEfl::NetworkInfoClientEfl):
(WebCore::NetworkInfoClientEfl::startUpdating):
(WebCore::NetworkInfoClientEfl::stopUpdating):
(WebCore::NetworkInfoClientEfl::bandwidth):
(WebCore::NetworkInfoClientEfl::metered):

• WebCoreSupport/NetworkInfoClientEfl.h:

(NetworkInfoClientEfl):

Tools:

• efl/jhbuild.modules: Add eeze library dependency.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformEfl.cmake (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp (modified) (3 diffs)
• Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h (modified) (1 diff)
• Source/cmake/FindEFL.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/efl/jhbuild.modules (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-06-25  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Implement Network Information API
+        https://bugs.webkit.org/show_bug.cgi?id=87067
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * Source/cmake/FindEFL.cmake: Find eeze library in build system.
+
 2012-06-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-06-25  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Implement Network Information API
+        https://bugs.webkit.org/show_bug.cgi?id=87067
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * PlatformEfl.cmake: Add dependency of eeze library.
+
 2012-06-22  Joshua Netterfield  <jnetterfield@rim.com>
 

trunk/Source/WebKit/PlatformEfl.cmake

@@ -69 +69 @@
 
 IF (ENABLE_NETWORK_INFO)
+  LIST(APPEND WebKit_LINK_FLAGS
+    ${EEZE_LDFLAGS}
+  )
   LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/Modules/networkinfo"
+     ${EEZE_INCLUDE_DIRS}
   )
   LIST(APPEND WebKit_SOURCES
     efl/WebCoreSupport/NetworkInfoClientEfl.cpp
+  )
+  LIST(APPEND WebKit_LIBRARIES
+    ${EEZE_LIBRARIES}
   )
 ENDIF ()

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-06-25  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Implement Network Information API
+        https://bugs.webkit.org/show_bug.cgi?id=87067
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Implement NetworkInfoClientEfl.cpp using eeze library. However, this patch only
+        supports this feature on ethernet interface.
+
+        * WebCoreSupport/NetworkInfoClientEfl.cpp:
+        (WebCore):
+        (WebCore::NetworkInfoClientEfl::NetworkInfoClientEfl):
+        (WebCore::NetworkInfoClientEfl::startUpdating):
+        (WebCore::NetworkInfoClientEfl::stopUpdating):
+        (WebCore::NetworkInfoClientEfl::bandwidth):
+        (WebCore::NetworkInfoClientEfl::metered):
+        * WebCoreSupport/NetworkInfoClientEfl.h:
+        (NetworkInfoClientEfl):
+
 2012-06-23  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp

@@ -32 +32 @@
 #include "NetworkInfo.h"
 #include "NotImplemented.h"
+
+#include "ewk_private.h"
+#include <Eeze.h>
+#include <Eeze_Net.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
+
+static const char* ethernetInterface = "eth0";
+
 NetworkInfoClientEfl::NetworkInfoClientEfl()
     : m_controller(0)
+    , m_metered(false)
 {
 }
@@ -47 +55 @@
 void NetworkInfoClientEfl::startUpdating()
 {
-    notImplemented();
+    if (!eeze_init()) {
+        ERR("Fail to start network information client.");
+        return;
+    }
 }
 
 void NetworkInfoClientEfl::stopUpdating()
 {
-    notImplemented();
+    eeze_shutdown();
 }
 
 unsigned int NetworkInfoClientEfl::bandwidth() const
 {
-    notImplemented();
-    return 10; // MB/s
+    // FIXME : This function should consider cellular network as well. For example, 2G, 3G and 4G.
+    // See https://bugs.webkit.org/show_bug.cgi?id=89851 for detail.
+    Eeze_Net* ethNet = eeze_net_new(ethernetInterface);
+    if (!ethNet)
+        return 0;
+
+    eeze_net_scan(ethNet);
+
+    // FIXME : The eeze library doesn't support EEZE_NET_ADDR_TYPE_IP type yet. So, EEZE_NET_ADDR_TYPE_BROADCAST
+    // is used for now.
+    // See https://bugs.webkit.org/show_bug.cgi?id=89852 for detail.
+    const char* address = eeze_net_addr_get(ethNet, EEZE_NET_ADDR_TYPE_BROADCAST);
+    if (!address)
+        return 0; // If network is offline, return 0.
+
+    unsigned int bandwidth;
+    const char* attribute = eeze_net_attribute_get(ethNet, "speed");
+    if (attribute) {
+        bool ok;
+        bandwidth = String::fromUTF8(attribute).toUIntStrict(&ok);
+    } else
+        bandwidth = UINT_MAX; // If bandwidth is unknown, return infinity value.
+    
+    eeze_net_free(ethNet);
+
+    return bandwidth / 8; // MB/s
 }
 
@@ -64 +99 @@
 {
     notImplemented();
-    return false;
+    return m_metered;
 }
 

trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h

@@ -46 +46 @@
 
 private:
+    NetworkInfoController* m_controller;
 
-    NetworkInfoController* m_controller;
+    bool m_metered;
 };
 }

trunk/Source/cmake/FindEFL.cmake

@@ -13 +13 @@
   eukit>=1.1.0
   edbus>=1.1.0
-  ecore-input>=1.0.0)
+  ecore-input>=1.0.0
+  eeze>=1.1.99)
 PKG_CHECK_MODULES (EINA REQUIRED eina>=1.0.0)
 PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.0)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-25  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Implement Network Information API
+        https://bugs.webkit.org/show_bug.cgi?id=87067
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * efl/jhbuild.modules: Add eeze library dependency.
+
 2012-06-25  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Tools/efl/jhbuild.modules

@@ -15 +15 @@
       <dep package="edje"/>
       <dep package="e_dbus"/>
+      <dep package="eeze"/>
     </dependencies>
   </metamodule>
@@ -219 +220 @@
   </autotools>
 
+  <autotools id="eeze">
+    <branch module="eeze"
+            repo="enlightenment.org"
+            revision="68629"/>
+    <dependencies>
+      <dep package="ecore"/>
+      <dep package="eina"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>