Ryan VanderMeulen
d0e2988561
Merge fx-team to m-c.
2013-12-18 21:19:33 -05:00
Nick Fitzgerald
d1c69daf69
Bug 929349 - Integrate a tracing debugger into our existing debugger; r=vporof,past
2013-12-18 14:17:27 -08:00
Nils Maier
ec65c8410d
Bug 950391 - Add nsIMemoryReporterManager.unregisterStrongReporter. r=njn
...
Also do not allow to register non-native components as weak reporters.
2013-12-18 13:00:03 -05:00
Carsten "Tomcat" Book
ba01aa3719
merge fx-team to mozilla-central
2013-12-18 15:47:44 +01:00
Michael Ratcliffe
8af158adc6
Bug 864098 - Add "Disable Cache" to options panel r=jwalker
...
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.html => browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.js => browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
2013-12-18 09:34:49 +00:00
Phil Ringnalda
dbd8549587
Back out 837203a4e076 (bug 949775) for xpcshell bustage
...
CLOSED TREE
2013-12-17 23:24:20 -08:00
Richard Newman
d8759c122a
Bug 949775 - UITelemetry should drop events on the floor if telemetry is disabled. r=mfinkle
2013-12-17 21:47:58 -08:00
Richard Newman
2f1ca0adf2
Backed out changeset c4921ed6aef3 (bug 949775)
2013-12-17 21:44:33 -08:00
Wes Kocher
8c8f5e1dcb
Merge m-c to fx-team
2013-12-17 21:21:30 -08:00
Wes Kocher
29915a0f83
merge inbound to m-c
2013-12-17 21:00:02 -08:00
Richard Newman
f7ed4956e1
Bug 949775 - UITelemetry should drop events on the floor if telemetry is disabled. r=mfinkle
2013-12-17 20:44:13 -08:00
Vladan Djeric
6eac86074a
Bug 937915: Restore DB filenames in Telemetry SlowSQL strings. r=dteller
2013-12-17 19:07:18 -05:00
Wes Kocher
482ecb10dd
Merge m-c to inbound
2013-12-17 21:23:18 -08:00
Ryan VanderMeulen
b6a2d4d7d5
Bug 945667 - Disable browser_findbar.js on Linux due to relying on browser_aboutHome.js.
2013-12-17 22:10:29 -05:00
Ryan VanderMeulen
4c8d52b7b6
Merge m-c to fx-team.
2013-12-17 16:23:55 -05:00
Peiyong Lin
a5486abf32
Bug 951202 - Change bindings declared with declareLazyFFI to be enumerable. r=Yoric
...
--HG--
extra : rebase_source : 1f5260a3a579f09d30203d010cceaba0cf22cc2e
2013-12-17 16:29:17 -05:00
Justin Dolske
8841ee6dad
Bug 946549 - Remove dead code obsoleted by bug 355063 for filling passwords on load. r=MattN
2013-12-16 13:27:47 -08:00
Carsten "Tomcat" Book
b966ec963c
Backed out changeset 812c5f165aca (bug 864098) for XPC Bustage on a CLOSED TREE
...
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.html => browser/devtools/framework/test/browser_toolbox_options_disablejs.html
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.js => browser/devtools/framework/test/browser_toolbox_options_disablejs.js
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html
2013-12-17 13:58:55 +01:00
Carsten "Tomcat" Book
ce9863c36e
merge mozilla-central to fx-team
2013-12-17 13:17:04 +01:00
Carsten "Tomcat" Book
53aa4a4479
merge fx-team to mozilla-central
2013-12-17 12:47:11 +01:00
Michael Ratcliffe
fc851c63c7
Bug 864098 - Add "Disable Cache" to options panel r=jwalker
...
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.html => browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.js => browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
2013-12-17 10:58:21 +00:00
Wes Kocher
f6e7cd0c87
Merge m-c to mozilla-inbound
2013-12-16 21:34:34 -08:00
Wes Kocher
56c7fcbb4e
Merge inbound to m-c
2013-12-16 21:33:31 -08:00
Shane Caraveo
c5597b6319
bug 935640 part 2 Australis, update social sidebar with new ux, activation panel, r=markh
2013-12-16 21:38:22 -08:00
Ryan VanderMeulen
c1ada276ac
Merge m-c to fx-team.
2013-12-16 17:00:19 -05:00
Ryan VanderMeulen
1037218183
Merge inbound to m-c.
2013-12-16 16:58:27 -05:00
Heather Arthur
5d4ec3539c
Bug 949678 - Rule view should show inline sheet links as 'inline:<lineno>' instead of '/:<lineno>' when source maps are enabled; r=pbrosset
2013-12-16 11:49:17 -08:00
Panos Astithas
fa291d77b5
Bug 773563 - Cleanup BTA_detach callers to avoid redundant state checks; r=robcee
2013-12-16 21:27:00 +02:00
Carsten "Tomcat" Book
8ff36a3e09
Merge mozilla-central to fx-team
2013-12-16 16:08:50 +01:00
Nick Alexander
709a4a7087
Bug 923950 - Fix Android single locale repacks. r=glandium
...
There are two parts to this. The first is to add AndroidManifest.xml
as a dependency to the "no dependencies" ap_ built during packaging.
The aapt call requires it. So "no dependencies" is more accurately
"no *resource* dependencies".
The second is to avoid including the Android res/ directory in the
language repack step. What happens is that the l10n.py script sees
the Android res/ files left in the dist/ directory after unpacking and
expects to find them in the objdir. They're not there, so the script
fails. To avoid this, we delete them after unpacking. See the
comments in packager.mk describing this process.
--HG--
extra : rebase_source : 35c3c125dddcd575c1a5e8ad58f9aa13ff2db4c3
2013-12-14 15:36:17 -08:00
Phil Ringnalda
abeca479be
Bug 934057 - Disable test_notifications_popup.html on Linux for constant failures
...
--HG--
extra : rebase_source : 1c585e1593ccfbcc5613ebe07aed594a0e8c762b
2013-12-15 21:17:52 -08:00
Phil Ringnalda
1ec93cb6e1
Back out 2412b1a7b97e (bug 863872) for Android xpcshell orange
2013-12-14 18:48:06 -08:00
Brian Grinstead
f9ce8121d8
Bug 950097 - [ruleview] Styles not being updated on some pages;r=paul
2013-12-13 13:17:23 -06:00
Peiyong Lin
ad799bb35f
Bug 943422 - Implement FileUtils.openAtomicFileOutputStream. r=Yoric
...
--HG--
extra : rebase_source : 054092dc72130bb4c60f48bb80a3ca0adfd42d45
2013-12-17 10:57:03 -05:00
Benjamin Smedberg
9bf97ff155
Bug 853973 - If a plugin is overlayed by other content on the page, then treat it as a hidden plugin: hide the overlay and present the infobar for click-to-play or crashed plugins, r=jaws
2013-12-17 10:53:32 -05:00
David Keeler
b4908bf345
bug 887321 - initial OCSP stapling telemetry r=briansmith
2013-12-16 09:32:16 -08:00
Jim Mathies
988b6f330d
Bug 950288 - Update the last run id when the browser launches so it's always up to date. r=bbondy
2013-12-16 11:06:08 -06:00
Nicholas Nethercote
12910b47d0
Bug 945973 (part 4) - Add SystemMemoryReporter, which presents Linux-specific, system-wide memory measurements taken from the OS. r=glandium.
...
--HG--
extra : rebase_source : 032d1d2944b790ac9e9e4d7f18c8ac9d79858ef3
2013-12-04 19:32:50 -08:00
Nicholas Nethercote
17667da00b
Bug 945973 (part 3) - Fix some trivial reporter/report confusions in aboutMemory.js. r=mccr8.
...
--HG--
extra : rebase_source : 12eec13cd507100fa29bf798372784d5d8bcfbdb
2013-12-03 20:20:15 -08:00
Nicholas Nethercote
da333f0919
Bug 945973 (part 2) - Don't complain if there aren't any "explicit" reports for a process. r=mccr8.
...
--HG--
extra : rebase_source : 05129260b8a3e7cfbdadcecffe4c18715254323c
2013-12-03 20:19:41 -08:00
Nicholas Nethercote
51c80b126d
Bug 945973 (part 1) - Remove about:memory's is-a-sentence description check. r=mccr8.
...
--HG--
extra : rebase_source : bf47145a953a23b73fa1e7c441b695ffeceafbb8
2013-12-03 20:10:59 -08:00
Carsten "Tomcat" Book
cd068df067
Merge mozilla-central to mozilla-inbound
2013-12-17 13:16:00 +01:00
Henri Sivonen
9279bd3c7e
Bug 949345 - Gather telemetry about non-default Cyrillic legacy encodings. r=emk,f=sstamm.
2013-12-17 12:47:25 +02:00
Bill McCloskey
f017507c0f
Bug 682048 - Change Firefox frame script handling to support anon/global scope (r=felipe)
2013-11-23 21:32:27 -08:00
Gregory Szorc
e396fc159d
Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium
...
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.
We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.
--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2013-12-10 16:18:11 +09:00
Benjamin Smedberg
899505a631
Bug 941137 followup - fix xpcshell test which expects the test plugin to be click-to-activate to actually set the state it desires.
2013-11-21 12:37:47 -05:00
Mike Conley
69acf97733
Bug 863872 - If we have overdue TelemetryPings, try to send them all. r=nfroyd, feedback=irving.
2013-12-14 15:30:00 -05:00
Mike Hommey
34b94bf852
Bug 949334 - Use FINAL_LIBRARY for webrtc. r=gps
2013-12-14 11:38:53 +09:00
Nathan Froyd
ae70372c81
Bug 932285 - part 3 - don't export comments to telemetry's string table; r=vladan
2013-12-06 15:18:48 -05:00
Nathan Froyd
2ba1838289
Bug 932285 - part 2 - convert nsITelemetry.registeredHistograms to a function returning an array; r=vladan
2013-12-13 12:56:11 -05:00