Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge commit '9fcdf867588d69a5b5f2e9e8b7a4c2ad8181f4b9' into regress_…
…9fcdf867588d69a5b5f2e9e8b7a4c2ad8181f4b9
  • Loading branch information
tmeshkova committed Oct 13, 2014
2 parents 27647dd + 9fcdf86 commit d290f96
Show file tree
Hide file tree
Showing 2,271 changed files with 51,609 additions and 37,600 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1069071: IPDL changes require CLOBBER (second time around)
Bug 1080922 - Removal of a test manifest that the build system isn't picking up.
75 changes: 45 additions & 30 deletions b2g/chrome/content/devtools/hud.js
Expand Up @@ -56,8 +56,9 @@ let developerHUD = {
},

init: function dwp_init() {
if (this._client)
if (this._client) {
return;
}

if (!DebuggerServer.initialized) {
RemoteDebugger.initServer();
Expand Down Expand Up @@ -91,8 +92,9 @@ let developerHUD = {
},

uninit: function dwp_uninit() {
if (!this._client)
if (!this._client) {
return;
}

for (let frame of this._targets.keys()) {
this.untrackFrame(frame);
Expand All @@ -109,8 +111,9 @@ let developerHUD = {
* on an app frame.
*/
trackFrame: function dwp_trackFrame(frame) {
if (this._targets.has(frame))
if (this._targets.has(frame)) {
return;
}

DebuggerServer.connectToChild(this._conn, frame).then(actor => {
let target = new Target(frame, actor);
Expand Down Expand Up @@ -339,10 +342,10 @@ let consoleWatcher = {

if (pageError.warning || pageError.strict) {
metric.name = 'warnings';
output += 'warning (';
output += 'Warning (';
} else {
metric.name = 'errors';
output += 'error (';
output += 'Error (';
}

if (this._security.indexOf(pageError.category) > -1) {
Expand All @@ -359,12 +362,12 @@ let consoleWatcher = {

case 'error':
metric.name = 'errors';
output += 'error (console)';
output += 'Error (console)';
break;

case 'warn':
metric.name = 'warnings';
output += 'warning (console)';
output += 'Warning (console)';
break;

default:
Expand All @@ -378,7 +381,7 @@ let consoleWatcher = {
let {start, end, sourceURL, interruptible} = packet;
metric.interruptible = interruptible;
let duration = Math.round((end - start) * 100) / 100;
output += 'reflow: ' + duration + 'ms';
output += 'Reflow: ' + duration + 'ms';
if (sourceURL) {
output += ' ' + this.formatSourceURL(packet);
}
Expand Down Expand Up @@ -425,6 +428,7 @@ let eventLoopLagWatcher = {
if (this._active == value) {
return;
}

this._active = value;

// Toggle the state of existing fronts.
Expand All @@ -446,7 +450,7 @@ let eventLoopLagWatcher = {
this._fronts.set(target, front);

front.on('event-loop-lag', time => {
target.update({name: 'jank', value: time}, 'jank: ' + time + 'ms');
target.update({name: 'jank', value: time}, 'Jank: ' + time + 'ms');
});

if (this._active) {
Expand Down Expand Up @@ -500,7 +504,7 @@ let memoryWatcher = {

update: function mw_update() {
let watching = this._watching;
let active = watching.memory || watching.uss;
let active = watching.appmemory || watching.uss;

if (this._active) {
for (let target of this._fronts.keys()) {
Expand All @@ -519,10 +523,11 @@ let memoryWatcher = {
measure: function mw_measure(target) {
let watch = this._watching;
let front = this._fronts.get(target);
let format = this.formatMemory;

if (watch.uss) {
front.residentUnique().then(value => {
target.update({name: 'uss', value: value});
target.update({name: 'uss', value: value}, 'USS: ' + format(value));
}, err => {
console.error(err);
});
Expand All @@ -531,36 +536,46 @@ let memoryWatcher = {
if (watch.appmemory) {
front.measure().then(data => {
let total = 0;
if (watch.jsobjects) {
total += parseInt(data.jsObjectsSize);
}
if (watch.jsstrings) {
total += parseInt(data.jsStringsSize);
}
if (watch.jsother) {
total += parseInt(data.jsOtherSize);
}
if (watch.dom) {
total += parseInt(data.domSize);
}
if (watch.style) {
total += parseInt(data.styleSize);
}
if (watch.other) {
total += parseInt(data.otherSize);
let details = [];

function item(name, condition, value) {
if (!condition) {
return;
}

let v = parseInt(value);
total += v;
details.push(name + ': ' + format(v));
}

item('JS objects', watch.jsobjects, data.jsObjectsSize);
item('JS strings', watch.jsstrings, data.jsStringsSize);
item('JS other', watch.jsother, data.jsOtherSize);
item('DOM', watch.dom, data.domSize);
item('Style', watch.style, data.styleSize);
item('Other', watch.other, data.otherSize);
// TODO Also count images size (bug #976007).

target.update({name: 'memory', value: total});
target.update({name: 'memory', value: total},
'App Memory: ' + format(total) + ' (' + details.join(', ') + ')');
}, err => {
console.error(err);
});
}

let timer = setTimeout(() => this.measure(target), 500);
let timer = setTimeout(() => this.measure(target), 800);
this._timers.set(target, timer);
},

formatMemory: function mw_formatMemory(bytes) {
var prefix = ['','K','M','G','T','P','E','Z','Y'];
var i = 0;
for (; bytes > 1024 && i < prefix.length; ++i) {
bytes /= 1024;
}
return (Math.round(bytes * 100) / 100) + ' ' + prefix[i] + 'B';
},

trackTarget: function mw_trackTarget(target) {
target.register('uss');
target.register('memory');
Expand Down
8 changes: 4 additions & 4 deletions b2g/components/FilePicker.js
Expand Up @@ -181,7 +181,7 @@ FilePicker.prototype = {
}

// The name to be shown can be part of the message, or can be taken from
// the DOMFile (if the blob is a DOMFile).
// the File (if the blob is a File).
let name = data.result.name;
if (!name &&
(data.result.blob instanceof this.mParent.File) &&
Expand All @@ -207,9 +207,9 @@ FilePicker.prototype = {
}
}

let file = new this.mParent.File(data.result.blob,
{ name: name,
type: data.result.blob.type });
let file = new this.mParent.File([data.result.blob],
name,
{ type: data.result.blob.type });

if (file) {
this.fireSuccess(file);
Expand Down
6 changes: 3 additions & 3 deletions b2g/components/test/mochitest/test_filepicker_path.html
Expand Up @@ -67,7 +67,7 @@
},
fileName: 'test5.txt'},
// case 6: returns file without name. This case may fail because we
// need to make sure the DOMFile can be sent through
// need to make sure the File can be sent through
// sendAsyncMessage API.
{ pickedResult: { success: true,
result: {
Expand Down Expand Up @@ -96,7 +96,7 @@
break;
case 'file-picked-posted':
is(fileInput.value, activeTestCase.fileName,
'DOMFile should be able to send through message.');
'File should be able to send through message.');
processTestCase();
break;
}
Expand Down Expand Up @@ -127,4 +127,4 @@
</script>
<input type="file" id="fileInput">
</body>
</html>
</html>
8 changes: 4 additions & 4 deletions b2g/config/dolphin/sources.xml
Expand Up @@ -15,15 +15,15 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<!-- Stock Android things -->
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
Expand Down Expand Up @@ -133,7 +133,7 @@
<project name="platform/hardware/akm" path="hardware/akm" revision="6d3be412647b0eab0adff8a2768736cf4eb68039"/>
<project groups="invensense" name="platform/hardware/invensense" path="hardware/invensense" revision="e6d9ab28b4f4e7684f6c07874ee819c9ea0002a2"/>
<project name="platform/hardware/ril" path="hardware/ril" revision="865ce3b4a2ba0b3a31421ca671f4d6c5595f8690"/>
<project name="kernel/common" path="kernel" revision="f365109310138f85bb91884b7dee60f6f0da042d"/>
<project name="kernel/common" path="kernel" revision="310657b79caae2c89e6375a4185fe35fde089c39"/>
<project name="platform/system/core" path="system/core" revision="53d584d4a4b4316e4de9ee5f210d662f89b44e7e"/>
<project name="u-boot" path="u-boot" revision="982c1fd67b89d5573317c1796cf5b0143de44e8a"/>
<project name="vendor/sprd/gps" path="vendor/sprd/gps" revision="6974f8e771d4d8e910357a6739ab124768891e8f"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/emulator-ics/sources.xml
Expand Up @@ -19,13 +19,13 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c058843242068d0df7c107e09da31b53d2e08fa6"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
<project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/emulator-jb/sources.xml
Expand Up @@ -17,10 +17,10 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<!-- Stock Android things -->
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/emulator-kk/sources.xml
Expand Up @@ -15,15 +15,15 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<!-- Stock Android things -->
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/emulator/sources.xml
Expand Up @@ -19,13 +19,13 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c058843242068d0df7c107e09da31b53d2e08fa6"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
<project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/flame-kk/sources.xml
Expand Up @@ -15,15 +15,15 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<!-- Stock Android things -->
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/flame/sources.xml
Expand Up @@ -17,10 +17,10 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0bc74ce502672cf0265b24cf3a25d117c3de5e71"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5883a99b6528ced9dafaed8d3ca2405fb285537e"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="3b81896f04a02697e615fa5390086bd5ecfed84f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f9bc14c28aed7b2571e641bfeeca81876ec48ec"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ca2008ac50b163d31244ef9f036cb224f4f229b"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<!-- Stock Android things -->
Expand Down
2 changes: 1 addition & 1 deletion b2g/config/gaia.json
Expand Up @@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "8cad8de0f7b98963537f267151275caed62d5d30",
"revision": "98070bfac72f0695a2c792debac079eb26f3929d",
"repo_path": "/integration/gaia-central"
}

0 comments on commit d290f96

Please sign in to comment.