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

Merge b2ginbound to central, a=merge

Browse Source
This commit is contained in:
Wes Kocher 2015-10-26 13:30:14 -07:00
commit 89c474876b
14 changed files with 76 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
b2g/chrome/content/devtools/hud.js
View File

@ -836,7 +836,8 @@ var performanceEntriesWatcher = {
target._logHistogram({name: eventName, value: time});
memoryWatcher.front(target).residentUnique().then(value => {
eventName = 'app_memory_' + name;
// bug 1215277, need 'v2' for app-memory histograms
eventName = 'app_memory_' + name + '_v2';
target._logHistogram({name: eventName, value: value});
}, err => {
console.error(err);

2
b2g/config/aries/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>

2
b2g/config/dolphin/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<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="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="3b9a47b517d345b8d98bc7f787b9a6c2f51ca75d"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<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="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>

2
b2g/config/flame-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>

4
b2g/config/gaia.json
View File

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "a677ddd3aa3a81058775938bd56008d96dbc78b0",
"git_revision": "b564b21e08ffc3e4962f08850843c7482932ee7b",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "528ec89f18aaf8b5b4b7c52249fdc62bf470ef41",
"revision": "bc907981bd62560e8d0079244bdc32b1dfe98e36",
"repo_path": "integration/gaia-central"
}

2
b2g/config/nexus-4-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>

2
b2g/config/nexus-4/sources.xml
View File

@ -18,7 +18,7 @@
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="3b9a47b517d345b8d98bc7f787b9a6c2f51ca75d"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>

2
b2g/config/nexus-5-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="a677ddd3aa3a81058775938bd56008d96dbc78b0"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b564b21e08ffc3e4962f08850843c7482932ee7b"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="956700d9754349b630a34551750ae6353614b6aa"/>

102
toolkit/components/telemetry/Histograms.json
View File

@ -9126,7 +9126,8 @@
"description": "Reports whether the graphics sanity test passed an OS snapshot test. 0=Pass, 1=Fail, 2=Error, 3=Timed out."
},
"DEVTOOLS_HUD_JANK": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "exponential",
"keyed": "true",
"description": "The duration which a thread is blocked in ms, keyed by appName.",
@ -9134,7 +9135,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_REFLOW_DURATION": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "exponential",
"keyed": "true",
"description": "The duration a reflow takes in ms, keyed by appName.",
@ -9142,32 +9144,37 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_REFLOWS": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "count",
"keyed": "true",
"description": "A count of the number of reflows, keyed by appName."
},
"DEVTOOLS_HUD_SECURITY_CATEGORY": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "enumerated",
"keyed": "true",
"description": "The security error enums, keyed by appName.",
"n_values": 8
},
"DEVTOOLS_HUD_ERRORS": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "count",
"keyed": "true",
"description": "Number of errors, keyed by appName."
},
"DEVTOOLS_HUD_WARNINGS": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "count",
"keyed": "true",
"description": "Number of warnings, keyed by appName."
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_CONTENTINTERACTIVE": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'contentInteractive' performance mark, keyed by appName.",
@ -9175,7 +9182,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONINTERACTIVE": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'navigationInteractive' performance mark, keyed by appName.",
@ -9183,7 +9191,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONLOADED": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'navigationLoaded' performance mark, keyed by appName.",
@ -9191,7 +9200,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_VISUALLYLOADED": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'visuallyLoaded' performance mark, keyed by appName.",
@ -9199,7 +9209,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_MEDIAENUMERATED": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'mediaEnumerated' performance mark, keyed by appName.",
@ -9207,7 +9218,8 @@
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_FULLYLOADED": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'fullyLoaded' performance mark, keyed by appName.",
@ -9215,74 +9227,82 @@
"n_buckets": 30
},
"DEVTOOLS_HUD_APP_STARTUP_TIME_SCANEND": {
"expires_in_version": "never",
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The duration in ms between application launch and the 'scanEnd' performance mark, keyed by appName.",
"high": "30000",
"n_buckets": 30
},
"DEVTOOLS_HUD_APP_MEMORY_CONTENTINTERACTIVE": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_CONTENTINTERACTIVE_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'contentInteractive' performance mark, keyed by appName.",
"low": "2000000",
"high": "3000000",
"low": "20000000",
"high": "30000000",
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONINTERACTIVE": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONINTERACTIVE_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'navigationInteractive' performance mark, keyed by appName.",
"low": "2000000",
"high": "3000000",
"low": "20000000",
"high": "30000000",
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONLOADED": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONLOADED_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'navigationLoaded' performance mark, keyed by appName.",
"low": "2000000",
"high": "3000000",
"low": "20000000",
"high": "30000000",
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_MEMORY_VISUALLYLOADED": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_VISUALLYLOADED_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'visuallyLoaded' performance mark, keyed by appName.",
"low": "2000000",
"high": "3000000",
"low": "20000000",
"high": "30000000",
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_MEMORY_MEDIAENUMERATED": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_MEDIAENUMERATED_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'mediaEnumerated' performance mark, keyed by appName.",
"low": "2000000",
"high": "3000000",
"low": "20000000",
"high": "40000000",
"n_buckets": 10
},
"DEVTOOLS_HUD_APP_MEMORY_FULLYLOADED": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_FULLYLOADED_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'fullyLoaded' performance mark, keyed by appName.",
"low": "2000000",
"high": "4000000",
"low": "20000000",
"high": "40000000",
"n_buckets": 20
},
"DEVTOOLS_HUD_APP_MEMORY_SCANEND": {
"expires_in_version": "never",
"DEVTOOLS_HUD_APP_MEMORY_SCANEND_V2": {
"alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
"expires_in_version": "52",
"kind": "linear",
"keyed": "true",
"description": "The USS memory consumed by an application at the time of the 'scanEnd' performance mark, keyed by appName.",
"low": "2000000",
"high": "4000000",
"low": "20000000",
"high": "40000000",
"n_buckets": 20
},
"GRAPHICS_SANITY_TEST_REASON": {