<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167488] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167488">167488</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-18 05:34:03 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformeflwk2TestExpectations">trunk/LayoutTests/platform/efl-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimSkipped">trunk/LayoutTests/platform/ios-sim/Skipped</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetFactoryin">trunk/Source/WebCore/dom/EventTargetFactory.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformEflcmake">trunk/Source/WebKit/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIObjecth">trunk/Source/WebKit2/Shared/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_context_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsnetworkinformationaddlistenerfromcallbackexpectedtxt">trunk/LayoutTests/networkinformation/add-listener-from-callback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationaddlistenerfromcallbackhtml">trunk/LayoutTests/networkinformation/add-listener-from-callback.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationbasicalltypesofeventsexpectedtxt">trunk/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationbasicalltypesofeventshtml">trunk/LayoutTests/networkinformation/basic-all-types-of-events.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationbasicoperationexpectedtxt">trunk/LayoutTests/networkinformation/basic-operation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationbasicoperationhtml">trunk/LayoutTests/networkinformation/basic-operation.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationeventafternavigationexpectedtxt">trunk/LayoutTests/networkinformation/event-after-navigation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationeventafternavigationhtml">trunk/LayoutTests/networkinformation/event-after-navigation.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationmultipleframesexpectedtxt">trunk/LayoutTests/networkinformation/multiple-frames-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationmultipleframeshtml">trunk/LayoutTests/networkinformation/multiple-frames.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationresourceseventafternavigationnewhtml">trunk/LayoutTests/networkinformation/resources/event-after-navigation-new.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestsaddlistenerfromcallbackjs">trunk/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestsbasicalltypesofeventsjs">trunk/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestsbasicoperationjs">trunk/LayoutTests/networkinformation/script-tests/basic-operation.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestseventafternavigationjs">trunk/LayoutTests/networkinformation/script-tests/event-after-navigation.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestsmultipleframesjs">trunk/LayoutTests/networkinformation/script-tests/multiple-frames.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestsupdatesjs">trunk/LayoutTests/networkinformation/script-tests/updates.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationscripttestswindowpropertyjs">trunk/LayoutTests/networkinformation/script-tests/window-property.js</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationupdatesexpectedtxt">trunk/LayoutTests/networkinformation/updates-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationupdateshtml">trunk/LayoutTests/networkinformation/updates.html</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationwindowpropertyexpectedtxt">trunk/LayoutTests/networkinformation/window-property-expected.txt</a></li>
<li><a href="#trunkLayoutTestsnetworkinformationwindowpropertyhtml">trunk/LayoutTests/networkinformation/window-property.html</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectioncpp">trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectionh">trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectionidl">trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfocpp">trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoh">trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoClienth">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectioncpp">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectionh">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectionidl">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoControllercpp">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnetworkinfoNetworkInfoControllerh">trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflNetworkInfoProviderEflcpp">trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflNetworkInfoProviderEflh">trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportNetworkInfoClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportNetworkInfoClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebNetworkInfocpp">trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebNetworkInfoh">trunk/Source/WebKit2/Shared/WebNetworkInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNetworkInfocpp">trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNetworkInfoh">trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNetworkInfoManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNetworkInfoManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxyh">trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebNetworkInfoProvidercpp">trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebNetworkInfoProviderh">trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflNetworkInfoProvidercpp">trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflNetworkInfoProviderh">trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagercpp">trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagerh">trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagermessagesin">trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebNetworkInfoClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebNetworkInfoClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-17 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix EFL and GTK builds.
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-04-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167478.
</span></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationaddlistenerfromcallbackexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/add-listener-from-callback-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/add-listener-from-callback-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/add-listener-from-callback-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationaddlistenerfromcallbackhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/add-listener-from-callback.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/add-listener-from-callback.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/add-listener-from-callback.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationbasicalltypesofeventsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/basic-all-types-of-events-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationbasicalltypesofeventshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/basic-all-types-of-events.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/basic-all-types-of-events.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/basic-all-types-of-events.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationbasicoperationexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/basic-operation-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/basic-operation-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/basic-operation-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationbasicoperationhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/basic-operation.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/basic-operation.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/basic-operation.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationeventafternavigationexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/event-after-navigation-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/event-after-navigation-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/event-after-navigation-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationeventafternavigationhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/event-after-navigation.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/event-after-navigation.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/event-after-navigation.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationmultipleframesexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/multiple-frames-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/multiple-frames-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/multiple-frames-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationmultipleframeshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/multiple-frames.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/multiple-frames.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/multiple-frames.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationresourceseventafternavigationnewhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/resources/event-after-navigation-new.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/resources/event-after-navigation-new.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/resources/event-after-navigation-new.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestsaddlistenerfromcallbackjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/add-listener-from-callback.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestsbasicalltypesofeventsjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/basic-all-types-of-events.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestsbasicoperationjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/basic-operation.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/basic-operation.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/basic-operation.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestseventafternavigationjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/event-after-navigation.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/event-after-navigation.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/event-after-navigation.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestsmultipleframesjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/multiple-frames.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/multiple-frames.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/multiple-frames.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestsupdatesjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/updates.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/updates.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/updates.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationscripttestswindowpropertyjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/script-tests/window-property.js (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/script-tests/window-property.js 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/script-tests/window-property.js 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>-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')");
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationupdatesexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/updates-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/updates-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/updates-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationupdateshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/updates.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/updates.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/updates.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationwindowpropertyexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/window-property-expected.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/window-property-expected.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/window-property-expected.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsnetworkinformationwindowpropertyhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/networkinformation/window-property.html (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/networkinformation/window-property.html 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/networkinformation/window-property.html 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1812,7 +1812,6 @@
</span><span class="cx"> webkit.org/b/128670 fast/dom/webtiming-navigate-within-document.html [ Failure ]
</span><span class="cx"> webkit.org/b/128670 fast/forms/form-hides-table.html [ Failure ]
</span><span class="cx"> webkit.org/b/128670 js/dom/dom-static-property-for-in-iteration.html [ Failure ]
</span><del>-webkit.org/b/128670 networkinformation/window-property.html [ Failure ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/128901 accessibility/list-detection.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -50,13 +50,6 @@
</span><span class="cx"> webkit.org/b/102200 fast/dom/HTMLAnchorElement/anchor-download.html [ Crash Failure ]
</span><span class="cx"> webkit.org/b/102200 fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Crash Failure ]
</span><span class="cx">
</span><del>-# 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 ]
-
</del><span class="cx"> # WebGL test cases crashing in WebCore::GraphicsContext3D::readPixels().
</span><span class="cx"> webkit.org/b/109417 webgl/conformance/textures/texture-attachment-formats.html [ Crash Failure ]
</span><span class="cx"> webkit.org/b/109945 webgl/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Crash ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -283,9 +283,6 @@
</span><span class="cx"> webkit.org/b/95582 batterystatus [ Failure ]
</span><span class="cx"> webkit.org/b/95582 batterystatus/event-after-navigation.html [ Timeout ]
</span><span class="cx">
</span><del>-# Network Information API support not yet.
-webkit.org/b/99052 networkinformation [ Skip ]
-
</del><span class="cx"> # Touch adjustment not enabled
</span><span class="cx"> webkit.org/b/99054 touchadjustment [ Failure ]
</span><span class="cx"> webkit.org/b/99054 touchadjustment/iframe.html [ Timeout ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-sim/Skipped (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim/Skipped 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/ios-sim/Skipped 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1138,9 +1138,6 @@
</span><span class="cx"> # batterystatus not supported on iOS
</span><span class="cx"> batterystatus/
</span><span class="cx">
</span><del>-# networkinformation not supported on iOS
-networkinformation/
-
</del><span class="cx"> # gamepad not supported on iOS
</span><span class="cx"> gamepad/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -435,9 +435,6 @@
</span><span class="cx"> # Needs BatteryClient implementation.
</span><span class="cx"> webkit.org/b/62698 batterystatus/
</span><span class="cx">
</span><del>-#Network Information is not supported yet.
-webkit.org/b/73528 networkinformation
-
</del><span class="cx"> # Proximity Events is not supported.
</span><span class="cx"> proximity
</span><span class="cx"> fast/events/constructors/device-proximity-event-constructor.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1484,9 +1484,6 @@
</span><span class="cx"> # Needs BatteryClient implementation.
</span><span class="cx"> webkit.org/b/62698 batterystatus/
</span><span class="cx">
</span><del>-#Network Information is not supported yet.
-webkit.org/b/73528 networkinformation
-
</del><span class="cx"> # Proximity Events is not supported.
</span><span class="cx"> proximity
</span><span class="cx"> fast/events/constructors/device-proximity-event-constructor.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwincairoTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wincairo/TestExpectations 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -2250,9 +2250,6 @@
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=86176
</span><span class="cx"> ietestcenter/css3/valuesandunits/units-000.htm
</span><span class="cx">
</span><del>-# Network Information is not supported yet.
-networkinformation
-
</del><span class="cx"> # Asserts/crashes in PluginView::didFinishLoading
</span><span class="cx"> fast/loader/reload-zero-byte-plugin.html
</span><span class="cx"> userscripts/user-script-plugin-document.html
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WTF/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't include CompilationThread.h from StringImpl.h
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -618,10 +618,6 @@
</span><span class="cx"> #define ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_NETWORK_INFO)
-#define ENABLE_NETWORK_INFO 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_NOTIFICATIONS)
</span><span class="cx"> #define ENABLE_NOTIFICATIONS 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/Modules/mediasource"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/mediastream"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/navigatorcontentutils"
</span><del>- "${WEBCORE_DIR}/Modules/networkinfo"
</del><span class="cx"> "${WEBCORE_DIR}/Modules/notifications"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/plugins"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/proximity"
</span><span class="lines">@@ -134,7 +133,6 @@
</span><span class="cx"> Modules/indexeddb
</span><span class="cx"> Modules/indieui
</span><span class="cx"> Modules/mediastream
</span><del>- Modules/networkinfo
</del><span class="cx"> Modules/notifications
</span><span class="cx"> Modules/proximity
</span><span class="cx"> Modules/quota
</span><span class="lines">@@ -241,9 +239,6 @@
</span><span class="cx">
</span><span class="cx"> Modules/navigatorcontentutils/NavigatorContentUtils.idl
</span><span class="cx">
</span><del>- Modules/networkinfo/NavigatorNetworkInfoConnection.idl
- Modules/networkinfo/NetworkInfoConnection.idl
-
</del><span class="cx"> Modules/notifications/DOMWindowNotifications.idl
</span><span class="cx"> Modules/notifications/Notification.idl
</span><span class="cx"> Modules/notifications/NotificationCenter.idl
</span><span class="lines">@@ -877,11 +872,6 @@
</span><span class="cx">
</span><span class="cx"> Modules/navigatorcontentutils/NavigatorContentUtils.cpp
</span><span class="cx">
</span><del>- Modules/networkinfo/NavigatorNetworkInfoConnection.cpp
- Modules/networkinfo/NetworkInfo.cpp
- Modules/networkinfo/NetworkInfoConnection.cpp
- Modules/networkinfo/NetworkInfoController.cpp
-
</del><span class="cx"> Modules/notifications/DOMWindowNotifications.cpp
</span><span class="cx"> Modules/notifications/Notification.cpp
</span><span class="cx"> Modules/notifications/NotificationCenter.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167478.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNavigatorNetworkInfoConnectionidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.idl 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfo.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoClient.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,109 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,94 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoConnectionidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoConnection.idl 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoControllercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnetworkinfoNetworkInfoControllerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/Modules/networkinfo/NetworkInfoController.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> platform/efl/LocalizedStringsEfl.cpp
</span><span class="cx"> platform/efl/LoggingEfl.cpp
</span><span class="cx"> platform/efl/MIMETypeRegistryEfl.cpp
</span><del>- platform/efl/NetworkInfoProviderEfl.cpp
</del><span class="cx"> platform/efl/PasteboardEfl.cpp
</span><span class="cx"> platform/efl/PlatformKeyboardEventEfl.cpp
</span><span class="cx"> platform/efl/PlatformMouseEventEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetFactoryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTargetFactory.in (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTargetFactory.in 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/dom/EventTargetFactory.in 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> MediaStream conditional=MEDIA_STREAM
</span><span class="cx"> MediaStreamTrack conditional=MEDIA_STREAM
</span><span class="cx"> MessagePort
</span><del>-NetworkInfoConnection conditional=NETWORK_INFO
</del><span class="cx"> Node
</span><span class="cx"> Notification conditional=NOTIFICATIONS|LEGACY_NOTIFICATIONS
</span><span class="cx"> Performance conditional=WEB_TIMING
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflNetworkInfoProviderEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflNetworkInfoProviderEflh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/platform/efl/NetworkInfoProviderEfl.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -113,11 +113,6 @@
</span><span class="cx"> #include "BatteryController.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "NetworkInfo.h"
-#include "NetworkInfoController.h"
-#endif
-
</del><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span><span class="cx"> #include "DeviceProximityController.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1260,23 +1255,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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
-}
-
</del><span class="cx"> void Internals::setDeviceProximity(const String& eventType, double value, double min, double max, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/testing/Internals.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -197,8 +197,6 @@
</span><span class="cx">
</span><span class="cx"> void setBatteryStatus(const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode&);
</span><span class="cx">
</span><del>- void setNetworkInformation(const String& eventType, double bandwidth, bool metered, ExceptionCode&);
-
</del><span class="cx"> void setDeviceProximity(const String& eventType, double value, double min, double max, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> enum {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -176,10 +176,6 @@
</span><span class="cx"> [RaisesException] void setBatteryStatus(DOMString eventType, boolean charging, double chargingTime, double dischargingTime, double level);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(ENABLE_NETWORK_INFO) && ENABLE_NETWORK_INFO
- [RaisesException] void setNetworkInformation(DOMString eventType, double bandwidth, boolean metered);
-#endif
-
</del><span class="cx"> #if defined(ENABLE_PROXIMITY_EVENTS) && ENABLE_PROXIMITY_EVENTS
</span><span class="cx"> [RaisesException] void setDeviceProximity(DOMString eventType, double value, double min, double max);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed 64-bit build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformEfl.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformEfl.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> efl/WebCoreSupport/IconDatabaseClientEfl.cpp
</span><span class="cx"> efl/WebCoreSupport/InspectorClientEfl.cpp
</span><span class="cx"> efl/WebCoreSupport/NavigatorContentUtilsClientEfl.cpp
</span><del>- efl/WebCoreSupport/NetworkInfoClientEfl.cpp
</del><span class="cx"> efl/WebCoreSupport/NotificationPresenterClientEfl.cpp
</span><span class="cx"> efl/WebCoreSupport/PlatformStrategiesEfl.cpp
</span><span class="cx"> efl/WebCoreSupport/ProgressTrackerClientEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-04-17 Jeongeun Kim <je_julie.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK1] SSL Strict is set according to input parameter.
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportNetworkInfoClientEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportNetworkInfoClientEflh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/efl/WebCoreSupport/NetworkInfoClientEfl.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -108,10 +108,6 @@
</span><span class="cx"> #include "BatteryClientEfl.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "NetworkInfoClientEfl.h"
-#endif
-
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> #include "ColorChooserClient.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -619,10 +615,6 @@
</span><span class="cx"> WebCore::provideDeviceOrientationTo(priv->page.get(), new WebCore::DeviceOrientationClientEfl);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
- WebCore::provideNetworkInfoTo(priv->page.get(), new WebCore::NetworkInfoClientEfl);
-#endif
-
</del><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="cx"> WebCore::provideVibrationTo(priv->page.get(), new WebCore::VibrationClientEfl(smartData->self));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/FileAPI"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/FullScreen"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Geolocation"
</span><del>- "${WEBKIT2_DIR}/WebProcess/NetworkInfo"
</del><span class="cx"> "${WEBKIT2_DIR}/WebProcess/IconDatabase"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API"
</span><span class="lines">@@ -226,7 +225,6 @@
</span><span class="cx"> Shared/WebKit2Initialize.cpp
</span><span class="cx"> Shared/WebMemorySampler.cpp
</span><span class="cx"> Shared/WebMouseEvent.cpp
</span><del>- Shared/WebNetworkInfo.cpp
</del><span class="cx"> Shared/WebOpenPanelParameters.cpp
</span><span class="cx"> Shared/WebPageCreationParameters.cpp
</span><span class="cx"> Shared/WebPageGroupData.cpp
</span><span class="lines">@@ -332,8 +330,6 @@
</span><span class="cx"> UIProcess/WebInspectorProxy.cpp
</span><span class="cx"> UIProcess/WebKeyValueStorageManager.cpp
</span><span class="cx"> UIProcess/WebMediaCacheManagerProxy.cpp
</span><del>- UIProcess/WebNetworkInfoManagerProxy.cpp
- UIProcess/WebNetworkInfoProvider.cpp
</del><span class="cx"> UIProcess/WebOpenPanelResultListenerProxy.cpp
</span><span class="cx"> UIProcess/WebOriginDataManagerProxy.cpp
</span><span class="cx"> UIProcess/WebOriginDataManagerProxyChangeClient.cpp
</span><span class="lines">@@ -374,8 +370,6 @@
</span><span class="cx"> UIProcess/API/C/WKKeyValueStorageManager.cpp
</span><span class="cx"> UIProcess/API/C/WKMediaCacheManager.cpp
</span><span class="cx"> UIProcess/API/C/WKNavigationDataRef.cpp
</span><del>- UIProcess/API/C/WKNetworkInfo.cpp
- UIProcess/API/C/WKNetworkInfoManager.cpp
</del><span class="cx"> UIProcess/API/C/WKNotification.cpp
</span><span class="cx"> UIProcess/API/C/WKNotificationManager.cpp
</span><span class="cx"> UIProcess/API/C/WKNotificationPermissionRequest.cpp
</span><span class="lines">@@ -486,8 +480,6 @@
</span><span class="cx"> WebProcess/Network/WebResourceLoadScheduler.cpp
</span><span class="cx"> WebProcess/Network/WebResourceLoader.cpp
</span><span class="cx">
</span><del>- WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
-
</del><span class="cx"> WebProcess/Notifications/NotificationPermissionRequestManager.cpp
</span><span class="cx"> WebProcess/Notifications/WebNotificationManager.cpp
</span><span class="cx">
</span><span class="lines">@@ -527,7 +519,6 @@
</span><span class="cx"> WebProcess/WebCoreSupport/WebGeolocationClient.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebInspectorClient.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
</span><del>- WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp
</del><span class="cx"> WebProcess/WebCoreSupport/WebNotificationClient.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebPlugInClient.cpp
</span><span class="lines">@@ -587,7 +578,6 @@
</span><span class="cx"> UIProcess/WebIconDatabase.messages.in
</span><span class="cx"> UIProcess/WebInspectorProxy.messages.in
</span><span class="cx"> UIProcess/WebMediaCacheManagerProxy.messages.in
</span><del>- UIProcess/WebNetworkInfoManagerProxy.messages.in
</del><span class="cx"> UIProcess/WebOriginDataManagerProxy.messages.in
</span><span class="cx"> UIProcess/WebPageProxy.messages.in
</span><span class="cx"> UIProcess/WebProcessProxy.messages.in
</span><span class="lines">@@ -623,8 +613,6 @@
</span><span class="cx"> WebProcess/Network/NetworkProcessConnection.messages.in
</span><span class="cx"> WebProcess/Network/WebResourceLoader.messages.in
</span><span class="cx">
</span><del>- WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
-
</del><span class="cx"> WebProcess/Notifications/WebNotificationManager.messages.in
</span><span class="cx">
</span><span class="cx"> WebProcess/OriginData/WebOriginDataManager.messages.in
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-04-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Hook up screen.{availHeight, availWidth, height, width}
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx"> UIProcess/efl/FindClientEfl.cpp
</span><span class="cx"> UIProcess/efl/FormClientEfl.cpp
</span><span class="cx"> UIProcess/efl/InputMethodContextEfl.cpp
</span><del>- UIProcess/efl/NetworkInfoProvider.cpp
</del><span class="cx"> UIProcess/efl/PageLoadClientEfl.cpp
</span><span class="cx"> UIProcess/efl/PagePolicyClientEfl.cpp
</span><span class="cx"> UIProcess/efl/PageUIClientEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -111,8 +111,6 @@
</span><span class="cx"> typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
</span><del>-typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
-typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
</del><span class="cx"> typedef const struct OpaqueWKNotification* WKNotificationRef;
</span><span class="cx"> typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIObject.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIObject.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -118,8 +118,6 @@
</span><span class="cx"> KeyValueStorageManager,
</span><span class="cx"> MediaCacheManager,
</span><span class="cx"> NavigationData,
</span><del>- NetworkInfo,
- NetworkInfoManager,
</del><span class="cx"> Notification,
</span><span class="cx"> NotificationManager,
</span><span class="cx"> NotificationPermissionRequest,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebNetworkInfocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebNetworkInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebNetworkInfo.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx"> class WebInspectorProxy;
</span><span class="cx"> class WebKeyValueStorageManager;
</span><span class="cx"> class WebMediaCacheManagerProxy;
</span><del>-class WebNetworkInfoManagerProxy;
-class WebNetworkInfo;
</del><span class="cx"> class WebNotification;
</span><span class="cx"> class WebNotificationProvider;
</span><span class="cx"> class WebNotificationManagerProxy;
</span><span class="lines">@@ -129,8 +127,6 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKKeyValueStorageManagerRef, WebKeyValueStorageManager)
</span><span class="cx"> WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
</span><del>-WK_ADD_API_MAPPING(WKNetworkInfoManagerRef, WebNetworkInfoManagerProxy)
-WK_ADD_API_MAPPING(WKNetworkInfoRef, WebNetworkInfo)
</del><span class="cx"> WK_ADD_API_MAPPING(WKNotificationManagerRef, WebNotificationManagerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNotificationPermissionRequestRef, NotificationPermissionRequest)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNotificationProviderRef, WebNotificationProvider)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -53,9 +53,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryManagerProxy.h"
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManagerProxy.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> template<> struct ClientTraits<WKContextDownloadClientBase> {
</span><span class="lines">@@ -409,16 +406,6 @@
</span><span class="cx"> return toAPI(toImpl(contextRef)->supplement<WebGeolocationManagerProxy>());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKNetworkInfoManagerRef WKContextGetNetworkInfoManager(WKContextRef contextRef)
-{
-#if ENABLE(NETWORK_INFO)
- return toAPI(toImpl(contextRef)->supplement<WebNetworkInfoManagerProxy>());
-#else
- UNUSED_PARAM(contextRef);
- return 0;
-#endif
-}
-
</del><span class="cx"> WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef contextRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(contextRef)->iconDatabase());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef context);
</span><del>-WK_EXPORT WKNetworkInfoManagerRef WKContextGetNetworkInfoManager(WKContextRef context);
</del><span class="cx"> WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNetworkInfocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * 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
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNetworkInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfo.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNetworkInfoManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * 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
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNetworkInfoManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "BatteryProvider.h"
</span><span class="cx"> #include "ContextHistoryClientEfl.h"
</span><span class="cx"> #include "DownloadManagerEfl.h"
</span><del>-#include "NetworkInfoProvider.h"
</del><span class="cx"> #include "RequestManagerClientEfl.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKContextPrivate.h"
</span><span class="lines">@@ -71,9 +70,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> , m_batteryProvider(BatteryProvider::create(context))
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
- , m_networkInfoProvider(NetworkInfoProvider::create(context))
-#endif
</del><span class="cx"> , m_downloadManager(std::make_unique<DownloadManagerEfl>(context))
</span><span class="cx"> , m_requestManagerClient(std::make_unique<RequestManagerClientEfl>(context))
</span><span class="cx"> , m_historyClient(std::make_unique<ContextHistoryClientEfl>(context))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_context_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -41,9 +41,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> class BatteryProvider;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
-class NetworkInfoProvider;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EwkContext : public EwkObject {
</span><span class="lines">@@ -117,9 +114,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> RefPtr<WebKit::BatteryProvider> m_batteryProvider;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
- RefPtr<WebKit::NetworkInfoProvider> m_networkInfoProvider;
-#endif
</del><span class="cx"> std::unique_ptr<WebKit::DownloadManagerEfl> m_downloadManager;
</span><span class="cx"> std::unique_ptr<WebKit::RequestManagerClientEfl> m_requestManagerClient;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -74,10 +74,6 @@
</span><span class="cx"> #include "WebBatteryManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManagerProxy.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx"> #include "DatabaseProcessMessages.h"
</span><span class="lines">@@ -192,9 +188,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> addSupplement<WebBatteryManagerProxy>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
- addSupplement<WebNetworkInfoManagerProxy>();
-#endif
</del><span class="cx">
</span><span class="cx"> contexts().append(this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -84,9 +84,6 @@
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<ImmutableDictionary*> DictionaryCallback;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-class WebNetworkInfoManagerProxy;
-#endif
</del><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebNetworkInfoManagerProxymessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.messages.in 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-# 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebNetworkInfoProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebNetworkInfoProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoProvider.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflNetworkInfoProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,123 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflNetworkInfoProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,106 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkInfoWebNetworkInfoManagermessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-# 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebNetworkInfoClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebNetworkInfoClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -162,10 +162,6 @@
</span><span class="cx"> #include "WebBatteryClient.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoClient.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="cx"> #include "WebVibrationClient.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -357,9 +353,6 @@
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
- WebCore::provideNetworkInfoTo(m_page.get(), new WebNetworkInfoClient(this));
-#endif
</del><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> WebCore::provideNotification(m_page.get(), new WebNotificationClient(this));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -88,11 +88,6 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_INFO)
-#include "WebNetworkInfoManager.h"
-#include "WebNetworkInfoManagerMessages.h"
-#endif
-
</del><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "CookieStorageShim.h"
</span><span class="lines">@@ -199,9 +194,6 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> addSupplement<WebBatteryManager>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_INFO)
- addSupplement<WebNetworkInfoManager>();
-#endif
</del><span class="cx"> #if USE(SOUP) && !ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> addSupplement<WebSoupRequestManager>();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOSNIFF ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NAVIGATOR_CONTENT_UTILS "Toggle Navigator Content Utils support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_INFO "Toggle Network Information API support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Source/cmakeconfig.h.cmake 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_NAVIGATOR_CONTENT_UTILS
</span><span class="cx"> #cmakedefine01 ENABLE_NOSNIFF
</span><span class="cx"> #cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
</span><del>-#cmakedefine01 ENABLE_NETWORK_INFO
</del><span class="cx"> #cmakedefine01 ENABLE_NETWORK_PROCESS
</span><span class="cx"> #cmakedefine01 ENABLE_NOTIFICATIONS
</span><span class="cx"> #cmakedefine01 ENABLE_ORIENTATION_EVENTS
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Tools/ChangeLog 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-17 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] YouCompleteMe doesn't work for cmake build system.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (167487 => 167488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-04-18 06:59:56 UTC (rev 167487)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-04-18 12:34:03 UTC (rev 167488)
</span><span class="lines">@@ -344,9 +344,6 @@
</span><span class="cx"> { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
</span><span class="cx"> define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isIOSWebKit(), value => \$netscapePluginAPISupport },
</span><span class="cx">
</span><del>- { option => "network-info", desc => "Toggle Network Info support",
- define => "ENABLE_NETWORK_INFO", default => isEfl(), value => \$networkInfoSupport },
-
</del><span class="cx"> { option => "nosniff", desc => "Toggle support for 'X-Content-Type-Options: nosniff'",
</span><span class="cx"> define => "ENABLE_NOSNIFF", default => 0, value => \$nosniffSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>