Index: chrome/browser/resources/about_memory_mac.html |
=================================================================== |
--- chrome/browser/resources/about_memory_mac.html (revision 69842) |
+++ chrome/browser/resources/about_memory_mac.html (working copy) |
@@ -22,12 +22,12 @@ |
font-family: Helvetica, sans-serif; |
} |
table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(1), |
-table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(4), |
+table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(6), |
table.list#browserComparison tr.firstRow th:nth-child(1) { |
border-right: 1px solid #b5c6de; |
} |
table.list#memoryDetails tr:not([class*='firstRow']) > *:nth-child(2), |
-table.list#memoryDetails tr:not([class*='firstRow']) > *:nth-child(5), |
+table.list#memoryDetails tr:not([class*='firstRow']) > *:nth-child(7), |
table.list#memoryDetails tr.firstRow th:nth-child(2) { |
border-right: 1px solid #b5c6de; |
} |
@@ -135,11 +135,13 @@ |
<col class='name' /> |
<col class='number' /> |
<col class='number' /> |
+ <col class='number' /> |
+ <col class='number' /> |
</colgroup> |
<tr class='firstRow doNotFilter'> |
<th> |
</th> |
- <th colspan='2'> |
+ <th colspan='4'> |
Memory |
<div class='help'> |
<div> |
@@ -152,6 +154,16 @@ |
This is the best indicator of browser memory resource usage. |
</p> |
<p> |
+ <strong>Shared:</strong> |
+ Amount of memory that is present in physical RAM and can |
+ be shared with another process. |
+ </p> |
+ <p> |
+ <strong>Private:</strong> |
+ Amount of memory that is present in physical RAM and can not |
+ be shared with another process. |
+ </p> |
+ <p> |
<strong>Virtual:</strong> |
Amount of address space allocated in virtual memory. |
</p> |
@@ -167,10 +179,16 @@ |
<th class='name'> |
Browser |
</th> |
- <th class='name'> |
+ <th class='number'> |
Resident |
</th> |
<th class='number'> |
+ Shared |
Mark Mentovai
2011/01/04 20:09:31
What will the values in these columns look like if
sail
2011/01/06 19:48:26
If rshrd or rprvt aren't available then they'll be
|
+ </th> |
+ <th class='number'> |
+ Private |
+ </th> |
+ <th class='number'> |
Virtual |
</th> |
</tr> |
@@ -184,6 +202,12 @@ |
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> |
</td> |
<td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> |
</td> |
</tr> |
@@ -214,13 +238,15 @@ |
<col class='name' /> |
<col class='number' /> |
<col class='number' /> |
+ <col class='number' /> |
+ <col class='number' /> |
</colgroup> |
<tr class='firstRow doNotFilter'> |
<th> |
</th> |
<th> |
</th> |
- <th colspan='2'> |
+ <th colspan='4'> |
Memory |
</th> |
</tr> |
@@ -235,6 +261,12 @@ |
Resident |
</th> |
<th class='number'> |
+ Shared |
+ </th> |
+ <th class='number'> |
+ Private |
+ </th> |
+ <th class='number'> |
Virtual |
</th> |
</tr> |
@@ -252,6 +284,12 @@ |
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> |
</td> |
<td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> |
</td> |
</tr> |
@@ -269,6 +307,12 @@ |
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> |
</td> |
<td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
+ <span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> |
+ </td> |
+ <td class='number'> |
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> |
</td> |
</tr> |