wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 760352 (part 3) - Preserve alignment on 100% values in about:memory. r=jlebar.

Browse Source 
--HG--
extra : rebase_source : 1ca1f3b003fba09699170f9697ce35190acfe4bd
This commit is contained in:
Nicholas Nethercote 2012-06-11 20:33:06 -07:00
parent 4c6045114c
commit 9347ac77a9
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolkit/components/aboutmemory/content/aboutMemory.js
View File

@ -1294,13 +1294,12 @@ function appendTreeElements(aP, aRoot, aProcess, aPadText)
// The percentage (omitted for single entries).
let percText;
if (!aT._isDegenerate) {
if (aT._amount === aRoot._amount) {
percText = " (100.0%)";
} else {
let num = 100 * aT._amount / aRoot._amount;
let numText = num.toFixed(2);
percText = (0 <= num && num < 10 ? " (0" : " (") + numText + "%)";
}
// Treat 0 / 0 as 100%.
let num = aRoot._amount === 0 ? 100 : (100 * aT._amount / aRoot._amount);
let numText = num.toFixed(2);
percText = numText === "100.00"
? " (100.0%)"
: (0 <= num && num < 10 ? " (0" : " (") + numText + "%)";
appendElementWithText(d, "span", "mrPerc", percText);
}

20
toolkit/components/aboutmemory/tests/test_aboutmemory.xul
View File

@ -92,6 +92,12 @@
f2("", "other3/a/b/c/d/f", OTHER, PERCENTAGE, 10),
f2("", "other3/a/b/c/d/g", OTHER, PERCENTAGE, 5),
f2("", "other3/a/b/c/d/g", OTHER, PERCENTAGE, 5),
// Check that a rounded-up-to-100.00% value is shown as "100.0%" (i.e. one
// decimal point).
f2("", "other6/big", OTHER, COUNT, 99999),
f2("", "other6/small", OTHER, COUNT, 1),
// Check that a 0 / 0 is handled correctly.
f("", "other7/zero", OTHER, 0),
// These compartments ones shouldn't be displayed.
f2("", "compartments/user/foo", OTHER, COUNT, 1),
f2("", "compartments/system/foo", OTHER, COUNT, 1)
@ -277,6 +283,13 @@ Other Measurements\n\
├──20.00% (99.01%) ── e\n\
└───0.20% (00.99%) ++ (2 tiny)\n\
\n\
100,000 (100.0%) -- other6\n\
├───99,999 (100.0%) ── big\n\
└────────1 (00.00%) ── small\n\
\n\
0.00 MB (100.0%) -- other7\n\
└──0.00 MB (100.0%) ── zero\n\
\n\
888.00 MB ── explicit\n\
500.00 MB ── heap-allocated\n\
100.00 MB ── heap-unallocated\n\
@ -429,6 +442,13 @@ Other Measurements\n\
├───0.10% (00.50%) ── f\n\
└───0.10% (00.50%) ── g [2]\n\
\n\
100,000 (100.0%) -- other6\n\
├───99,999 (100.0%) ── big\n\
└────────1 (00.00%) ── small\n\
\n\
0 B (100.0%) -- other7\n\
└──0 B (100.0%) ── zero\n\
\n\
931,135,488 B ── explicit\n\
524,288,000 B ── heap-allocated\n\
104,857,600 B ── heap-unallocated\n\