Merge latest green inbound changeset to mozilla-central
authorEd Morley <emorley@mozilla.com>
Wed, 20 Mar 2013 11:46:01 +0000
changeset 125575 1d6fe70c79c5
parent 125574 26653529ea8b (current diff)
parent 125447 0bba6ba92467 (diff)
child 125586 4caaa0bc587d
child 125609 1ebe2c99c1e4
child 127434 e5978106c61a
push id24459
push useremorley@mozilla.com
push date2013-03-20 11:46 +0000
treeherdermozilla-central@1d6fe70c79c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone22.0a1
first release with
nightly linux32
1d6fe70c79c5 / 22.0a1 / 20130321030940 / files
nightly linux64
1d6fe70c79c5 / 22.0a1 / 20130321030940 / files
nightly mac
1d6fe70c79c5 / 22.0a1 / 20130321030940 / files
nightly win32
1d6fe70c79c5 / 22.0a1 / 20130321030940 / files
nightly win64
1d6fe70c79c5 / 22.0a1 / 20130321030940 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge latest green inbound changeset to mozilla-central
--- a/browser/devtools/framework/ToolDefinitions.jsm
+++ b/browser/devtools/framework/ToolDefinitions.jsm
@@ -144,17 +144,17 @@ let styleEditorDefinition = {
   }
 };
 
 let profilerDefinition = {
   id: "jsprofiler",
   accesskey: l10n("profiler.accesskey", profilerStrings),
   key: l10n("profiler.commandkey", profilerStrings),
   ordinal: 4,
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  modifiers: "shift",
   killswitch: "devtools.profiler.enabled",
   url: "chrome://browser/content/profiler.xul",
   label: l10n("profiler.label", profilerStrings),
   icon: "chrome://browser/skin/devtools/tool-profiler.png",
   tooltip: l10n("profiler.tooltip", profilerStrings),
 
   isTargetSupported: function (target) {
     return true;
--- a/browser/devtools/profiler/test/browser_profiler_run.js
+++ b/browser/devtools/profiler/test/browser_profiler_run.js
@@ -49,17 +49,17 @@ function testUI() {
 
 function onStart() {
   gPanel.controller.isActive(function (err, isActive) {
     ok(isActive, "Profiler is running");
 
     let [win, doc] = getProfileInternals();
     let stopButton = doc.querySelector(".controlPane #stopWrapper button");
 
-    stopButton.click();
+    setTimeout(function () stopButton.click(), 100);
   });
 }
 
 function onStop() {
   gPanel.controller.isActive(function (err, isActive) {
     ok(!isActive, "Profiler is idle");
     attemptTearDown();
   });
@@ -70,18 +70,14 @@ function onParsed() {
     let [win,doc] = getProfileInternals();
     let sample = doc.getElementsByClassName("samplePercentage");
 
     if (sample.length <= 0) {
       return void setTimeout(assertSample, 100);
     }
 
     ok(sample.length > 0, "We have some items displayed");
-    if (navigator.platform.contains("Win")) {
-      todo(false, "First percentage is 100%: Disabled on Windows for intermittent failures, see bug 822287.");
-    } else {
-      is(sample[0].innerHTML, "100.0%", "First percentage is 100%");
-    }
+    is(sample[0].innerHTML, "100.0%", "First percentage is 100%");
     attemptTearDown();
   }
 
   assertSample();
 }
--- a/browser/locales/en-US/chrome/browser/devtools/profiler.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/profiler.properties
@@ -12,17 +12,17 @@
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Profiler
 
 # LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey=Y
+profiler.commandkey=VK_F5
 profiler.accesskey=P
 
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip=Profiler
 
 # LOCALIZATION NOTE (profiler.profileName):
@@ -76,9 +76,9 @@ profiler.stop=Stop
 # LOCALIZATION NOTE (profiler.loading)
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading=Loading profileā€¦
 
 # LOCALIZATION NOTE (profiler.alreadyRunning)
 # This string is displayed in the profiler whenever there is already
 # another running profile. Users can run only one profile at a time.
-profiler.alreadyRunning=Profiler is already running. If you want to run this profile stop Profile %S first.
\ No newline at end of file
+profiler.alreadyRunning=Profiler is already running. If you want to run this profile stop Profile %S first.
--- a/build/valgrind/cross-architecture.sup
+++ b/build/valgrind/cross-architecture.sup
@@ -62,17 +62,17 @@
    fun:_ZN3xpc18CreateGlobalObjectEP9JSContextP7JSClassP12nsIPrincipalbPP8JSObjectPP13JSCompartment
    ...
 }
 {
    Bug 793533 (all 64-bit systems)
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
-   fun:_ZN3xpc18CreateGlobalObjectEP9JSContextP7JSClassP12nsIPrincipal
+   fun:_ZN3xpc18CreateGlobalObjectEP9JSContextP7JSClassP12nsIPrincipalm
    ...
 }
 {
    Bug 793536 (all 64-bit systems)
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
    fun:_ZNSt11_Deque_baseIN11MessageLoop11PendingTaskESaIS1_EE17_M_initialize_mapEm
@@ -198,16 +198,24 @@
    Bug 794372
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
    fun:_ZN22nsComponentManagerImpl16RegisterCIDEntryEPKN7mozilla6Module8CIDEntryEPNS_11KnownModuleE
    ...
 }
 {
+   Bug 794372
+   Memcheck:Leak
+   fun:malloc
+   fun:moz_xmalloc
+   fun:_ZN22nsComponentManagerImpl22RegisterCIDEntryLockedEPKN7mozilla6Module8CIDEntryEPNS_11KnownModuleE
+   ...
+}
+{
    Bug 794374
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
    fun:_ZN22nsComponentManagerImpl17ManifestComponentERNS_25ManifestProcessingContextEiPKPc
    ...
 }
 {