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 1243706 - Release PerformanceStats/PerformanceWatcher;r=Felipe

Browse Source 
MozReview-Commit-ID: 4XT21bfBSa9
This commit is contained in:
David Rajchenbach-Teller 2016-01-28 13:41:14 +01:00
parent 18e3b35f95
commit d8b434d3d6
9 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/installer/package-manifest.in
View File

@ -324,9 +324,7 @@
@RESPATH@/components/toolkit_formautofill.xpt
@RESPATH@/components/toolkit_osfile.xpt
@RESPATH@/components/toolkit_securityreporter.xpt
#ifdef NIGHTLY_BUILD
@RESPATH@/components/toolkit_perfmonitoring.xpt
#endif
@RESPATH@/components/toolkit_xulstore.xpt
@RESPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE

5
browser/base/content/browser.js
View File

@ -61,6 +61,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "gAboutNewTabService",
XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {
return Services.strings.createBundle('chrome://browser/locale/browser.properties');
});
XPCOMUtils.defineLazyModuleGetter(this, "AddonWatcher",
"resource://gre/modules/AddonWatcher.jsm");
const nsIWebNavigation = Ci.nsIWebNavigation;
@ -1348,6 +1350,9 @@ var gBrowserInit = {
SocialUI.init();
// Start monitoring slow add-ons
AddonWatcher.init();
// Telemetry for master-password - we do this after 5 seconds as it
// can cause IO if NSS/PSM has not already initialized.
setTimeout(() => {

1
browser/components/nsBrowserGlue.js
View File

@ -543,7 +543,6 @@ BrowserGlue.prototype = {
os.addObserver(this, "autocomplete-did-enter-text", false);
if (AppConstants.NIGHTLY_BUILD) {
AddonWatcher.init();
os.addObserver(this, AddonWatcher.TOPIC_SLOW_ADDON_DETECTED, false);
}

2
browser/installer/package-manifest.in
View File

@ -318,9 +318,7 @@
@RESPATH@/components/toolkit_formautofill.xpt
@RESPATH@/components/toolkit_osfile.xpt
@RESPATH@/components/toolkit_securityreporter.xpt
#ifdef NIGHTLY_BUILD
@RESPATH@/components/toolkit_perfmonitoring.xpt
#endif
@RESPATH@/components/toolkit_xulstore.xpt
@RESPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE

2
docshell/base/nsAboutRedirector.cpp
View File

@ -95,12 +95,10 @@ static RedirEntry kRedirMap[] = {
nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT
},
#ifdef NIGHTLY_BUILD
{
"performance", "chrome://global/content/aboutPerformance.xhtml",
nsIAboutModule::ALLOW_SCRIPT
},
#endif
{
"plugins", "chrome://global/content/plugins.html",
nsIAboutModule::URI_MUST_LOAD_IN_CHILD

4
js/src/vm/Interpreter.cpp
View File

@ -389,9 +389,9 @@ js::RunScript(JSContext* cx, RunState& state)
{
JS_CHECK_RECURSION(cx, return false);
#if defined(NIGHTLY_BUILD) && defined(MOZ_HAVE_RDTSC)
#if defined(MOZ_HAVE_RDTSC)
js::AutoStopwatch stopwatch(cx);
#endif // defined(NIGHTLY_BUILD) && defined(MOZ_HAVE_RDTSC)
#endif // defined(MOZ_HAVE_RDTSC)
SPSEntryMarker marker(cx->runtime(), state.script());

2
mobile/android/b2gdroid/installer/package-manifest.in
View File

@ -252,9 +252,7 @@
@BINPATH@/components/toolkit_formautofill.xpt
@BINPATH@/components/toolkit_osfile.xpt
@BINPATH@/components/toolkit_securityreporter.xpt
#ifdef NIGHTLY_BUILD
@BINPATH@/components/toolkit_perfmonitoring.xpt
#endif
@BINPATH@/components/toolkit_xulstore.xpt
@BINPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE

3
mobile/android/installer/package-manifest.in
View File

@ -1,3 +1,4 @@
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
@ -228,9 +229,7 @@
@BINPATH@/components/toolkit_formautofill.xpt
@BINPATH@/components/toolkit_osfile.xpt
@BINPATH@/components/toolkit_securityreporter.xpt
#ifdef NIGHTLY_BUILD
@BINPATH@/components/toolkit_perfmonitoring.xpt
#endif
@BINPATH@/components/toolkit_xulstore.xpt
@BINPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE

8
toolkit/components/moz.build
View File

@ -12,6 +12,7 @@ DIRS += [
'aboutcache',
'aboutcheckerboard',
'aboutmemory',
'aboutperformance',
'addoncompat',
'alerts',
'apppicker',
@ -39,6 +40,7 @@ DIRS += [
'parentalcontrols',
'passwordmgr',
'perf',
'perfmonitoring',
'places',
'privatebrowsing',
'processsingleton',
@ -98,12 +100,6 @@ DIRS += ['captivedetect']
if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
DIRS += ['terminator']
if CONFIG['NIGHTLY_BUILD']: # Bug 1136927 - Performance Monitoring is not ready for prime-time yet
DIRS += [
'aboutperformance',
'perfmonitoring',
]
DIRS += ['build']
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':