Remove NETWORK_INFO support
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Apr 2014 12:34:03 +0000 (12:34 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Apr 2014 12:34:03 +0000 (12:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131841

.:
Reviewed by Gyuyoung Kim.

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/WebCore:
Reviewed by Gyuyoung Kim.

* CMakeLists.txt:
* Modules/networkinfo/NavigatorNetworkInfoConnection.cpp: Removed.
* Modules/networkinfo/NavigatorNetworkInfoConnection.h: Removed.
* Modules/networkinfo/NavigatorNetworkInfoConnection.idl: Removed.
* Modules/networkinfo/NetworkInfo.cpp: Removed.
* Modules/networkinfo/NetworkInfo.h: Removed.
* Modules/networkinfo/NetworkInfoClient.h: Removed.
* Modules/networkinfo/NetworkInfoConnection.cpp: Removed.
* Modules/networkinfo/NetworkInfoConnection.h: Removed.
* Modules/networkinfo/NetworkInfoConnection.idl: Removed.
* Modules/networkinfo/NetworkInfoController.cpp: Removed.
* Modules/networkinfo/NetworkInfoController.h: Removed.
* PlatformEfl.cmake:
* dom/EventTargetFactory.in:
* platform/efl/NetworkInfoProviderEfl.cpp: Removed.
* platform/efl/NetworkInfoProviderEfl.h: Removed.
* testing/Internals.cpp:
(WebCore::Internals::setNetworkInformation): Deleted.
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit:
Reviewed by NOBODY (OOPS!).

* PlatformEfl.cmake:

Source/WebKit/efl:
Reviewed by Gyuyoung Kim.

* WebCoreSupport/NetworkInfoClientEfl.cpp: Removed.
* WebCoreSupport/NetworkInfoClientEfl.h: Removed.
* ewk/ewk_view.cpp:
(_ewk_view_priv_new):

Source/WebKit2:
Reviewed by Gyuyoung Kim.

* CMakeLists.txt:
* PlatformEfl.cmake:
* Shared/API/c/WKBase.h:
* Shared/APIObject.h:
* Shared/WebNetworkInfo.cpp: Removed.
* Shared/WebNetworkInfo.h: Removed.
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextGetNetworkInfoManager): Deleted.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKNetworkInfo.cpp: Removed.
* UIProcess/API/C/WKNetworkInfo.h: Removed.
* UIProcess/API/C/WKNetworkInfoManager.cpp: Removed.
* UIProcess/API/C/WKNetworkInfoManager.h: Removed.
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::EwkContext):
* UIProcess/API/efl/ewk_context_private.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
* UIProcess/WebContext.h:
* UIProcess/WebNetworkInfoManagerProxy.cpp: Removed.
* UIProcess/WebNetworkInfoManagerProxy.h: Removed.
* UIProcess/WebNetworkInfoManagerProxy.messages.in: Removed.
* UIProcess/WebNetworkInfoProvider.cpp: Removed.
* UIProcess/WebNetworkInfoProvider.h: Removed.
* UIProcess/efl/NetworkInfoProvider.cpp: Removed.
* UIProcess/efl/NetworkInfoProvider.h: Removed.
* WebProcess/NetworkInfo/WebNetworkInfoManager.cpp: Removed.
* WebProcess/NetworkInfo/WebNetworkInfoManager.h: Removed.
* WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in: Removed.
* WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp: Removed.
* WebProcess/WebCoreSupport/WebNetworkInfoClient.h: Removed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):

Source/WTF:
Reviewed by Gyuyoung Kim.

* wtf/FeatureDefines.h:

Tools:
Reviewed by Gyuyoung Kim.

* Scripts/webkitperl/FeatureList.pm:

LayoutTests:
Reviewed by Gyuyoung Kim.

* networkinformation/add-listener-from-callback-expected.txt: Removed.
* networkinformation/add-listener-from-callback.html: Removed.
* networkinformation/basic-all-types-of-events-expected.txt: Removed.
* networkinformation/basic-all-types-of-events.html: Removed.
* networkinformation/basic-operation-expected.txt: Removed.
* networkinformation/basic-operation.html: Removed.
* networkinformation/event-after-navigation-expected.txt: Removed.
* networkinformation/event-after-navigation.html: Removed.
* networkinformation/multiple-frames-expected.txt: Removed.
* networkinformation/multiple-frames.html: Removed.
* networkinformation/resources/event-after-navigation-new.html: Removed.
* networkinformation/script-tests/add-listener-from-callback.js: Removed.
* networkinformation/script-tests/basic-all-types-of-events.js: Removed.
* networkinformation/script-tests/basic-operation.js: Removed.
* networkinformation/script-tests/event-after-navigation.js: Removed.
* networkinformation/script-tests/multiple-frames.js: Removed.
* networkinformation/script-tests/updates.js: Removed.
* networkinformation/script-tests/window-property.js: Removed.
* networkinformation/updates-expected.txt: Removed.
* networkinformation/updates.html: Removed.
* networkinformation/window-property-expected.txt: Removed.
* networkinformation/window-property.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

97 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/networkinformation/add-listener-from-callback-expected.txt [deleted file]
LayoutTests/networkinformation/add-listener-from-callback.html [deleted file]
LayoutTests/networkinformation/basic-all-types-of-events-expected.txt [deleted file]
LayoutTests/networkinformation/basic-all-types-of-events.html [deleted file]
LayoutTests/networkinformation/basic-operation-expected.txt [deleted file]
LayoutTests/networkinformation/basic-operation.html [deleted file]
LayoutTests/networkinformation/event-after-navigation-expected.txt [deleted file]
LayoutTests/networkinformation/event-after-navigation.html [deleted file]
LayoutTests/networkinformation/multiple-frames-expected.txt [deleted file]
LayoutTests/networkinformation/multiple-frames.html [deleted file]
LayoutTests/networkinformation/resources/event-after-navigation-new.html [deleted file]
LayoutTests/networkinformation/script-tests/add-listener-from-callback.js [deleted file]
LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js [deleted file]
LayoutTests/networkinformation/script-tests/basic-operation.js [deleted file]
LayoutTests/networkinformation/script-tests/event-after-navigation.js [deleted file]
LayoutTests/networkinformation/script-tests/multiple-frames.js [deleted file]
LayoutTests/networkinformation/script-tests/updates.js [deleted file]
LayoutTests/networkinformation/script-tests/window-property.js [deleted file]
LayoutTests/networkinformation/updates-expected.txt [deleted file]
LayoutTests/networkinformation/updates.html [deleted file]
LayoutTests/networkinformation/window-property-expected.txt [deleted file]
LayoutTests/networkinformation/window-property.html [deleted file]
LayoutTests/platform/efl-wk2/TestExpectations
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-sim/Skipped
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp [deleted file]
Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h [deleted file]
Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfo.cpp [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfo.h [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoClient.h [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp [deleted file]
Source/WebCore/Modules/networkinfo/NetworkInfoController.h [deleted file]
Source/WebCore/PlatformEfl.cmake
Source/WebCore/dom/EventTargetFactory.in
Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp [deleted file]
Source/WebCore/platform/efl/NetworkInfoProviderEfl.h [deleted file]
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit/ChangeLog
Source/WebKit/PlatformEfl.cmake
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp [deleted file]
Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h [deleted file]
Source/WebKit/efl/ewk/ewk_view.cpp
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/Shared/API/c/WKBase.h
Source/WebKit2/Shared/APIObject.h
Source/WebKit2/Shared/WebNetworkInfo.cpp [deleted file]
Source/WebKit2/Shared/WebNetworkInfo.h [deleted file]
Source/WebKit2/UIProcess/API/C/WKAPICast.h
Source/WebKit2/UIProcess/API/C/WKContext.cpp
Source/WebKit2/UIProcess/API/C/WKContext.h
Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp [deleted file]
Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h [deleted file]
Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp [deleted file]
Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h [deleted file]
Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
Source/WebKit2/UIProcess/API/efl/ewk_context_private.h
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/UIProcess/WebContext.h
Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp [deleted file]
Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h [deleted file]
Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in [deleted file]
Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp [deleted file]
Source/WebKit2/UIProcess/WebNetworkInfoProvider.h [deleted file]
Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp [deleted file]
Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h [deleted file]
Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp [deleted file]
Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h [deleted file]
Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in [deleted file]
Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp [deleted file]
Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h [deleted file]
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm

index b8e78e7..0e7359b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2014-04-17  Darin Adler  <darin@apple.com>
 
         Try to fix EFL and GTK builds.
index 4dbd26b..32b0740 100644 (file)
@@ -1,3 +1,33 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * networkinformation/add-listener-from-callback-expected.txt: Removed.
+        * networkinformation/add-listener-from-callback.html: Removed.
+        * networkinformation/basic-all-types-of-events-expected.txt: Removed.
+        * networkinformation/basic-all-types-of-events.html: Removed.
+        * networkinformation/basic-operation-expected.txt: Removed.
+        * networkinformation/basic-operation.html: Removed.
+        * networkinformation/event-after-navigation-expected.txt: Removed.
+        * networkinformation/event-after-navigation.html: Removed.
+        * networkinformation/multiple-frames-expected.txt: Removed.
+        * networkinformation/multiple-frames.html: Removed.
+        * networkinformation/resources/event-after-navigation-new.html: Removed.
+        * networkinformation/script-tests/add-listener-from-callback.js: Removed.
+        * networkinformation/script-tests/basic-all-types-of-events.js: Removed.
+        * networkinformation/script-tests/basic-operation.js: Removed.
+        * networkinformation/script-tests/event-after-navigation.js: Removed.
+        * networkinformation/script-tests/multiple-frames.js: Removed.
+        * networkinformation/script-tests/updates.js: Removed.
+        * networkinformation/script-tests/window-property.js: Removed.
+        * networkinformation/updates-expected.txt: Removed.
+        * networkinformation/updates.html: Removed.
+        * networkinformation/window-property-expected.txt: Removed.
+        * networkinformation/window-property.html: Removed.
+
 2014-04-17  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r167478.
diff --git a/LayoutTests/networkinformation/add-listener-from-callback-expected.txt b/LayoutTests/networkinformation/add-listener-from-callback-expected.txt
deleted file mode 100644 (file)
index 9e181c2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Tests that adding a new event listener from a callback works as expected.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/add-listener-from-callback.html b/LayoutTests/networkinformation/add-listener-from-callback.html
deleted file mode 100644 (file)
index 3a1243d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/add-listener-from-callback.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt b/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt
deleted file mode 100644 (file)
index 890c4c6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests the basic operation of all NetworkInfo events.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-webkitnetworkinfochange event is raised
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/basic-all-types-of-events.html b/LayoutTests/networkinformation/basic-all-types-of-events.html
deleted file mode 100644 (file)
index 27329f1..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/basic-all-types-of-events.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/basic-operation-expected.txt b/LayoutTests/networkinformation/basic-operation-expected.txt
deleted file mode 100644 (file)
index b8d2d37..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Tests the basic operation of NetworkInfo.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/basic-operation.html b/LayoutTests/networkinformation/basic-operation.html
deleted file mode 100644 (file)
index c8a362f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/basic-operation.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/event-after-navigation-expected.txt b/LayoutTests/networkinformation/event-after-navigation-expected.txt
deleted file mode 100644 (file)
index 8e6bc39..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.
-
-SUCCESS
diff --git a/LayoutTests/networkinformation/event-after-navigation.html b/LayoutTests/networkinformation/event-after-navigation.html
deleted file mode 100644 (file)
index a3de291..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/event-after-navigation.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/multiple-frames-expected.txt b/LayoutTests/networkinformation/multiple-frames-expected.txt
deleted file mode 100644 (file)
index 787a18a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Tests using NetworkInfo from multiple frames.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/multiple-frames.html b/LayoutTests/networkinformation/multiple-frames.html
deleted file mode 100644 (file)
index c7bec8a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/multiple-frames.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/resources/event-after-navigation-new.html b/LayoutTests/networkinformation/resources/event-after-navigation-new.html
deleted file mode 100644 (file)
index 6134225..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-  <head>
-  </head>
-  <body>
-    Tests for a crash where an event is fired after the page has been navigated
-    away when the original page is in the page cache.<br><br>
-    SUCCESS
-    <script>
-        internals.setNetworkInformation('webkitnetworkinfochange', 100, true);
-        testRunner.notifyDone();
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js b/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js
deleted file mode 100644 (file)
index 028885e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-description('Tests that adding a new event listener from a callback works as expected.');
-
-var bandwidth = 10;
-var metered = false;
-
-var connection = navigator.webkitConnection;
-
-function checkNetworkInformation() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-}
-
-var firstListenerEvents = 0;
-function firstListener() {
-    checkNetworkInformation();
-    if (++firstListenerEvents == 1) {
-        connection.addEventListener('webkitnetworkinfochange', secondListener);
-        internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-    }
-    else if (firstListenerEvents > 2)
-        testFailed('Too many events for first listener.');
-    maybeFinishTest();
-}
-
-var secondListenerEvents = 0;
-function secondListener() {
-    checkNetworkInformation();
-    if (++secondListenerEvents > 1)
-        testFailed('Too many events for second listener.');
-    maybeFinishTest();
-}
-
-function maybeFinishTest() {
-    if (firstListenerEvents == 2 && secondListenerEvents == 1)
-        finishJSTest();
-}
-
-connection.addEventListener('webkitnetworkinfochange', firstListener);
-internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js b/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js
deleted file mode 100644 (file)
index 9246a01..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-description('Tests the basic operation of all NetworkInfo events.');
-
-var bandwidth = 10;
-var metered = false;
-
-var connection = navigator.webkitConnection;
-
-function checkNetworkInformation() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-}
-
-connection.addEventListener('webkitnetworkinfochange', function() {
-    debug('webkitnetworkinfochange event is raised');
-    checkNetworkInformation();
-    finishJSTest();
-});
-
-internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/basic-operation.js b/LayoutTests/networkinformation/script-tests/basic-operation.js
deleted file mode 100644 (file)
index 1815325..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-description('Tests the basic operation of NetworkInfo.');
-
-var bandwidth = 10;
-var metered = false;
-
-var connection = navigator.webkitConnection;
-
-connection.addEventListener('webkitnetworkinfochange', function() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-    finishJSTest();
-});
-
-internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/event-after-navigation.js b/LayoutTests/networkinformation/script-tests/event-after-navigation.js
deleted file mode 100644 (file)
index b233179..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-description('Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.');
-
-if (window.testRunner)
-    testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
-else
-    debug('This test can not be run without the testRunner');
-
-document.body.onload = function() {
-    navigator.webkitConnection.addEventListener('webkitnetworkinfochange', function() { } );
-    window.location = "resources/event-after-navigation-new.html";
-}
-
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/multiple-frames.js b/LayoutTests/networkinformation/script-tests/multiple-frames.js
deleted file mode 100644 (file)
index 6fcde8f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-description('Tests using NetworkInfo from multiple frames.');
-
-var bandwidth = 10;
-var metered = false;
-
-var connection = navigator.webkitConnection;
-
-function checkNetworkInformation() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-}
-
-function checkChildNetworkInformation() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-}
-
-var hasMainFrameEventFired = false;
-function mainFrameListener() {
-    hasMainFrameEventFired = true;
-    maybeFinishTest();
-}
-
-var hasChildFrameEventFired = false;
-function childFrameListener() {
-    hasChildFrameEventFired = true;
-    maybeFinishTest();
-}
-
-function maybeFinishTest() {
-    if (hasMainFrameEventFired && hasChildFrameEventFired) {
-        checkNetworkInformation();
-        checkChildNetworkInformation();
-        finishJSTest();
-    }
-}
-
-var childFrame = document.createElement('iframe');
-document.body.appendChild(childFrame);
-var childConnection = childFrame.contentWindow.navigator.webkitConnection
-childConnection.addEventListener('webkitnetworkinfochange', childFrameListener);
-connection.addEventListener('webkitnetworkinfochange', mainFrameListener);
-
-internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/updates.js b/LayoutTests/networkinformation/script-tests/updates.js
deleted file mode 100644 (file)
index 4f33872..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-description('Tests that updates to the connection event causes new events to fire.');
-
-var bandwidth = 10;
-var metered = false;
-
-var connection = navigator.webkitConnection;
-
-function checkNetworkInformation() {
-    shouldBe("typeof connection.bandwidth", '"number"');
-    shouldBe("typeof connection.metered", '"boolean"');
-}
-
-function setNetworkInformation() {
-    internals.setNetworkInformation('webkitnetworkinfochange', bandwidth, metered);
-}
-
-function firstListener() {
-    checkNetworkInformation();
-    connection.removeEventListener('webkitnetworkinfochange', firstListener);
-    connection.addEventListener('webkitnetworkinfochange', updateListener);
-  
-    bandwidth = 5;
-    metered = true;
-    setNetworkInformation();
-}
-
-function updateListener(event) {
-    checkNetworkInformation(event);
-    finishJSTest();
-}
-
-connection.addEventListener('webkitnetworkinfochange', firstListener);
-setNetworkInformation();
-window.jsTestIsAsync = true;
diff --git a/LayoutTests/networkinformation/script-tests/window-property.js b/LayoutTests/networkinformation/script-tests/window-property.js
deleted file mode 100644 (file)
index 4169988..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-description('Tests that the window.navigator.connection properties are present.');
-
-function hasOnConnectionProperty()
-{
-    var result = 0;
-    for (var property in navigator.webkitConnection) {
-        if (property == 'onwebkitnetworkinfochange')
-            result += 1;
-    }
-    if (result == 1)
-        return true;
-    return false;
-}
-
-shouldBeTrue("typeof navigator.webkitConnection == 'object'");
-shouldBeTrue("hasOnConnectionProperty()");
-shouldBeTrue("navigator.webkitConnection.hasOwnProperty('onwebkitnetworkinfochange')");
diff --git a/LayoutTests/networkinformation/updates-expected.txt b/LayoutTests/networkinformation/updates-expected.txt
deleted file mode 100644 (file)
index fdf7d92..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Tests that updates to the connection event causes new events to fire.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS typeof connection.bandwidth is "number"
-PASS typeof connection.metered is "boolean"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/updates.html b/LayoutTests/networkinformation/updates.html
deleted file mode 100644 (file)
index 7a8db07..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/updates.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/networkinformation/window-property-expected.txt b/LayoutTests/networkinformation/window-property-expected.txt
deleted file mode 100644 (file)
index b1bc67b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that the window.navigator.connection properties are present.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof navigator.webkitConnection == 'object' is true
-PASS hasOnConnectionProperty() is true
-PASS navigator.webkitConnection.hasOwnProperty('onwebkitnetworkinfochange') is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/networkinformation/window-property.html b/LayoutTests/networkinformation/window-property.html
deleted file mode 100644 (file)
index 1caf0e7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/window-property.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
index e6e8dd1..1b55071 100644 (file)
@@ -50,13 +50,6 @@ webkit.org/b/98747 plugins/document-open.html [ Crash Failure ]
 webkit.org/b/102200 fast/dom/HTMLAnchorElement/anchor-download.html [ Crash Failure ]
 webkit.org/b/102200 fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Crash Failure ]
 
-# Hitting !decoder.destinationID() assertion.
-webkit.org/b/102651 [ Debug ] networkinformation/multiple-frames.html [ Crash ]
-webkit.org/b/102651 [ Debug ] networkinformation/basic-all-types-of-events.html [ Crash ]
-webkit.org/b/102651 [ Debug ] networkinformation/updates.html [ Crash ]
-webkit.org/b/102651 [ Debug ] networkinformation/add-listener-from-callback.html [ Crash ]
-webkit.org/b/102651 [ Debug ] networkinformation/basic-operation.html [ Crash ]
-
 # WebGL test cases crashing in WebCore::GraphicsContext3D::readPixels().
 webkit.org/b/109417 webgl/conformance/textures/texture-attachment-formats.html [ Crash Failure ]
 webkit.org/b/109945 webgl/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Crash ]
index 9fc556f..c947752 100644 (file)
@@ -1812,7 +1812,6 @@ webkit.org/b/128670 fast/dom/webtiming-document-open.html [ Failure ]
 webkit.org/b/128670 fast/dom/webtiming-navigate-within-document.html [ Failure ]
 webkit.org/b/128670 fast/forms/form-hides-table.html [ Failure ]
 webkit.org/b/128670 js/dom/dom-static-property-for-in-iteration.html [ Failure ]
-webkit.org/b/128670 networkinformation/window-property.html [ Failure ]
 
 webkit.org/b/128901 accessibility/list-detection.html [ Failure ]
 
index c26f12f..5d5f348 100644 (file)
@@ -283,9 +283,6 @@ webkit.org/b/99036 http/tests/pointer-lock [ Skip ]
 webkit.org/b/95582 batterystatus [ Failure ]
 webkit.org/b/95582 batterystatus/event-after-navigation.html [ Timeout ]
 
-# Network Information API support not yet.
-webkit.org/b/99052 networkinformation [ Skip ]
-
 # Touch adjustment not enabled
 webkit.org/b/99054 touchadjustment [ Failure ]
 webkit.org/b/99054 touchadjustment/iframe.html [ Timeout ]
index 19186e6..3e0952c 100644 (file)
@@ -1138,9 +1138,6 @@ media/encrypted-media/
 # batterystatus not supported on iOS
 batterystatus/
 
-# networkinformation not supported on iOS
-networkinformation/
-
 # gamepad not supported on iOS
 gamepad/
 
index 75c24e4..b2b7b7b 100755 (executable)
@@ -435,9 +435,6 @@ webkit.org/b/81289 canvas/philip/tests/2d.line.cap.round.html [ Failure ]
 # Needs BatteryClient implementation.
 webkit.org/b/62698 batterystatus/
 
-#Network Information is not supported yet.
-webkit.org/b/73528 networkinformation
-
 # Proximity Events is not supported.
 proximity
 fast/events/constructors/device-proximity-event-constructor.html
index 455f011..8eaf1f4 100644 (file)
@@ -1484,9 +1484,6 @@ webkit.org/b/78801 touchadjustment
 # Needs BatteryClient implementation.
 webkit.org/b/62698 batterystatus/
 
-#Network Information is not supported yet.
-webkit.org/b/73528 networkinformation
-
 # Proximity Events is not supported.
 proximity
 fast/events/constructors/device-proximity-event-constructor.html
index 904114b..c7787fb 100644 (file)
@@ -2250,9 +2250,6 @@ plugins/destroy-during-npp-new-object-with-fallback-content.html
 # https://bugs.webkit.org/show_bug.cgi?id=86176
 ietestcenter/css3/valuesandunits/units-000.htm
 
-# Network Information is not supported yet.
-networkinformation
-
 # Asserts/crashes in PluginView::didFinishLoading
 fast/loader/reload-zero-byte-plugin.html
 userscripts/user-script-plugin-document.html
index abdcb6c..0ea4bbd 100644 (file)
@@ -1,3 +1,12 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * wtf/FeatureDefines.h:
+
 2014-04-17  Filip Pizlo  <fpizlo@apple.com>
 
         Don't include CompilationThread.h from StringImpl.h
index bd5a479..f679c0b 100644 (file)
 #define ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE 0
 #endif
 
-#if !defined(ENABLE_NETWORK_INFO)
-#define ENABLE_NETWORK_INFO 0
-#endif
-
 #if !defined(ENABLE_NOTIFICATIONS)
 #define ENABLE_NOTIFICATIONS 0
 #endif
index 61764d6..2bcd2b3 100644 (file)
@@ -11,7 +11,6 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/Modules/mediasource"
     "${WEBCORE_DIR}/Modules/mediastream"
     "${WEBCORE_DIR}/Modules/navigatorcontentutils"
-    "${WEBCORE_DIR}/Modules/networkinfo"
     "${WEBCORE_DIR}/Modules/notifications"
     "${WEBCORE_DIR}/Modules/plugins"
     "${WEBCORE_DIR}/Modules/proximity"
@@ -134,7 +133,6 @@ set(WebCore_IDL_INCLUDES
     Modules/indexeddb
     Modules/indieui
     Modules/mediastream
-    Modules/networkinfo
     Modules/notifications
     Modules/proximity
     Modules/quota
@@ -241,9 +239,6 @@ set(WebCore_IDL_FILES
 
     Modules/navigatorcontentutils/NavigatorContentUtils.idl
 
-    Modules/networkinfo/NavigatorNetworkInfoConnection.idl
-    Modules/networkinfo/NetworkInfoConnection.idl
-
     Modules/notifications/DOMWindowNotifications.idl
     Modules/notifications/Notification.idl
     Modules/notifications/NotificationCenter.idl
@@ -877,11 +872,6 @@ set(WebCore_SOURCES
 
     Modules/navigatorcontentutils/NavigatorContentUtils.cpp
 
-    Modules/networkinfo/NavigatorNetworkInfoConnection.cpp
-    Modules/networkinfo/NetworkInfo.cpp
-    Modules/networkinfo/NetworkInfoConnection.cpp
-    Modules/networkinfo/NetworkInfoController.cpp
-
     Modules/notifications/DOMWindowNotifications.cpp
     Modules/notifications/Notification.cpp
     Modules/notifications/NotificationCenter.cpp
index 56cb30f..33f63e4 100644 (file)
@@ -1,3 +1,31 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt:
+        * Modules/networkinfo/NavigatorNetworkInfoConnection.cpp: Removed.
+        * Modules/networkinfo/NavigatorNetworkInfoConnection.h: Removed.
+        * Modules/networkinfo/NavigatorNetworkInfoConnection.idl: Removed.
+        * Modules/networkinfo/NetworkInfo.cpp: Removed.
+        * Modules/networkinfo/NetworkInfo.h: Removed.
+        * Modules/networkinfo/NetworkInfoClient.h: Removed.
+        * Modules/networkinfo/NetworkInfoConnection.cpp: Removed.
+        * Modules/networkinfo/NetworkInfoConnection.h: Removed.
+        * Modules/networkinfo/NetworkInfoConnection.idl: Removed.
+        * Modules/networkinfo/NetworkInfoController.cpp: Removed.
+        * Modules/networkinfo/NetworkInfoController.h: Removed.
+        * PlatformEfl.cmake:
+        * dom/EventTargetFactory.in:
+        * platform/efl/NetworkInfoProviderEfl.cpp: Removed.
+        * platform/efl/NetworkInfoProviderEfl.h: Removed.
+        * testing/Internals.cpp:
+        (WebCore::Internals::setNetworkInformation): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2014-04-17  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r167478.
diff --git a/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp b/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp
deleted file mode 100644 (file)
index a75327c..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "NavigatorNetworkInfoConnection.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "Frame.h"
-#include "Navigator.h"
-#include "NetworkInfoController.h"
-#include <wtf/PassOwnPtr.h>
-
-namespace WebCore {
-
-NavigatorNetworkInfoConnection::NavigatorNetworkInfoConnection()
-{
-}
-
-NavigatorNetworkInfoConnection::~NavigatorNetworkInfoConnection()
-{
-}
-
-const char* NavigatorNetworkInfoConnection::supplementName()
-{
-    return "NavigatorNetworkInfoConnection";
-}
-
-NavigatorNetworkInfoConnection* NavigatorNetworkInfoConnection::from(Navigator* navigator)
-{
-    NavigatorNetworkInfoConnection* supplement = static_cast<NavigatorNetworkInfoConnection*>(Supplement<Navigator>::from(navigator, supplementName()));
-    if (!supplement) {
-        supplement = new NavigatorNetworkInfoConnection();
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
-    }
-    return supplement;
-}
-
-NetworkInfoConnection* NavigatorNetworkInfoConnection::webkitConnection(Navigator* navigator)
-{
-    if (!navigator->frame())
-        return 0;
-
-    NavigatorNetworkInfoConnection* navigatorConnection = NavigatorNetworkInfoConnection::from(navigator);
-    if (!navigatorConnection->m_connection)
-        navigatorConnection->m_connection = NetworkInfoConnection::create(navigator);
-    return navigatorConnection->m_connection.get();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h b/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h
deleted file mode 100644 (file)
index 9091a58..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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. AND ITS CONTRIBUTORS ``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 ITS 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 NavigatorNetworkInfoConnection_h
-#define NavigatorNetworkInfoConnection_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include "NetworkInfoConnection.h"
-#include "Supplementable.h"
-
-namespace WebCore {
-
-class Navigator;
-
-class NavigatorNetworkInfoConnection : public Supplement<Navigator> {
-public:
-    virtual ~NavigatorNetworkInfoConnection();
-
-    static NavigatorNetworkInfoConnection* from(Navigator*);
-    static NetworkInfoConnection* webkitConnection(Navigator*);
-
-private:
-    NavigatorNetworkInfoConnection();
-    static const char* supplementName();
-
-    RefPtr<NetworkInfoConnection> m_connection;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // NavigatorNetworkInfoConnection_h
diff --git a/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl b/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl
deleted file mode 100644 (file)
index f2c41a2..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
-[
-    Conditional=NETWORK_INFO,
-] partial interface Navigator {
-    readonly attribute NetworkInfoConnection webkitConnection;
-};
-#endif
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp b/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp
deleted file mode 100644 (file)
index 5e8beb6..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "NetworkInfo.h"
-
-#if ENABLE(NETWORK_INFO)
-namespace WebCore {
-
-NetworkInfo::NetworkInfo(double bandwidth, bool metered)
-    : m_bandwidth(bandwidth)
-    , m_metered(metered)
-{
-}
-
-} // namespace WebCore
-#endif
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfo.h b/Source/WebCore/Modules/networkinfo/NetworkInfo.h
deleted file mode 100644 (file)
index 50f4e4a..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 NetworkInfo_h
-#define NetworkInfo_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class NetworkInfo : public RefCounted<NetworkInfo> {
-public:
-    static PassRefPtr<NetworkInfo> create(double bandwidth, bool metered) { return adoptRef(new NetworkInfo(bandwidth, metered)); }
-
-    double bandwidth() const { return m_bandwidth; }
-    bool metered() const { return m_metered; }
-
-private:
-    NetworkInfo(double bandwidth, bool metered);
-
-    double m_bandwidth;
-    bool m_metered;
-};
-
-} // namespace WebCore
-
-#endif
-#endif // NetworkInfoConnection_h
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h b/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h
deleted file mode 100644 (file)
index 6f5959d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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 NetworkInfoClient_h
-#define NetworkInfoClient_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class NetworkInfoController;
-class Page;
-
-class NetworkInfoClient {
-public:
-    virtual ~NetworkInfoClient() { }
-
-    virtual double bandwidth() const = 0;
-    virtual bool metered() const = 0;
-
-    virtual void startUpdating() = 0;
-    virtual void stopUpdating() = 0;
-
-    virtual void networkInfoControllerDestroyed() = 0;
-};
-
-void provideNetworkInfoTo(Page*, NetworkInfoClient*);
-
-}
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // NetworkInfoClient_h
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp b/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp
deleted file mode 100644 (file)
index 9ef628d..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "NetworkInfoConnection.h"
-
-#if ENABLE(NETWORK_INFO)
-#include "Document.h"
-#include "Event.h"
-#include "Frame.h"
-#include "NetworkInfoClient.h"
-
-namespace WebCore {
-
-PassRef<NetworkInfoConnection> NetworkInfoConnection::create(Navigator* navigator)
-{
-    auto networkInfoConnection = adoptRef(*new NetworkInfoConnection(navigator));
-    networkInfoConnection.get().suspendIfNeeded();
-    return networkInfoConnection;
-}
-
-NetworkInfoConnection::NetworkInfoConnection(Navigator* navigator)
-    : ActiveDOMObject(navigator->frame()->document())
-    , m_controller(NetworkInfoController::from(navigator->frame()->page()))
-    , m_networkInfo(0)
-{
-    m_controller->addListener(this);
-}
-
-NetworkInfoConnection::~NetworkInfoConnection()
-{
-}
-
-double NetworkInfoConnection::bandwidth() const
-{
-    return m_controller->client()->bandwidth();
-}
-
-bool NetworkInfoConnection::metered() const
-{
-    return m_controller->client()->metered();
-}
-
-void NetworkInfoConnection::didChangeNetworkInformation(PassRefPtr<Event> event, PassRefPtr<NetworkInfo> networkInfo)
-{
-    m_networkInfo = networkInfo;
-    dispatchEvent(event);
-}
-
-EventTargetData* NetworkInfoConnection::eventTargetData()
-{
-    return &m_eventTargetData;
-}
-
-EventTargetData& NetworkInfoConnection::ensureEventTargetData()
-{
-    return m_eventTargetData;
-}
-
-EventTargetInterface NetworkInfoConnection::eventTargetInterface() const
-{
-    return NetworkInfoConnectionEventTargetInterfaceType;
-}
-
-void NetworkInfoConnection::suspend(ReasonForSuspension)
-{
-    if (m_controller)
-        m_controller->removeListener(this);
-}
-
-void NetworkInfoConnection::resume()
-{
-    if (m_controller)
-        m_controller->addListener(this);
-}
-
-void NetworkInfoConnection::stop()
-{
-    if (m_controller)
-        m_controller->removeListener(this);
-}
-
-} // namespace WebCore
-#endif
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h b/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h
deleted file mode 100644 (file)
index a124f84..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 NetworkInfoConnection_h
-#define NetworkInfoConnection_h
-
-#if ENABLE(NETWORK_INFO)
-#include "ActiveDOMObject.h"
-#include "EventListener.h"
-#include "EventTarget.h"
-#include "Navigator.h"
-#include "NetworkInfo.h"
-#include "NetworkInfoController.h"
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class NetworkInfoController;
-
-class NetworkInfoConnection : public RefCounted<NetworkInfoConnection>, public EventTarget, public ActiveDOMObject {
-public:
-    static PassRef<NetworkInfoConnection> create(Navigator*);
-
-    ~NetworkInfoConnection();
-
-    double bandwidth() const;
-    bool metered() const;
-    
-    void didChangeNetworkInformation(PassRefPtr<Event>, PassRefPtr<NetworkInfo>);
-    void networkInfoControllerDestroyed() { m_controller = 0; }
-
-    // EventTarget implementation.
-    virtual EventTargetInterface eventTargetInterface() const;
-    virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); }
-
-    using RefCounted<NetworkInfoConnection>::ref;
-    using RefCounted<NetworkInfoConnection>::deref;
-
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitnetworkinfochange);
-  
-    // ActiveDOMObject implementation.
-    virtual bool canSuspend() const { return true; }
-    virtual void suspend(ReasonForSuspension);
-    virtual void resume();
-    virtual void stop();
-
-private:
-    explicit NetworkInfoConnection(Navigator*);
-
-    // EventTarget implementation.
-    virtual EventTargetData* eventTargetData() override;
-    virtual EventTargetData& ensureEventTargetData() override;
-    virtual void refEventTarget() override { ref(); }
-    virtual void derefEventTarget() override { deref(); }
-
-    // EventTarget implementation.
-    EventTargetData m_eventTargetData;
-
-    NetworkInfoController* m_controller;
-    RefPtr<NetworkInfo> m_networkInfo; 
-};
-
-} // namespace WebCore
-
-#endif
-#endif // NetworkInfoConnection_h
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl b/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl
deleted file mode 100644 (file)
index 8688e41..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. All Rights Reserved.
- *
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-// http://dvcs.w3.org/hg/dap/raw-file/tip/network-api/index.html
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
-[
-    NoInterfaceObject,
-    Conditional=NETWORK_INFO,
-    ActiveDOMObject,
-    EventTarget,
-] interface NetworkInfoConnection {
-    readonly attribute double bandwidth;
-    readonly attribute boolean metered;
-
-    attribute EventListener onwebkitnetworkinfochange;
-
-    // EventTarget interface
-    void addEventListener(DOMString type, 
-                          EventListener listener, 
-                          optional boolean useCapture);
-    void removeEventListener(DOMString type, 
-                             EventListener listener, 
-                             optional boolean useCapture);
-    [RaisesException] boolean dispatchEvent(Event evt);
-};
-#endif
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp b/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp
deleted file mode 100644 (file)
index 14c8f94..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "NetworkInfoController.h"
-
-#if ENABLE(NETWORK_INFO)
-#include "Event.h"
-#include "NetworkInfo.h"
-#include "NetworkInfoClient.h"
-
-namespace WebCore {
-
-NetworkInfoController::NetworkInfoController(NetworkInfoClient* client)
-    : m_client(client)
-{
-}
-
-NetworkInfoController::~NetworkInfoController()
-{
-    for (NetworkInfoListenerList::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-        (*it)->networkInfoControllerDestroyed();
-
-    m_client->networkInfoControllerDestroyed();
-}
-
-PassOwnPtr<NetworkInfoController> NetworkInfoController::create(NetworkInfoClient* client)
-{
-    return adoptPtr(new NetworkInfoController(client));
-}
-
-void NetworkInfoController::addListener(NetworkInfoConnection* networkInfoConnection)
-{
-     m_listeners.append(networkInfoConnection);
-     m_client->startUpdating();
-}
-
-void NetworkInfoController::removeListener(NetworkInfoConnection* networkInfoConnection)
-{
-     size_t position = m_listeners.find(networkInfoConnection);
-     if (position == WTF::notFound)
-         return;
-     m_listeners.remove(position);
-     if (m_listeners.isEmpty())
-         m_client->stopUpdating();
-}
-
-void NetworkInfoController::didChangeNetworkInformation(const AtomicString& eventType, PassRefPtr<NetworkInfo> networkInfo)
-{
-     RefPtr<Event> event = Event::create(eventType, false, false);
-     RefPtr<NetworkInfo> networkInformation = networkInfo;
-     for (NetworkInfoListenerList::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-         (*it)->didChangeNetworkInformation(event, networkInformation);
-}
-
-const char* NetworkInfoController::supplementName()
-{
-    return "NetworkInfoController";
-}
-
-void provideNetworkInfoTo(Page* page, NetworkInfoClient* client)
-{
-    NetworkInfoController::provideTo(page, NetworkInfoController::supplementName(), NetworkInfoController::create(client));
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoController.h b/Source/WebCore/Modules/networkinfo/NetworkInfoController.h
deleted file mode 100644 (file)
index 45fb9aa..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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 NetworkInfoController_h
-#define NetworkInfoController_h
-
-#if ENABLE(NETWORK_INFO)
-#include "NetworkInfoClient.h"
-#include "NetworkInfoConnection.h"
-#include "Page.h"
-
-namespace WebCore {
-
-class NetworkInfo;
-class NetworkInfoConnection;
-
-class NetworkInfoController : public Supplement<Page> {
-public:
-    ~NetworkInfoController();
-
-    NetworkInfoClient* client() { return m_client; }
-
-    static PassOwnPtr<NetworkInfoController> create(NetworkInfoClient*);
-
-    static const char* supplementName();
-    static NetworkInfoController* from(Page* page) { return static_cast<NetworkInfoController*>(Supplement<Page>::from(page, supplementName())); }
-   
-    void addListener(NetworkInfoConnection*);
-    void removeListener(NetworkInfoConnection*);
-
-    void didChangeNetworkInformation(const AtomicString& eventType, PassRefPtr<NetworkInfo>);
-
-private:
-    explicit NetworkInfoController(NetworkInfoClient*);
-
-    typedef Vector<NetworkInfoConnection*> NetworkInfoListenerList;
-
-    NetworkInfoClient* m_client;
-    NetworkInfoListenerList m_listeners;
-};
-
-}
-
-#endif // ENABLE(NETWORK_INFO)
-#endif // NetworkInfoController_h
index 24cf501..52b52f9 100644 (file)
@@ -77,7 +77,6 @@ list(APPEND WebCore_SOURCES
     platform/efl/LocalizedStringsEfl.cpp
     platform/efl/LoggingEfl.cpp
     platform/efl/MIMETypeRegistryEfl.cpp
-    platform/efl/NetworkInfoProviderEfl.cpp
     platform/efl/PasteboardEfl.cpp
     platform/efl/PlatformKeyboardEventEfl.cpp
     platform/efl/PlatformMouseEventEfl.cpp
index 0b6c6d0..15a77e9 100644 (file)
@@ -20,7 +20,6 @@ MediaSource conditional=MEDIA_SOURCE
 MediaStream conditional=MEDIA_STREAM
 MediaStreamTrack conditional=MEDIA_STREAM
 MessagePort
-NetworkInfoConnection conditional=NETWORK_INFO
 Node
 Notification conditional=NOTIFICATIONS|LEGACY_NOTIFICATIONS
 Performance conditional=WEB_TIMING
diff --git a/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp b/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp
deleted file mode 100644 (file)
index eb830de..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "NetworkInfoProviderEfl.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include <Eeze.h>
-#include <Eeze_Net.h>
-#include <limits>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-static const char ethernetInterface[] = "eth0";
-
-NetworkInfoProviderEfl::NetworkInfoProviderEfl()
-{
-}
-
-void NetworkInfoProviderEfl::startUpdating()
-{
-    if (!eeze_init())
-        EINA_LOG_ERR("Fail to start network information client.");
-}
-
-void NetworkInfoProviderEfl::stopUpdating()
-{
-    eeze_shutdown();
-}
-
-double NetworkInfoProviderEfl::bandwidth() const
-{
-    // 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);
-    // FIXME: Ethernet is only supported now. If ethNet is null, network is offline.
-    if (!ethNet)
-        return 0; // If network is offline, 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.
-
-    double bandwidth;
-    const char* attribute = eeze_net_attribute_get(ethNet, "speed");
-    if (attribute) {
-        bool ok;
-        bandwidth = String::fromUTF8(attribute).toUIntStrict(&ok);
-    } else
-        bandwidth = std::numeric_limits<double>::infinity(); // If bandwidth is unknown, return infinity value.
-
-    eeze_net_free(ethNet);
-
-    return bandwidth / 8; // MB/s
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h b/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h
deleted file mode 100644 (file)
index ec3f8c6..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics. 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. AND ITS CONTRIBUTORS ``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 ITS 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 NetworkInfoProviderEfl_h
-#define NetworkInfoProviderEfl_h
-
-#if ENABLE(NETWORK_INFO)
-
-namespace WebCore {
-
-class NetworkInfoProviderEfl {
-public:
-    NetworkInfoProviderEfl();
-
-    void startUpdating();
-    void stopUpdating();
-
-    double bandwidth() const;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // NetworkInfoProviderEfl_h
index 1256601..0d93b11 100644 (file)
 #include "BatteryController.h"
 #endif
 
-#if ENABLE(NETWORK_INFO)
-#include "NetworkInfo.h"
-#include "NetworkInfoController.h"
-#endif
-
 #if ENABLE(PROXIMITY_EVENTS)
 #include "DeviceProximityController.h"
 #endif
@@ -1260,23 +1255,6 @@ void Internals::setBatteryStatus(const String& eventType, bool charging, double
 #endif
 }
 
-void Internals::setNetworkInformation(const String& eventType, double bandwidth, bool metered, ExceptionCode& ec)
-{
-    Document* document = contextDocument();
-    if (!document || !document->page()) {
-        ec = INVALID_ACCESS_ERR;
-        return;
-    }
-
-#if ENABLE(NETWORK_INFO)
-    NetworkInfoController::from(document->page())->didChangeNetworkInformation(eventType, NetworkInfo::create(bandwidth, metered));
-#else
-    UNUSED_PARAM(eventType);
-    UNUSED_PARAM(bandwidth);
-    UNUSED_PARAM(metered);
-#endif
-}
-
 void Internals::setDeviceProximity(const String& eventType, double value, double min, double max, ExceptionCode& ec)
 {
     Document* document = contextDocument();
index 7757157..724e2f1 100644 (file)
@@ -197,8 +197,6 @@ public:
 
     void setBatteryStatus(const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode&);
 
-    void setNetworkInformation(const String& eventType, double bandwidth, bool metered, ExceptionCode&);
-
     void setDeviceProximity(const String& eventType, double value, double min, double max, ExceptionCode&);
 
     enum {
index 6827850..5502a68 100644 (file)
     [RaisesException] void setBatteryStatus(DOMString eventType, boolean charging, double chargingTime, double dischargingTime, double level);
 #endif
 
-#if defined(ENABLE_NETWORK_INFO) && ENABLE_NETWORK_INFO
-    [RaisesException] void setNetworkInformation(DOMString eventType, double bandwidth, boolean metered);
-#endif
-
 #if defined(ENABLE_PROXIMITY_EVENTS) && ENABLE_PROXIMITY_EVENTS
     [RaisesException] void setDeviceProximity(DOMString eventType, double value, double min, double max);
 #endif
index 581c687..0b12d82 100644 (file)
@@ -1,3 +1,12 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformEfl.cmake:
+
 2014-04-17  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed 64-bit build fix.
index 27eee5a..f5ae538 100644 (file)
@@ -107,7 +107,6 @@ list(APPEND WebKit_SOURCES
     efl/WebCoreSupport/IconDatabaseClientEfl.cpp
     efl/WebCoreSupport/InspectorClientEfl.cpp
     efl/WebCoreSupport/NavigatorContentUtilsClientEfl.cpp
-    efl/WebCoreSupport/NetworkInfoClientEfl.cpp
     efl/WebCoreSupport/NotificationPresenterClientEfl.cpp
     efl/WebCoreSupport/PlatformStrategiesEfl.cpp
     efl/WebCoreSupport/ProgressTrackerClientEfl.cpp
index 630bdbc..68a6e93 100644 (file)
@@ -1,3 +1,15 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * WebCoreSupport/NetworkInfoClientEfl.cpp: Removed.
+        * WebCoreSupport/NetworkInfoClientEfl.h: Removed.
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+
 2014-04-17  Jeongeun Kim  <je_julie.kim@samsung.com>
 
         [EFL][WK1] SSL Strict is set according to input parameter.
diff --git a/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp
deleted file mode 100644 (file)
index d5dc5de..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * 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.
- */
-
-#include "config.h"
-#include "NetworkInfoClientEfl.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-NetworkInfoClientEfl::NetworkInfoClientEfl()
-{
-}
-
-NetworkInfoClientEfl::~NetworkInfoClientEfl()
-{
-}
-
-void NetworkInfoClientEfl::networkInfoControllerDestroyed()
-{
-    delete this;
-}
-
-void NetworkInfoClientEfl::startUpdating()
-{
-    m_provider.startUpdating();
-}
-
-void NetworkInfoClientEfl::stopUpdating()
-{
-    m_provider.stopUpdating();
-}
-
-double NetworkInfoClientEfl::bandwidth() const
-{
-    return m_provider.bandwidth();
-}
-
-bool NetworkInfoClientEfl::metered() const
-{
-    notImplemented();
-
-    return false;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h b/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h
deleted file mode 100644 (file)
index 73d5ec8..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * 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.
- * 3.  Neither the name of Apple, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 NetworkInfoClientEfl_h
-#define NetworkInfoClientEfl_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include <NetworkInfoClient.h>
-#include <NetworkInfoProviderEfl.h>
-
-namespace WebCore {
-
-class NetworkInfoClientEfl : public WebCore::NetworkInfoClient {
-public:
-    NetworkInfoClientEfl();
-    ~NetworkInfoClientEfl();
-    
-    virtual void networkInfoControllerDestroyed();
-
-    virtual void startUpdating();
-    virtual void stopUpdating();
-
-    virtual double bandwidth() const;
-    virtual bool metered() const;
-
-private:
-    WebCore::NetworkInfoProviderEfl m_provider;
-};
-
-} // namespace WebCore
-
-#endif
-#endif // NetworkInfoClientEfl_h
index 364cad5..7d4af8e 100644 (file)
 #include "BatteryClientEfl.h"
 #endif
 
-#if ENABLE(NETWORK_INFO)
-#include "NetworkInfoClientEfl.h"
-#endif
-
 #if ENABLE(INPUT_TYPE_COLOR)
 #include "ColorChooserClient.h"
 #endif
@@ -619,10 +615,6 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* smartData)
     WebCore::provideDeviceOrientationTo(priv->page.get(), new WebCore::DeviceOrientationClientEfl);
 #endif
 
-#if ENABLE(NETWORK_INFO)
-    WebCore::provideNetworkInfoTo(priv->page.get(), new WebCore::NetworkInfoClientEfl);
-#endif
-
 #if ENABLE(VIBRATION)
     WebCore::provideVibrationTo(priv->page.get(), new WebCore::VibrationClientEfl(smartData->self));
 #endif
index b119056..4cbd06e 100644 (file)
@@ -41,7 +41,6 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${WEBKIT2_DIR}/WebProcess/FileAPI"
     "${WEBKIT2_DIR}/WebProcess/FullScreen"
     "${WEBKIT2_DIR}/WebProcess/Geolocation"
-    "${WEBKIT2_DIR}/WebProcess/NetworkInfo"
     "${WEBKIT2_DIR}/WebProcess/IconDatabase"
     "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
     "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API"
@@ -226,7 +225,6 @@ set(WebKit2_SOURCES
     Shared/WebKit2Initialize.cpp
     Shared/WebMemorySampler.cpp
     Shared/WebMouseEvent.cpp
-    Shared/WebNetworkInfo.cpp
     Shared/WebOpenPanelParameters.cpp
     Shared/WebPageCreationParameters.cpp
     Shared/WebPageGroupData.cpp
@@ -332,8 +330,6 @@ set(WebKit2_SOURCES
     UIProcess/WebInspectorProxy.cpp
     UIProcess/WebKeyValueStorageManager.cpp
     UIProcess/WebMediaCacheManagerProxy.cpp
-    UIProcess/WebNetworkInfoManagerProxy.cpp
-    UIProcess/WebNetworkInfoProvider.cpp
     UIProcess/WebOpenPanelResultListenerProxy.cpp
     UIProcess/WebOriginDataManagerProxy.cpp
     UIProcess/WebOriginDataManagerProxyChangeClient.cpp
@@ -374,8 +370,6 @@ set(WebKit2_SOURCES
     UIProcess/API/C/WKKeyValueStorageManager.cpp
     UIProcess/API/C/WKMediaCacheManager.cpp
     UIProcess/API/C/WKNavigationDataRef.cpp
-    UIProcess/API/C/WKNetworkInfo.cpp
-    UIProcess/API/C/WKNetworkInfoManager.cpp
     UIProcess/API/C/WKNotification.cpp
     UIProcess/API/C/WKNotificationManager.cpp
     UIProcess/API/C/WKNotificationPermissionRequest.cpp
@@ -486,8 +480,6 @@ set(WebKit2_SOURCES
     WebProcess/Network/WebResourceLoadScheduler.cpp
     WebProcess/Network/WebResourceLoader.cpp
 
-    WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
-
     WebProcess/Notifications/NotificationPermissionRequestManager.cpp
     WebProcess/Notifications/WebNotificationManager.cpp
 
@@ -527,7 +519,6 @@ set(WebKit2_SOURCES
     WebProcess/WebCoreSupport/WebGeolocationClient.cpp
     WebProcess/WebCoreSupport/WebInspectorClient.cpp
     WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
-    WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp
     WebProcess/WebCoreSupport/WebNotificationClient.cpp
     WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
     WebProcess/WebCoreSupport/WebPlugInClient.cpp
@@ -587,7 +578,6 @@ set(WebKit2_MESSAGES_IN_FILES
     UIProcess/WebIconDatabase.messages.in
     UIProcess/WebInspectorProxy.messages.in
     UIProcess/WebMediaCacheManagerProxy.messages.in
-    UIProcess/WebNetworkInfoManagerProxy.messages.in
     UIProcess/WebOriginDataManagerProxy.messages.in
     UIProcess/WebPageProxy.messages.in
     UIProcess/WebProcessProxy.messages.in
@@ -623,8 +613,6 @@ set(WebKit2_MESSAGES_IN_FILES
     WebProcess/Network/NetworkProcessConnection.messages.in
     WebProcess/Network/WebResourceLoader.messages.in
 
-    WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
-
     WebProcess/Notifications/WebNotificationManager.messages.in
 
     WebProcess/OriginData/WebOriginDataManager.messages.in
index 6f1a92f..e5765bf 100644 (file)
@@ -1,3 +1,47 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * Shared/API/c/WKBase.h:
+        * Shared/APIObject.h:
+        * Shared/WebNetworkInfo.cpp: Removed.
+        * Shared/WebNetworkInfo.h: Removed.
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextGetNetworkInfoManager): Deleted.
+        * UIProcess/API/C/WKContext.h:
+        * UIProcess/API/C/WKNetworkInfo.cpp: Removed.
+        * UIProcess/API/C/WKNetworkInfo.h: Removed.
+        * UIProcess/API/C/WKNetworkInfoManager.cpp: Removed.
+        * UIProcess/API/C/WKNetworkInfoManager.h: Removed.
+        * UIProcess/API/efl/ewk_context.cpp:
+        (EwkContext::EwkContext):
+        * UIProcess/API/efl/ewk_context_private.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext):
+        * UIProcess/WebContext.h:
+        * UIProcess/WebNetworkInfoManagerProxy.cpp: Removed.
+        * UIProcess/WebNetworkInfoManagerProxy.h: Removed.
+        * UIProcess/WebNetworkInfoManagerProxy.messages.in: Removed.
+        * UIProcess/WebNetworkInfoProvider.cpp: Removed.
+        * UIProcess/WebNetworkInfoProvider.h: Removed.
+        * UIProcess/efl/NetworkInfoProvider.cpp: Removed.
+        * UIProcess/efl/NetworkInfoProvider.h: Removed.
+        * WebProcess/NetworkInfo/WebNetworkInfoManager.cpp: Removed.
+        * WebProcess/NetworkInfo/WebNetworkInfoManager.h: Removed.
+        * WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in: Removed.
+        * WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp: Removed.
+        * WebProcess/WebCoreSupport/WebNetworkInfoClient.h: Removed.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+
 2014-04-17  Daniel Bates  <dabates@apple.com>
 
         [iOS] Hook up screen.{availHeight, availWidth, height, width}
index 8142a67..49c2149 100644 (file)
@@ -140,7 +140,6 @@ list(APPEND WebKit2_SOURCES
     UIProcess/efl/FindClientEfl.cpp
     UIProcess/efl/FormClientEfl.cpp
     UIProcess/efl/InputMethodContextEfl.cpp
-    UIProcess/efl/NetworkInfoProvider.cpp
     UIProcess/efl/PageLoadClientEfl.cpp
     UIProcess/efl/PagePolicyClientEfl.cpp
     UIProcess/efl/PageUIClientEfl.cpp
index d41894c..749c76d 100644 (file)
@@ -111,8 +111,6 @@ typedef const struct OpaqueWKInspector* WKInspectorRef;
 typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
 typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
 typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
-typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
-typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
 typedef const struct OpaqueWKNotification* WKNotificationRef;
 typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
 typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
index 3e124c6..644671f 100644 (file)
@@ -118,8 +118,6 @@ public:
         KeyValueStorageManager,
         MediaCacheManager,
         NavigationData,
-        NetworkInfo,
-        NetworkInfoManager,
         Notification,
         NotificationManager,
         NotificationPermissionRequest,
diff --git a/Source/WebKit2/Shared/WebNetworkInfo.cpp b/Source/WebKit2/Shared/WebNetworkInfo.cpp
deleted file mode 100644 (file)
index 04fce89..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WebNetworkInfo.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "ArgumentCoders.h"
-#include "Arguments.h"
-
-namespace WebKit {
-
-WebNetworkInfo::WebNetworkInfo(double bandwidth, bool metered)
-{
-    m_data.bandwidth = bandwidth;
-    m_data.metered = metered;
-}
-
-WebNetworkInfo::~WebNetworkInfo()
-{
-}
-
-void WebNetworkInfo::Data::encode(IPC::ArgumentEncoder& encoder) const
-{
-    encoder << bandwidth;
-    encoder << metered;
-}
-
-bool WebNetworkInfo::Data::decode(IPC::ArgumentDecoder& decoder, Data& result)
-{
-    if (!decoder.decode(result.bandwidth))
-        return false;
-    if (!decoder.decode(result.metered))
-        return false;
-
-    return true;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/Shared/WebNetworkInfo.h b/Source/WebKit2/Shared/WebNetworkInfo.h
deleted file mode 100644 (file)
index ec575d0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WebNetworkInfo_h
-#define WebNetworkInfo_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include "APIObject.h"
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebNetworkInfo : public API::ObjectImpl<API::Object::Type::NetworkInfo> {
-public:
-    struct Data {
-        void encode(IPC::ArgumentEncoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Data&);
-
-        double bandwidth;
-        bool metered;
-    };
-
-    static PassRefPtr<WebNetworkInfo> create(double bandwidth, bool metered)
-    {
-        return adoptRef(new WebNetworkInfo(bandwidth, metered));
-    }
-
-    virtual ~WebNetworkInfo();
-
-    double bandwidth() const { return m_data.bandwidth; }
-    bool metered() const { return m_data.metered; }
-
-    const Data& data() const { return m_data; }
-
-private:
-    WebNetworkInfo(double bandwidth, bool metered);
-
-    Data m_data;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // WebNetworkInfo_h
index 64c9262..7721af5 100644 (file)
@@ -83,8 +83,6 @@ class WebIconDatabase;
 class WebInspectorProxy;
 class WebKeyValueStorageManager;
 class WebMediaCacheManagerProxy;
-class WebNetworkInfoManagerProxy;
-class WebNetworkInfo;
 class WebNotification;
 class WebNotificationProvider;
 class WebNotificationManagerProxy;
@@ -129,8 +127,6 @@ WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
 WK_ADD_API_MAPPING(WKKeyValueStorageManagerRef, WebKeyValueStorageManager)
 WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
 WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
-WK_ADD_API_MAPPING(WKNetworkInfoManagerRef, WebNetworkInfoManagerProxy)
-WK_ADD_API_MAPPING(WKNetworkInfoRef, WebNetworkInfo)
 WK_ADD_API_MAPPING(WKNotificationManagerRef, WebNotificationManagerProxy)
 WK_ADD_API_MAPPING(WKNotificationPermissionRequestRef, NotificationPermissionRequest)
 WK_ADD_API_MAPPING(WKNotificationProviderRef, WebNotificationProvider)
index 7acd76e..6dc600d 100644 (file)
@@ -53,9 +53,6 @@
 #if ENABLE(BATTERY_STATUS)
 #include "WebBatteryManagerProxy.h"
 #endif
-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManagerProxy.h"
-#endif
 
 namespace API {
 template<> struct ClientTraits<WKContextDownloadClientBase> {
@@ -409,16 +406,6 @@ WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
     return toAPI(toImpl(contextRef)->supplement<WebGeolocationManagerProxy>());
 }
 
-WKNetworkInfoManagerRef WKContextGetNetworkInfoManager(WKContextRef contextRef)
-{
-#if ENABLE(NETWORK_INFO)
-    return toAPI(toImpl(contextRef)->supplement<WebNetworkInfoManagerProxy>());
-#else
-    UNUSED_PARAM(contextRef);
-    return 0;
-#endif
-}
-
 WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef contextRef)
 {
     return toAPI(toImpl(contextRef)->iconDatabase());
index 3ae5c9a..435b070 100644 (file)
@@ -136,7 +136,6 @@ WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef co
 WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
 WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
 WK_EXPORT WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef context);
-WK_EXPORT WKNetworkInfoManagerRef WKContextGetNetworkInfoManager(WKContextRef context);
 WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
 WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
 WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
diff --git a/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp b/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp
deleted file mode 100644 (file)
index 73fd05e..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WKNetworkInfo.h"
-
-#if ENABLE(NETWORK_INFO)
-#include "WKAPICast.h"
-#include "WebNetworkInfo.h"
-
-using namespace WebKit;
-#endif
-
-WKTypeID WKNetworkInfoGetTypeID()
-{
-#if ENABLE(NETWORK_INFO)
-    return toAPI(WebNetworkInfo::APIType);
-#else
-    return 0;
-#endif
-}
-
-WKNetworkInfoRef WKNetworkInfoCreate(double bandwidth, bool isMetered)
-{
-#if ENABLE(NETWORK_INFO)
-    RefPtr<WebNetworkInfo> networkInfo = WebNetworkInfo::create(bandwidth, isMetered);
-    return toAPI(networkInfo.release().leakRef());
-#else
-    UNUSED_PARAM(bandwidth);
-    UNUSED_PARAM(isMetered);
-    return 0;
-#endif
-}
diff --git a/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h b/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h
deleted file mode 100644 (file)
index cff864a..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WKNetworkInfo_h
-#define WKNetworkInfo_h
-
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKNetworkInfoGetTypeID();
-
-WK_EXPORT WKNetworkInfoRef WKNetworkInfoCreate(double bandwidth, bool isMetered);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKNetworkInfo_h
diff --git a/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp b/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp
deleted file mode 100644 (file)
index 6c278a8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WKNetworkInfoManager.h"
-
-#include "WKAPICast.h"
-#include "WebNetworkInfoManagerProxy.h"
-
-using namespace WebKit;
-
-WKTypeID WKNetworkInfoManagerGetTypeID()
-{
-#if ENABLE(NETWORK_INFO)
-    return toAPI(WebNetworkInfoManagerProxy::APIType);
-#else
-    return 0;
-#endif
-}
-
-void WKNetworkInfoManagerSetProvider(WKNetworkInfoManagerRef networkInfoManager, const WKNetworkInfoProviderBase* provider)
-{
-#if ENABLE(NETWORK_INFO)
-    toImpl(networkInfoManager)->initializeProvider(provider);
-#else
-    UNUSED_PARAM(networkInfoManager);
-    UNUSED_PARAM(provider);
-#endif
-}
-
-void WKNetworkInfoManagerProviderDidChangeNetworkInformation(WKNetworkInfoManagerRef networkInfoManager, WKStringRef eventType, WKNetworkInfoRef networkInfo)
-{
-#if ENABLE(NETWORK_INFO)
-    toImpl(networkInfoManager)->providerDidChangeNetworkInformation(AtomicString(toImpl(eventType)->string()), toImpl(networkInfo));
-#else
-    UNUSED_PARAM(networkInfoManager);
-    UNUSED_PARAM(eventType);
-    UNUSED_PARAM(networkInfo);
-#endif
-}
diff --git a/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h b/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h
deleted file mode 100644 (file)
index e3bdca6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WKNetworkInfoManager_h
-#define WKNetworkInfoManager_h
-
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Provider.
-typedef void (*WKNetworkInfoProviderStartUpdatingCallback)(WKNetworkInfoManagerRef networkInfoManager, const void* clientInfo);
-typedef void (*WKNetworkInfoProviderStopUpdatingCallback)(WKNetworkInfoManagerRef networkInfoManager, const void* clientInfo);
-typedef double (*WKNetworkInfoProviderGetBandwidthCallback)(WKNetworkInfoManagerRef networkInfoManager, const void* clientInfo);
-typedef bool (*WKNetworkInfoProviderIsMeteredCallback)(WKNetworkInfoManagerRef networkInfoManager, const void* clientInfo);
-
-typedef struct WKNetworkInfoProviderBase {
-    int                                                                 version;
-    const void *                                                        clientInfo;
-} WKNetworkInfoProviderBase;
-
-typedef struct WKNetworkInfoProvider {
-    WKNetworkInfoProviderBase                                           base;
-
-    WKNetworkInfoProviderStartUpdatingCallback                          startUpdating;
-    WKNetworkInfoProviderStopUpdatingCallback                           stopUpdating;
-    WKNetworkInfoProviderGetBandwidthCallback                           bandwidth;
-    WKNetworkInfoProviderIsMeteredCallback                              isMetered;
-} WKNetworkInfoProviderV0;
-
-WK_EXPORT WKTypeID WKNetworkInfoManagerGetTypeID();
-
-WK_EXPORT void WKNetworkInfoManagerSetProvider(WKNetworkInfoManagerRef networkInfoManager, const WKNetworkInfoProviderBase* provider);
-
-WK_EXPORT void WKNetworkInfoManagerProviderDidChangeNetworkInformation(WKNetworkInfoManagerRef networkInfoManager, WKStringRef eventType, WKNetworkInfoRef networkInfo);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKNetworkInfoManager_h
index 87818dd..448c6a4 100644 (file)
@@ -24,7 +24,6 @@
 #include "BatteryProvider.h"
 #include "ContextHistoryClientEfl.h"
 #include "DownloadManagerEfl.h"
-#include "NetworkInfoProvider.h"
 #include "RequestManagerClientEfl.h"
 #include "WKAPICast.h"
 #include "WKContextPrivate.h"
@@ -71,9 +70,6 @@ EwkContext::EwkContext(WKContextRef context)
 #if ENABLE(BATTERY_STATUS)
     , m_batteryProvider(BatteryProvider::create(context))
 #endif
-#if ENABLE(NETWORK_INFO)
-    , m_networkInfoProvider(NetworkInfoProvider::create(context))
-#endif
     , m_downloadManager(std::make_unique<DownloadManagerEfl>(context))
     , m_requestManagerClient(std::make_unique<RequestManagerClientEfl>(context))
     , m_historyClient(std::make_unique<ContextHistoryClientEfl>(context))
index d07f5b5..c2895c0 100644 (file)
@@ -41,9 +41,6 @@ class RequestManagerClientEfl;
 #if ENABLE(BATTERY_STATUS)
 class BatteryProvider;
 #endif
-#if ENABLE(NETWORK_INFO)
-class NetworkInfoProvider;
-#endif
 }
 
 class EwkContext : public EwkObject {
@@ -117,9 +114,6 @@ private:
 #if ENABLE(BATTERY_STATUS)
     RefPtr<WebKit::BatteryProvider> m_batteryProvider;
 #endif
-#if ENABLE(NETWORK_INFO)
-    RefPtr<WebKit::NetworkInfoProvider> m_networkInfoProvider;
-#endif
     std::unique_ptr<WebKit::DownloadManagerEfl> m_downloadManager;
     std::unique_ptr<WebKit::RequestManagerClientEfl> m_requestManagerClient;
 
index c7c51e3..c10efeb 100644 (file)
 #include "WebBatteryManagerProxy.h"
 #endif
 
-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManagerProxy.h"
-#endif
-
 #if ENABLE(DATABASE_PROCESS)
 #include "DatabaseProcessCreationParameters.h"
 #include "DatabaseProcessMessages.h"
@@ -192,9 +188,6 @@ WebContext::WebContext(const String& injectedBundlePath)
 #if ENABLE(BATTERY_STATUS)
     addSupplement<WebBatteryManagerProxy>();
 #endif
-#if ENABLE(NETWORK_INFO)
-    addSupplement<WebNetworkInfoManagerProxy>();
-#endif
 
     contexts().append(this);
 
index b2e2326..52b2575 100644 (file)
@@ -84,9 +84,6 @@ struct WebProcessCreationParameters;
     
 typedef GenericCallback<ImmutableDictionary*> DictionaryCallback;
 
-#if ENABLE(NETWORK_INFO)
-class WebNetworkInfoManagerProxy;
-#endif
 #if ENABLE(NETWORK_PROCESS)
 struct NetworkProcessCreationParameters;
 #endif
diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp b/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp
deleted file mode 100644 (file)
index b9b960b..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WebNetworkInfoManagerProxy.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "WebContext.h"
-#include "WebNetworkInfo.h"
-#include "WebNetworkInfoManagerMessages.h"
-#include "WebNetworkInfoManagerProxyMessages.h"
-
-namespace WebKit {
-
-const char* WebNetworkInfoManagerProxy::supplementName()
-{
-    return "WebNetworkInfoManagerProxy";
-}
-
-PassRefPtr<WebNetworkInfoManagerProxy> WebNetworkInfoManagerProxy::create(WebContext* context)
-{
-    return adoptRef(new WebNetworkInfoManagerProxy(context));
-}
-
-WebNetworkInfoManagerProxy::WebNetworkInfoManagerProxy(WebContext* context)
-    : WebContextSupplement(context)
-    , m_isUpdating(false)
-{
-    WebContextSupplement::context()->addMessageReceiver(Messages::WebNetworkInfoManagerProxy::messageReceiverName(), *this);
-}
-
-WebNetworkInfoManagerProxy::~WebNetworkInfoManagerProxy()
-{
-}
-
-void WebNetworkInfoManagerProxy::initializeProvider(const WKNetworkInfoProviderBase* provider)
-{
-    m_provider.initialize(provider);
-}
-
-void WebNetworkInfoManagerProxy::providerDidChangeNetworkInformation(const AtomicString& eventType, WebNetworkInfo* networkInformation)
-{
-    if (!context())
-        return;
-
-    context()->sendToAllProcesses(Messages::WebNetworkInfoManager::DidChangeNetworkInformation(eventType, networkInformation->data()));
-}
-
-// WebContextSupplement
-
-void WebNetworkInfoManagerProxy::contextDestroyed()
-{
-    stopUpdating();
-}
-
-void WebNetworkInfoManagerProxy::processDidClose(WebProcessProxy*)
-{
-    stopUpdating();
-}
-
-void WebNetworkInfoManagerProxy::refWebContextSupplement()
-{
-    API::Object::ref();
-}
-
-void WebNetworkInfoManagerProxy::derefWebContextSupplement()
-{
-    API::Object::deref();
-}
-
-void WebNetworkInfoManagerProxy::startUpdating()
-{
-    if (m_isUpdating)
-        return;
-
-    m_provider.startUpdating(this);
-    m_isUpdating = true;
-}
-
-void WebNetworkInfoManagerProxy::stopUpdating()
-{
-    if (!m_isUpdating)
-        return;
-
-    m_provider.stopUpdating(this);
-    m_isUpdating = false;
-}
-
-void WebNetworkInfoManagerProxy::getBandwidth(double& bandwidth)
-{
-    bandwidth = m_provider.bandwidth(this);
-}
-
-void WebNetworkInfoManagerProxy::isMetered(bool& isMetered)
-{
-    isMetered = m_provider.isMetered(this);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h b/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h
deleted file mode 100644 (file)
index d8ed157..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WebNetworkInfoManagerProxy_h
-#define WebNetworkInfoManagerProxy_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include "APIObject.h"
-#include "MessageReceiver.h"
-#include "WebContextSupplement.h"
-#include "WebNetworkInfoProvider.h"
-#include <wtf/Forward.h>
-
-namespace WebKit {
-
-class WebContext;
-class WebNetworkInfo;
-
-class WebNetworkInfoManagerProxy : public API::ObjectImpl<API::Object::Type::NetworkInfoManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
-    static const char* supplementName();
-
-    static PassRefPtr<WebNetworkInfoManagerProxy> create(WebContext*);
-    virtual ~WebNetworkInfoManagerProxy();
-
-    void initializeProvider(const WKNetworkInfoProviderBase*);
-
-    void providerDidChangeNetworkInformation(const WTF::AtomicString& eventType, WebNetworkInfo*);
-
-    using API::Object::ref;
-    using API::Object::deref;
-
-private:
-    explicit WebNetworkInfoManagerProxy(WebContext*);
-
-    // WebContextSupplement
-    virtual void contextDestroyed() override;
-    virtual void processDidClose(WebProcessProxy*) override;
-    virtual void refWebContextSupplement() override;
-    virtual void derefWebContextSupplement() override;
-
-    // IPC::MessageReceiver
-    virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
-    virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
-
-    void startUpdating();
-    void stopUpdating();
-
-    void getBandwidth(double&);
-    void isMetered(bool&);
-
-    bool m_isUpdating;
-
-    WebContext* m_context;
-    WebNetworkInfoProvider m_provider;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // WebNetworkInfoManagerProxy_h
diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in b/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in
deleted file mode 100644 (file)
index b6acdc2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
-
-#if ENABLE(NETWORK_INFO)
-
-messages -> WebNetworkInfoManagerProxy {
-    StartUpdating();
-    StopUpdating();
-
-    GetBandwidth() -> (double bandwidth);
-    IsMetered() -> (bool metered);
-}
-
-#endif
diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp b/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp
deleted file mode 100644 (file)
index fffdf0d..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WebNetworkInfoProvider.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "WKAPICast.h"
-#include "WebNetworkInfoManagerProxy.h"
-#include <limits.h>
-
-namespace WebKit {
-
-void WebNetworkInfoProvider::startUpdating(WebNetworkInfoManagerProxy* networkInfoManager)
-{
-    if (!m_client.startUpdating)
-        return;
-
-    m_client.startUpdating(toAPI(networkInfoManager), m_client.base.clientInfo);
-}
-
-void WebNetworkInfoProvider::stopUpdating(WebNetworkInfoManagerProxy* networkInfoManager)
-{
-    if (!m_client.stopUpdating)
-        return;
-
-    m_client.stopUpdating(toAPI(networkInfoManager), m_client.base.clientInfo);
-}
-
-double WebNetworkInfoProvider::bandwidth(WebNetworkInfoManagerProxy* networkInfoManager) const
-{
-    // The spec indicates that we should return "infinity" if the bandwidth is unknown.
-    if (!m_client.bandwidth)
-        return std::numeric_limits<double>::infinity();
-
-    return m_client.bandwidth(toAPI(networkInfoManager), m_client.base.clientInfo);
-}
-
-bool WebNetworkInfoProvider::isMetered(WebNetworkInfoManagerProxy* networkInfoManager) const
-{
-    if (!m_client.isMetered)
-        return false;
-
-    return m_client.isMetered(toAPI(networkInfoManager), m_client.base.clientInfo);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h b/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h
deleted file mode 100644 (file)
index 785aa80..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WebNetworkInfoProvider_h
-#define WebNetworkInfoProvider_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include "APIClient.h"
-#include "WKNetworkInfoManager.h"
-#include <wtf/Forward.h>
-
-namespace API {
-template<> struct ClientTraits<WKNetworkInfoProviderBase> {
-    typedef std::tuple<WKNetworkInfoProviderV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebNetworkInfoManagerProxy;
-
-class WebNetworkInfoProvider : public API::Client<WKNetworkInfoProviderBase> {
-public:
-    void startUpdating(WebNetworkInfoManagerProxy*);
-    void stopUpdating(WebNetworkInfoManagerProxy*);
-
-    double bandwidth(WebNetworkInfoManagerProxy*) const;
-    bool isMetered(WebNetworkInfoManagerProxy*) const;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // WebNetworkInfoProvider_h
diff --git a/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp b/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp
deleted file mode 100644 (file)
index 54db8e0..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "NetworkInfoProvider.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "WKNetworkInfoManager.h"
-#include <NotImplemented.h>
-
-using namespace WebKit;
-
-static inline NetworkInfoProvider* toNetworkInfoProvider(const void* clientInfo)
-{
-    return static_cast<NetworkInfoProvider*>(const_cast<void*>(clientInfo));
-}
-
-static void startUpdatingCallback(WKNetworkInfoManagerRef, const void* clientInfo)
-{
-    toNetworkInfoProvider(clientInfo)->startUpdating();
-}
-
-static void stopUpdatingCallback(WKNetworkInfoManagerRef, const void* clientInfo)
-{
-    toNetworkInfoProvider(clientInfo)->stopUpdating();
-}
-
-static double getBandwidthCallback(WKNetworkInfoManagerRef, const void* clientInfo)
-{
-    return toNetworkInfoProvider(clientInfo)->bandwidth();
-}
-
-static bool isMeteredCallback(WKNetworkInfoManagerRef, const void* clientInfo)
-{
-    return toNetworkInfoProvider(clientInfo)->metered();
-}
-
-PassRefPtr<NetworkInfoProvider> NetworkInfoProvider::create(WKContextRef context)
-{
-    return adoptRef(new NetworkInfoProvider(context));
-}
-
-NetworkInfoProvider::NetworkInfoProvider(WKContextRef context)
-    : m_context(context)
-{
-    ASSERT(m_context);
-
-    WKNetworkInfoManagerRef wkNetworkInfoManager = WKContextGetNetworkInfoManager(m_context.get());
-    ASSERT(wkNetworkInfoManager);
-
-    WKNetworkInfoProviderV0 wkNetworkInfoProvider = {
-        {
-            0, // version
-            this, // clientInfo
-        },
-        startUpdatingCallback,
-        stopUpdatingCallback,
-        getBandwidthCallback,
-        isMeteredCallback
-    };
-
-    WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, &wkNetworkInfoProvider.base);
-}
-
-NetworkInfoProvider::~NetworkInfoProvider()
-{
-    WKNetworkInfoManagerRef wkNetworkInfoManager = WKContextGetNetworkInfoManager(m_context.get());
-    ASSERT(wkNetworkInfoManager);
-
-    WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, 0);
-}
-
-void NetworkInfoProvider::networkInfoControllerDestroyed()
-{
-    delete this;
-}
-
-double NetworkInfoProvider::bandwidth() const
-{
-    return m_provider.bandwidth();
-}
-
-bool NetworkInfoProvider::metered() const
-{
-    notImplemented();
-
-    return false;
-}
-
-void NetworkInfoProvider::startUpdating()
-{
-    m_provider.startUpdating();
-}
-
-void NetworkInfoProvider::stopUpdating()
-{
-    m_provider.stopUpdating();
-}
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h b/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h
deleted file mode 100644 (file)
index bf72384..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 NetworkInfoProvider_h
-#define NetworkInfoProvider_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include <NetworkInfoClient.h>
-#include <NetworkInfoProviderEfl.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class NetworkInfoProvider : public RefCounted<NetworkInfoProvider>, public WebCore::NetworkInfoClient {
-public:
-    virtual ~NetworkInfoProvider();
-    static PassRefPtr<NetworkInfoProvider> create(WKContextRef);
-
-    // NetworkInfoClient interface.
-    virtual void networkInfoControllerDestroyed();
-
-    virtual double bandwidth() const;
-    virtual bool metered() const;
-
-    virtual void startUpdating();
-    virtual void stopUpdating();
-
-private:
-    explicit NetworkInfoProvider(WKContextRef);
-
-    WKRetainPtr<WKContextRef> m_context;
-    WebCore::NetworkInfoProviderEfl m_provider;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // NetworkInfoProvider_h
diff --git a/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp b/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
deleted file mode 100644 (file)
index 5dbf522..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WebNetworkInfoManager.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "WebNetworkInfoManagerMessages.h"
-#include "WebNetworkInfoManagerProxyMessages.h"
-#include "WebPage.h"
-#include "WebProcess.h"
-#include <WebCore/NetworkInfo.h>
-#include <WebCore/NetworkInfoController.h>
-#include <limits.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebNetworkInfoManager::supplementName()
-{
-    return "WebNetworkInfoManager";
-}
-
-WebNetworkInfoManager::WebNetworkInfoManager(WebProcess* process)
-    : m_process(process)
-{
-    m_process->addMessageReceiver(Messages::WebNetworkInfoManager::messageReceiverName(), *this);
-}
-
-WebNetworkInfoManager::~WebNetworkInfoManager()
-{
-}
-
-void WebNetworkInfoManager::registerWebPage(WebPage* page)
-{
-    bool wasEmpty = m_pageSet.isEmpty();
-
-    m_pageSet.add(page);
-
-    if (wasEmpty)
-        m_process->parentProcessConnection()->send(Messages::WebNetworkInfoManagerProxy::StartUpdating(), 0);
-}
-
-void WebNetworkInfoManager::unregisterWebPage(WebPage* page)
-{
-    m_pageSet.remove(page);
-
-    if (m_pageSet.isEmpty())
-        m_process->parentProcessConnection()->send(Messages::WebNetworkInfoManagerProxy::StopUpdating(), 0);
-}
-
-double WebNetworkInfoManager::bandwidth(WebPage* page) const
-{
-    // The spec indicates that we should return "infinity" if the bandwidth is unknown.
-    double bandwidth = std::numeric_limits<double>::infinity();
-    m_process->parentProcessConnection()->sendSync(Messages::WebNetworkInfoManagerProxy::GetBandwidth(), Messages::WebNetworkInfoManagerProxy::GetBandwidth::Reply(bandwidth), page->pageID());
-    return bandwidth;
-}
-
-bool WebNetworkInfoManager::metered(WebPage* page) const
-{
-    bool metered = false;
-    m_process->parentProcessConnection()->sendSync(Messages::WebNetworkInfoManagerProxy::IsMetered(), Messages::WebNetworkInfoManagerProxy::IsMetered::Reply(metered), page->pageID());
-    return metered;
-}
-
-void WebNetworkInfoManager::didChangeNetworkInformation(const AtomicString& eventType, const WebNetworkInfo::Data& data)
-{
-    RefPtr<NetworkInfo> networkInformation = NetworkInfo::create(data.bandwidth, data.metered);
-
-    HashSet<WebPage*>::const_iterator it = m_pageSet.begin();
-    HashSet<WebPage*>::const_iterator end = m_pageSet.end();
-    for (; it != end; ++it) {
-        WebPage* page = *it;
-        if (page->corePage())
-            NetworkInfoController::from(page->corePage())->didChangeNetworkInformation(eventType, networkInformation.get());
-    }
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h b/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h
deleted file mode 100644 (file)
index a61e877..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WebNetworkInfoManager_h
-#define WebNetworkInfoManager_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include "MessageReceiver.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebNetworkInfo.h"
-#include "WebProcessSupplement.h"
-#include <wtf/HashSet.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebKit {
-
-class WebPage;
-class WebProcess;
-
-class WebNetworkInfoManager : public WebProcessSupplement, private IPC::MessageReceiver {
-    WTF_MAKE_NONCOPYABLE(WebNetworkInfoManager);
-public:
-    explicit WebNetworkInfoManager(WebProcess*);
-    ~WebNetworkInfoManager();
-
-    static const char* supplementName();
-
-    void registerWebPage(WebPage*);
-    void unregisterWebPage(WebPage*);
-
-    double bandwidth(WebPage*) const;
-    bool metered(WebPage*) const;
-private:
-    // IPC::MessageReceiver
-    void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
-
-    void didChangeNetworkInformation(const AtomicString& eventType, const WebNetworkInfo::Data&);
-
-    WebProcess* m_process;
-    HashSet<WebPage*> m_pageSet;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // WebNetworkInfoManager_h
diff --git a/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in b/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
deleted file mode 100644 (file)
index acc840c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
-
-#if ENABLE(NETWORK_INFO)
-
-messages -> WebNetworkInfoManager {
-    DidChangeNetworkInformation(AtomicString eventType, WebKit::WebNetworkInfo::Data networkInformation);
-}
-
-#endif
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp
deleted file mode 100644 (file)
index 2fd1a72..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "WebNetworkInfoClient.h"
-
-#if ENABLE(NETWORK_INFO)
-
-#include "WebNetworkInfoManager.h"
-#include "WebPage.h"
-#include "WebProcess.h"
-
-namespace WebKit {
-
-WebNetworkInfoClient::~WebNetworkInfoClient()
-{
-}
-
-double WebNetworkInfoClient::bandwidth() const
-{
-    return WebProcess::shared().supplement<WebNetworkInfoManager>()->bandwidth(m_page);
-}
-
-bool WebNetworkInfoClient::metered() const
-{
-    return WebProcess::shared().supplement<WebNetworkInfoManager>()->metered(m_page);
-}
-
-void WebNetworkInfoClient::startUpdating()
-{
-    WebProcess::shared().supplement<WebNetworkInfoManager>()->registerWebPage(m_page);
-}
-
-void WebNetworkInfoClient::stopUpdating()
-{
-    WebProcess::shared().supplement<WebNetworkInfoManager>()->unregisterWebPage(m_page);
-}
-
-void WebNetworkInfoClient::networkInfoControllerDestroyed()
-{
-    WebProcess::shared().supplement<WebNetworkInfoManager>()->unregisterWebPage(m_page);
-    delete this;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h
deleted file mode 100644 (file)
index e90636e..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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. AND ITS CONTRIBUTORS ``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 ITS 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 WebNetworkInfoClient_h
-#define WebNetworkInfoClient_h
-
-#if ENABLE(NETWORK_INFO)
-
-#include <WebCore/NetworkInfoClient.h>
-
-namespace WebKit {
-
-class WebPage;
-
-class WebNetworkInfoClient : public WebCore::NetworkInfoClient {
-public:
-    WebNetworkInfoClient(WebPage* page)
-        : m_page(page)
-    {
-    }
-
-    virtual ~WebNetworkInfoClient();
-
-private:
-    virtual void networkInfoControllerDestroyed() override;
-
-    virtual double bandwidth() const override;
-    virtual bool metered() const override;
-
-    virtual void startUpdating() override;
-    virtual void stopUpdating() override;
-
-    WebPage* m_page;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_INFO)
-
-#endif // WebNetworkInfoClient_h
index 4acb523..e4d21a0 100644 (file)
 #include "WebBatteryClient.h"
 #endif
 
-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoClient.h"
-#endif
-
 #if ENABLE(VIBRATION)
 #include "WebVibrationClient.h"
 #endif
@@ -357,9 +353,6 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
 #if ENABLE(GEOLOCATION)
     WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
 #endif
-#if ENABLE(NETWORK_INFO)
-    WebCore::provideNetworkInfoTo(m_page.get(), new WebNetworkInfoClient(this));
-#endif
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     WebCore::provideNotification(m_page.get(), new WebNotificationClient(this));
 #endif
index c0cfc65..1552355 100644 (file)
 #include <wtf/RunLoop.h>
 #include <wtf/text/StringHash.h>
 
-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManager.h"
-#include "WebNetworkInfoManagerMessages.h"
-#endif
-
 #if ENABLE(NETWORK_PROCESS)
 #if PLATFORM(COCOA)
 #include "CookieStorageShim.h"
@@ -199,9 +194,6 @@ WebProcess::WebProcess()
 #if ENABLE(BATTERY_STATUS)
     addSupplement<WebBatteryManager>();
 #endif
-#if ENABLE(NETWORK_INFO)
-    addSupplement<WebNetworkInfoManager>();
-#endif
 #if USE(SOUP) && !ENABLE(CUSTOM_PROTOCOLS)
     addSupplement<WebSoupRequestManager>();
 #endif
index 10e6ea0..d425d70 100644 (file)
@@ -81,7 +81,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOSNIFF ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
index 1205f19..5a115ba 100644 (file)
@@ -52,7 +52,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
index d9b95ac..6b9e2b0 100644 (file)
@@ -90,7 +90,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_NAVIGATOR_CONTENT_UTILS "Toggle Navigator Content Utils support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" ON)
-    WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_INFO "Toggle Network Information API support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
index 275ad27..65f2635 100644 (file)
@@ -84,7 +84,6 @@
 #cmakedefine01 ENABLE_NAVIGATOR_CONTENT_UTILS
 #cmakedefine01 ENABLE_NOSNIFF
 #cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
-#cmakedefine01 ENABLE_NETWORK_INFO
 #cmakedefine01 ENABLE_NETWORK_PROCESS
 #cmakedefine01 ENABLE_NOTIFICATIONS
 #cmakedefine01 ENABLE_ORIENTATION_EVENTS
index 597c767..0bf542b 100644 (file)
@@ -1,3 +1,12 @@
+2014-04-18  Philippe Normand  <pnormand@igalia.com>
+
+        Remove NETWORK_INFO support
+        https://bugs.webkit.org/show_bug.cgi?id=131841
+
+        Reviewed by Gyuyoung Kim.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2014-04-17  ChangSeok Oh  <changseok.oh@collabora.com>
 
         [GTK] YouCompleteMe doesn't work for cmake build system.
index 941268d..1bbfc64 100644 (file)
@@ -344,9 +344,6 @@ my @features = (
     { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
       define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isIOSWebKit(), value => \$netscapePluginAPISupport },
 
-    { option => "network-info", desc => "Toggle Network Info support",
-      define => "ENABLE_NETWORK_INFO", default => isEfl(), value => \$networkInfoSupport },
-
     { option => "nosniff", desc => "Toggle support for 'X-Content-Type-Options: nosniff'",
       define => "ENABLE_NOSNIFF", default => 0, value => \$nosniffSupport },