Skip to content

GitLab

T
tangled
Commit ddea461b authored by peria@chromium.org's avatar peria@chromium.org
Browse files
Options

Add a note to describe that chrome://memory does not count 

plug-ins' memory for other browsers, when other browsers run.


BUG=273316
NOTRY=true

Review URL: https://codereview.chromium.org/38533006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233495 0039d316-1c4b-4281-b951-d872f2087c98
parent 9b9fa679
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 241 deletions
chrome/browser/resources/about_memory.html
View file @ ddea461b
This diff is collapsed.
chrome/browser/resources/about_memory_linux.html
View file @ ddea461b
...@@ -16,7 +16,7 @@ about:memory template page ...@@ -16,7 +16,7 @@ about:memory template page
<script src="chrome://memory-redirect/strings.js"></script> <script src="chrome://memory-redirect/strings.js"></script>
</head> </head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id='header'> <div id="header">
<h1> <h1>
About memory About memory
</h1> </h1>
...@@ -25,28 +25,28 @@ about:memory template page ...@@ -25,28 +25,28 @@ about:memory template page
</p> </p>
</div> </div>
<div id='content'> <div id="content">
<h2> <h2>
Summary Summary
<div class='help'> <div class="help">
<div> <div>
<p class='summary-desc' i18n-values=".innerHTML:summary_desc"></p> <p class="summary-desc" i18n-values=".innerHTML:summary_desc"></p>
</div> </div>
</div> </div>
</h2> </h2>
<table class='list' id='browserComparison'> <table class="list" id="browserComparison">
<colgroup> <colgroup>
<col class='name'> <col class="name">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
</colgroup> </colgroup>
<tr class='firstRow doNotFilter'> <tr class="firstRow doNotFilter">
<th> <th>
</th> </th>
<th colspan='2'> <th colspan="2">
Memory Memory
<div class='help'> <div class="help">
<div> <div>
<p> <p>
<strong>Memory</strong> <strong>Memory</strong>
...@@ -69,41 +69,46 @@ about:memory template page ...@@ -69,41 +69,46 @@ about:memory template page
</div> </div>
</th> </th>
</tr> </tr>
<tr class='secondRow doNotFilter'> <tr class="secondRow doNotFilter">
<th class='name'> <th class="name">
Browser Browser
</th> </th>
<th class='name'> <th class="name">
Private Private
</th> </th>
<th class='number'> <th class="number">
Proportional Proportional
</th> </th>
</tr> </tr>
<tr jsselect="browsers"> <tr jsselect="browsers">
<td class='name'> <td class="name">
<div> <div>
<strong jscontent="name"></strong> <span jscontent="version"></span> <strong jscontent="name"></strong> <span jscontent="version"></span>
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
</table> </table>
<div class=otherbrowsers jsdisplay="show_other_browsers && browsers.length == 1"> <div class="otherbrowsers"
Note: If other browsers (e.g. IE, Firefox, Safari) are running, jsdisplay="show_other_browsers && browsers.length == 1">
I'll show their memory details here. Note: This page will show memory use for all running browsers,
not just Chrome.
</div>
<div class="otherbrowsers"
jsdisplay="show_other_browsers && browsers.length > 1">
Note: Chrome includes memory used by plug-ins, other browsers may not.
</div> </div>
<br><br><br > <br><br><br>
<h2> <h2>
Processes Processes
<div class='help'> <div class="help">
<div> <div>
<p> <p>
Details of memory usage for each of Chromium's processes. Details of memory usage for each of Chromium's processes.
...@@ -112,85 +117,85 @@ about:memory template page ...@@ -112,85 +117,85 @@ about:memory template page
</div> </div>
</h2> </h2>
<table class='list' id='memoryDetails'> <table class="list" id="memoryDetails">
<colgroup> <colgroup>
<col class='pid'> <col class="pid">
<col class='name' > <col class="name" >
<col class='number'> <col class="number">
<col class='number'> <col class="number">
</colgroup> </colgroup>
<tr class='firstRow doNotFilter'> <tr class="firstRow doNotFilter">
<th> <th>
</th> </th>
<th> <th>
</th> </th>
<th colspan='2'> <th colspan="2">
Memory Memory
</th> </th>
</tr> </tr>
<tr class='secondRow doNotFilter'> <tr class="secondRow doNotFilter">
<th class='pid'> <th class="pid">
PID PID
</th> </th>
<th class='name'> <th class="name">
Name Name
</th> </th>
<th class='number'> <th class="number">
Private Private
</th> </th>
<th class='number'> <th class="number">
Proportional Proportional
</th> </th>
</tr> </tr>
<tr jsselect="browzr_data"> <tr jsselect="browzr_data">
<td class='pid'> <td class="pid">
<span class='th' jscontent="pid"></span> <span class="th" jscontent="pid"></span>
</td> </td>
<td class='name'> <td class="name">
<div> <div>
Browser Browser
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jseval="addToSum('tot_ws_priv', $this.ws_priv)" jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jseval="addToSum("tot_ws_priv", $this.ws_priv)" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
<tr jsselect="child_data"> <tr jsselect="child_data">
<td class='pid'> <td class="pid">
<span class='th' jscontent="pid"></span> <span class="th" jscontent="pid"></span>
</td> </td>
<td class='name'> <td class="name">
<div jscontent="child_name"></div> <div jscontent="child_name"></div>
<div jsselect="titles"> <div jsselect="titles">
<span jscontent="$this"></span><br> <span jscontent="$this"></span><br>
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jseval="addToSum('tot_ws_priv', $this.ws_priv)" jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jseval="addToSum("tot_ws_priv", $this.ws_priv)" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
<tr class='total doNotFilter'> <tr class="total doNotFilter">
<td class='pid'> <td class="pid">
</td> </td>
<td class='name'> <td class="name">
&Sigma; &Sigma;
</td> </td>
<td class='number'> <td class="number">
<span class='th' id="tot_ws_priv">0</span><span class='k'>k</span> <span class="th" id="tot_ws_priv">0</span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
</td> </td>
</tr> </tr>
<tr class='noResults'> <tr class="noResults">
<td colspan='99'> <td colspan="99">
No results found. No results found.
</td> </td>
</tr> </tr>
......
chrome/browser/resources/about_memory_mac.html
View file @ ddea461b
...@@ -33,7 +33,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -33,7 +33,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
<script src="chrome://memory-redirect/strings.js"></script> <script src="chrome://memory-redirect/strings.js"></script>
</head> </head>
<body> <body>
<div id='header'> <div id="header">
<h1> <h1>
About memory About memory
</h1> </h1>
...@@ -42,10 +42,10 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -42,10 +42,10 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
</p> </p>
</div> </div>
<div id='content'> <div id="content">
<h2> <h2>
Summary Summary
<div class='help'> <div class="help">
<div> <div>
<p> <p>
Summary of memory used by currently active browsers.<p> Summary of memory used by currently active browsers.<p>
...@@ -56,20 +56,20 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -56,20 +56,20 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
</div> </div>
</h2> </h2>
<table class='list' id='browserComparison'> <table class="list" id="browserComparison">
<colgroup> <colgroup>
<col class='name'> <col class="name">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
</colgroup> </colgroup>
<tr class='firstRow doNotFilter'> <tr class="firstRow doNotFilter">
<th> <th>
</th> </th>
<th colspan='4'> <th colspan="4">
Memory Memory
<div class='help'> <div class="help">
<div> <div>
<p> <p>
<strong>Memory</strong> <strong>Memory</strong>
...@@ -101,45 +101,49 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -101,45 +101,49 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
</div> </div>
</th> </th>
</tr> </tr>
<tr class='secondRow doNotFilter'> <tr class="secondRow doNotFilter">
<th class='name'> <th class="name">
Browser Browser
</th> </th>
<th class='number'> <th class="number">
Resident Resident
</th> </th>
<th class='number'> <th class="number">
Shared Shared
</th> </th>
<th class='number'> <th class="number">
Private Private
</th> </th>
<th class='number'> <th class="number">
Virtual Virtual
</th> </th>
</tr> </tr>
<tr jsselect="browsers"> <tr jsselect="browsers">
<td class='name'> <td class="name">
<div> <div>
<strong jscontent="name"></strong> <span jscontent="version"></span> <strong jscontent="name"></strong> <span jscontent="version"></span>
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shareable)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(comm_priv)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
</table> </table>
<div class=otherbrowsers jsdisplay="browsers.length == 1"> <div class="otherbrowsers" jsdisplay="browsers.length == 1">
Note: If other browsers (e.g., Safari, Firefox, Camino) are running, I'll show their memory details here. Note: This page will show memory use for all running browsers,
not just Chrome.
</div>
<div class="otherbrowsers" jsdisplay="browsers.length > 1">
Note: Chrome includes memory used by plug-ins, other browsers may not.
</div> </div>
<div class="otherbrowsers"> <div class="otherbrowsers">
(Bug: We seriously overcount our own memory usage: <a href="http://crbug.com/25454">Issue 25454</a>.) (Bug: We seriously overcount our own memory usage: <a href="http://crbug.com/25454">Issue 25454</a>.)
...@@ -149,7 +153,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -149,7 +153,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
<h2> <h2>
Processes Processes
<div class='help'> <div class="help">
<div> <div>
<p> <p>
Details of memory usage for each of Chromium's processes. Details of memory usage for each of Chromium's processes.
...@@ -158,93 +162,93 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { ...@@ -158,93 +162,93 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) {
</div> </div>
</h2> </h2>
<table class='list' id='memoryDetails'> <table class="list" id="memoryDetails">
<colgroup> <colgroup>
<col class='pid'> <col class="pid">
<col class='name'> <col class="name">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
<col class='number'> <col class="number">
</colgroup> </colgroup>
<tr class='firstRow doNotFilter'> <tr class="firstRow doNotFilter">
<th> <th>
</th> </th>
<th> <th>
</th> </th>
<th colspan='4'> <th colspan="4">
Memory Memory
</th> </th>
</tr> </tr>
<tr class='secondRow doNotFilter'> <tr class="secondRow doNotFilter">
<th class='pid'> <th class="pid">
PID PID
</th> </th>
<th class='name'> <th class="name">
Name Name
</th> </th>
<th class='number'> <th class="number">
Resident Resident
</th> </th>
<th class='number'> <th class="number">
Shared Shared
</th> </th>
<th class='number'> <th class="number">
Private Private
</th> </th>
<th class='number'> <th class="number">
Virtual Virtual
</th> </th>
</tr> </tr>
<tr jsselect="browzr_data"> <tr jsselect="browzr_data">
<td class='pid'> <td class="pid">
<span class='th' jscontent="pid"></span> <span class="th" jscontent="pid"></span>
</td> </td>
<td class='name'> <td class="name">
<div> <div>
Browser Browser
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shareable)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(comm_priv)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
<tr jsselect="child_data"> <tr jsselect="child_data">
<td class='pid'> <td class="pid">
<span class='th' jscontent="pid"></span> <span class="th" jscontent="pid"></span>
</td> </td>
<td class='name'> <td class="name">
<div jscontent="child_name"></div> <div jscontent="child_name"></div>
<div jsselect="titles"> <div jsselect="titles">
<span jscontent="$this"></span><br> <span jscontent="$this"></span><br>
</div> </div>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shareable)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shareable)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_shared)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_shared)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(ws_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(ws_priv)"></span><span class="k">k</span>
</td> </td>
<td class='number'> <td class="number">
<span class='th' jscontent="formatNumber(comm_priv)"></span><span class='k'>k</span> <span class="th" jscontent="formatNumber(comm_priv)"></span><span class="k">k</span>
</td> </td>
</tr> </tr>
<tr class='noResults'> <tr class="noResults">
<td colspan='99'> <td colspan="99">
No results found. No results found.
</td> </td>
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment