<!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>[150923] trunk/Source/WebKit/blackberry</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/150923">150923</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-29 12:32:06 -0700 (Wed, 29 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] Add more cellular technologies into the NetworkInfo enum
https://bugs.webkit.org/show_bug.cgi?id=116982

PR 340189
Patch by Otto Derek Cheung &lt;otcheung@rim.com&gt; on 2013-05-29
Reviewed by Rob Buis.

Provide more specific bandwidth speeds on different network
services our devices provide.

* WebCoreSupport/NetworkInfoClientBlackBerry.cpp:
(WebCore):
(WebCore::NetworkInfoClientBlackBerry::bandwidth):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportNetworkInfoClientBlackBerrycpp">trunk/Source/WebKit/blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (150922 => 150923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2013-05-29 19:26:16 UTC (rev 150922)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2013-05-29 19:32:06 UTC (rev 150923)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-05-29  Otto Derek Cheung  &lt;otcheung@rim.com&gt;
+
+        [BlackBerry] Add more cellular technologies into the NetworkInfo enum
+        https://bugs.webkit.org/show_bug.cgi?id=116982
+
+        PR 340189
+        Reviewed by Rob Buis.
+
+        Provide more specific bandwidth speeds on different network
+        services our devices provide.
+
+        * WebCoreSupport/NetworkInfoClientBlackBerry.cpp:
+        (WebCore):
+        (WebCore::NetworkInfoClientBlackBerry::bandwidth):
+
</ins><span class="cx"> 2013-05-29  Yong Li  &lt;yoli@rim.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [BlackBerry] about:memory should use malloc_stats instead of mallinfo
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportNetworkInfoClientBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp (150922 => 150923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp        2013-05-29 19:26:16 UTC (rev 150922)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp        2013-05-29 19:32:06 UTC (rev 150923)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013 Research In Motion Limited. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * This library is free software; you can redistribute it and/or
</span><span class="cx">  * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -27,12 +27,19 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-static const double  networkSpeedNone = 0; // 0 Mb/s
-static const double  networkSpeedEthernet = 20; // 20 Mb/s
-static const double  networkSpeedWifi = 20; // 20 Mb/s
-static const double  networkSpeed2G = 60 / 1024; // 60 kb/s
-static const double  networkSpeed3G = 7; // 7 Mb/s
-static const double  networkSpeed4G = 50; // 50 Mb/s
</del><ins>+static const double  networkSpeedNone = 0;
+static const double  networkSpeedEthernet = 20.0;
+static const double  networkSpeedWifi = 20.0;
+static const double  networkSpeedGPRS = 7.2 / 1024.0;
+static const double  networkSpeedEDGE = 30.0 / 1024.0;
+static const double  networkSpeedUMTS = 48.0 / 1024.0;
+static const double  networkSpeedHSPA = 1.7;
+static const double  networkSpeedHSPAP = 5.25;
+static const double  networkSpeedCDMA = 18.0 / 1024.0;
+static const double  networkSpeedEVDO = 307.0 / 1024.0;
+static const double  networkSpeedEVDOA = 397.0 / 1024.0;
+static const double  networkSpeedEHRPD = 21.625;
+static const double  networkSpeedLTE = 21.625;
</ins><span class="cx"> static const double  networkSpeedDefault = INFINITY; // w3c draft states it should be infinity
</span><span class="cx"> 
</span><span class="cx"> NetworkInfoClientBlackBerry::NetworkInfoClientBlackBerry(BlackBerry::WebKit::WebPagePrivate* webPagePrivate)
</span><span class="lines">@@ -69,13 +76,26 @@
</span><span class="cx">         return networkSpeedWifi;
</span><span class="cx">     case BlackBerry::Platform::NetworkTypeCellular:
</span><span class="cx">         switch (BlackBerry::Platform::NetworkInfo::instance()-&gt;getCurrentCellularType()) {
</span><ins>+        case BlackBerry::Platform::CellularTypeGPRS:
+            return networkSpeedGPRS;
</ins><span class="cx">         case BlackBerry::Platform::CellularTypeEDGE:
</span><del>-            return networkSpeed2G;
</del><ins>+            return networkSpeedEDGE;
+        case BlackBerry::Platform::CellularTypeUMTS:
+            return networkSpeedUMTS;
+        case BlackBerry::Platform::CellularTypeHSPA:
+            return networkSpeedHSPA;
+        case BlackBerry::Platform::CellularTypeHSPAP:
+            return networkSpeedHSPAP;
+        case BlackBerry::Platform::CellularTypeCDMA:
+            return networkSpeedCDMA;
</ins><span class="cx">         case BlackBerry::Platform::CellularTypeEVDO:
</span><del>-        case BlackBerry::Platform::CellularTypeUMTS:
-            return networkSpeed3G;
</del><ins>+            return networkSpeedEVDO;
+        case BlackBerry::Platform::CellularTypeEVDOA:
+            return networkSpeedEVDOA;
+        case BlackBerry::Platform::CellularTypeEHRPD:
+            return networkSpeedEHRPD;
</ins><span class="cx">         case BlackBerry::Platform::CellularTypeLTE:
</span><del>-            return networkSpeed4G;
</del><ins>+            return networkSpeedLTE;
</ins><span class="cx">         case BlackBerry::Platform::CellularTypeUnknown:
</span><span class="cx">             return networkSpeedDefault;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>