Commit Graph

20586 Commits

Author SHA1 Message Date
Benoit Jacob
91957db779 Back out csets 56ba52f28300, f6016481c7f2, 94b064ee68b2 (bug 1033841 and bug 1033965) for xpcshell test failures 2014-07-04 13:34:25 -04:00
Mark Banner
e8f218d708 Bug 1033965 Remove unnecessary licenses for Loop libraries removed in bug 1020876. r=gerv 2014-07-04 17:08:55 +01:00
Jacek Caban
aa6feee34d Bug 1022847 - Fixed --enable-metro build.
--HG--
extra : rebase_source : ac9e1609d5dd2211b819083a88dad6e26d2c6479
2014-07-10 15:15:10 +02:00
Carsten "Tomcat" Book
7b33d694c5 Merge mozilla-central to fx-team 2014-07-04 14:11:06 +02:00
Carsten "Tomcat" Book
6879f4ea48 merge b2g-inbound to mozilla-central a=merge 2014-07-04 14:01:37 +02:00
Carsten "Tomcat" Book
6d16b603ce merge fx-team to mozilla-central a=merge 2014-07-04 13:51:22 +02:00
Panos Astithas
a9b0919286 Bug 1034525 - EventEmitter.prototype.logEvent should correctly log filenames that have simple URLs. r=vporof
--HG--
extra : rebase_source : aed9fffb2eabc98feb48e18ff8181c4c80fd34d8
2014-07-04 12:47:45 +03:00
Sam Penrose
2b55741f5a Bug 1034229 - Fire oncancel() when passed to request() with refreshAuthentication. r=jedp 2014-07-03 13:23:12 -07:00
Bernardo P. Rittmeyer
d393d66578 Bug 524760 - Hide print.macosx.pagesetup* preference from about:support as it's not useful there. r=MattN 2014-07-03 11:26:00 +02:00
Martin Thomson
a922faaff0 Bug 1019117 - Remove ssltunnel from NO_PKG_FILES conditional on having no manifest r=glandium 2014-07-03 10:46:00 +02:00
J. Ryan Stinnett
3a0e90a615 Bug 1032708 - Restart discovery when network changes. r=paul 2014-07-02 12:48:00 +02:00
J. Ryan Stinnett
53627c1499 Bug 1027456 - Use assigned multicast address for discovery. r=paul 2014-07-02 12:56:00 +02:00
Jordan Santell
5bd26fe5f5 Bug 986705 - Implement web audio server events for connecting to an AudioParam in the web audio editor. r=vp 2014-07-02 12:37:00 +02:00
Richard Newman
eae3673f45 Bug 1013024 - Part 1: catch install intent and deliver it to the distribution handler, processing the distribution file dynamically. r=mfinkle 2014-07-03 19:45:24 -07:00
Steven MacLeod
cf1bacee7b Bug 994707 - Write crash submission events. r=ted
--HG--
extra : rebase_source : 11f614bdb0c8f6bf63ddc937957b89b7184eaad9
2014-07-03 14:54:54 -04:00
Steven MacLeod
84d99bb465 Bug 994707 - Introduce crash submission events and handle them. r=bsmedberg
This introduces a new crash event type for submissions and handles
them in the Crash Manager. These crash submissions will also be counted
in FHR.

--HG--
extra : rebase_source : c37fc86cecc86aea0afdd8cfa7b31295aad3d6f8
2014-07-03 14:04:28 -04:00
Steven MacLeod
84220f1db5 Bug 994707 - Provide the crash events path as an environment variable for the crashreporter. r=ted
--HG--
extra : rebase_source : 96388b73c887a71fae9039a071e4733c9302eb61
2014-07-03 17:51:08 -04:00
Ryan VanderMeulen
a810acce78 Backed out changeset f007a1c34042 (bug 1005870) for mochitest-dt leaks. 2014-07-03 13:43:15 -04:00
Robert Strong
481f80a119 test only followup to Bug 1032559 - Fix for mochitest-chrome slow download mar tests fail when the app.update.download.backgroundInterval pref is 0. r=me 2014-07-03 10:19:31 -07:00
Richard Marti
42baca6391 Bug 1033570 - Correct the close-icon size also on in-content dialogs. r=dolske 2014-07-02 21:08:28 +02:00
David Rajchenbach-Teller
2e1b95bb0b Bug 1005870 - Add a copy() command to the console. r=robcee 2014-07-03 06:40:00 -04:00
Gijs Kruitbosch
d5721106ac Bug 1033568 - add pref for customizeToolbars security check, r=dao 2014-07-03 00:14:07 +01:00
Carsten "Tomcat" Book
d93074d010 Backed out changeset afdb479e6427 (bug 966895) for causing Bug 1034015 2014-07-03 14:40:34 +02:00
Carsten "Tomcat" Book
6cbc1d089e Merge mozilla-central to fx-team 2014-07-03 14:28:45 +02:00
Carsten "Tomcat" Book
27ead41013 merge fx-team to mozilla-central a=merge 2014-07-03 13:54:51 +02:00
Patrick Brosset
1b822cb22c Bug 711941 - part 1 - Cubic-bezier widget; r=harth r=gerv 2014-07-03 12:49:16 +02:00
Blair McBride
9ce46da743 Bug 1026853 - Experiment is displayed as "pending removal" in detailed view. r=irving 2014-07-03 16:19:58 +12:00
Wes Kocher
2e0c891a60 Merge fx-team to m-c a=merge 2014-07-02 17:24:00 -07:00
Chris Peterson
efdb483353 Bug 1032644 - Fix some -Wunused warnings in non-unified OS X build. r=ehsan 2014-07-02 18:55:19 -07:00
Wes Kocher
20f50977c0 Merge m-c to inbound 2014-07-02 17:44:20 -07:00
Patrick Brosset
e3cf78711c Bug 1026395 - Avoid unhandled rejected promise in browser_ruleview_edit-property-increments.js. r=jwalker 2014-07-02 04:39:00 -04:00
Carsten "Tomcat" Book
5541b15ad8 Merge mozilla-central to fx-team 2014-07-02 15:11:39 +02:00
Carsten "Tomcat" Book
536c8c08bc merge fx-team to mozilla-central a=merge
--HG--
extra : amend_source : 6b1927dd9d7d8eedfc694b66e8aceb7c3fc24935
2014-07-02 15:00:10 +02:00
Gijs Kruitbosch
d8e39296ea Bug 1018154 - part 1: replace blocking of security principal inheriting with onpaste handler, r=dao 2014-07-01 15:27:08 +01:00
J. Ryan Stinnett
fc1a822b92 Bug 1032646 - Record discovery replies to avoid purging every time. r=paul 2014-06-30 21:00:00 +02:00
Jordan Santell
657540dbb0 Bug 1015665 - Do not store function calls in CallWatcherActor unless needed. r=vp 2014-07-01 14:25:00 +02:00
Jan Keromnes
801c5847fb Bug 1009312 - Remove duplicate calls to addActorPool. r=dcamp 2014-07-02 10:46:00 +02:00
Heather Arthur
b332f91a1e Bug 1031351 - Don't prettify CSS source if it has more than one line per rule. r=jwalker 2014-06-30 18:13:00 +02:00
Jordan Santell
c20d5322c2 Bug 978964 - Display combined bitmask values in the canvas debugger. r=vp 2014-06-30 14:12:00 +02:00
Wes Kocher
1aab6279bd Backed out changeset d87da7f7a3a9 (bug 693555) for android and b2g build bustage 2014-07-01 15:50:08 -07:00
Allison Naaktgeboren
06f16488bf Bug 693555 - Update inline spell checker underlining for multiprocess.r=ehsan,mrbkap 2014-07-01 15:24:27 -07:00
Joe Walker
2354856cf5 Bug 1003761 - Fix clicking on shortcuts in GCLI output. r=robcee 2014-06-27 11:44:00 +02:00
Gabriel Luong
f46832c2df Bug 966895 - [rule view] Adding new rules to the current selection in the CSS rule-view r=harth 2014-07-02 23:52:00 +02:00
Robert Strong
d92b0d2579 Bug 1032559 - Fix for mochitest-chrome slow download mar tests fail when the app.update.download.backgroundInterval pref is 0. r=spohl 2014-07-01 12:53:25 -07:00
Wes Kocher
4c1c6bcbf5 Backed out 3 changesets (bug 994707) for Valgrind and XPCShell bustage on a CLOSED TREE
Backed out changeset 76555f34c210 (bug 994707)
Backed out changeset 3dd92fb7c846 (bug 994707)
Backed out changeset 802779efce2b (bug 994707)
2014-07-01 11:04:30 -07:00
Steven MacLeod
1b26116ef2 Bug 994707 - Write crash submission events. r=ted
--HG--
extra : rebase_source : 47ead0e8b561019ce382aa2a848fca4baf92f2fe
2014-07-01 12:52:23 -04:00
Steven MacLeod
8db622b654 Bug 994707 - Introduce crash submission events and handle them. r=bsmedberg
This introduces a new crash event type for submissions and handles
them in the Crash Manager. These crash submissions will also be counted
in FHR.

--HG--
extra : rebase_source : 41fb43f9588885033e49dccfaf9351ef805c476b
2014-07-01 12:52:23 -04:00
Steven MacLeod
f6e820cef7 Bug 994707 - Provide the crash events path as an environment variable for the crashreporter. r=ted
--HG--
extra : rebase_source : 1ca29ca44c3fbf18504afe0ce1a6c1d1d87a49a2
2014-07-01 12:52:22 -04:00
Carsten "Tomcat" Book
585e556550 Merge mozilla-central to fx-team 2014-07-01 14:31:22 +02:00
Carsten "Tomcat" Book
8386a5e5a4 merge fx-team to mozilla-central a=merge
--HG--
extra : amend_source : d62f5ddf7f62ae7c9aad4d22253f53a255ea06fa
2014-07-01 14:21:32 +02:00
Wes Kocher
5d262a4de5 Merge m-c to inbound a=merge 2014-06-30 18:47:26 -07:00
Wes Kocher
d008715ddd Merge fx-team to m-c a=merge 2014-06-30 18:22:10 -07:00
Kyle Huey
e2e1171cb1 Bug 1031051: Part 7 - Migrate PageTransitionEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Sébastien Blin
1672a2683c Bug 961832 - GCLI screenshot shows fixed position element in wrong position. r=pbrosset. 2014-06-30 17:46:20 +02:00
Alexandre Poirot
9b33747995 Bug 963490 - Implement a b2g component to easily interact with all frames. r=vingtetun, r=janx, r=jryans 2014-06-30 06:16:00 -04:00
Carsten "Tomcat" Book
c7c8e8b4af Merge mozilla-central to fx-team 2014-06-30 15:49:06 +02:00
Carsten "Tomcat" Book
853b7a8ed8 merge fx-team to mozilla-central a=merge 2014-06-30 15:29:16 +02:00
Jordan Santell
bf48aefb60 Bug 1029738 - Halt firing instrumented function calls after destruction in CallWatcherActor. r=vp 2014-06-30 11:42:00 +02:00
Sami Jaktholm
395abab68d Bug 1026921 - Style Inspector: Choose correct URL for background image tooltip if a rule contains multiple backgrounds. r=pbrosset 2014-06-30 02:10:00 +02:00
Michael Pruett
a92763ed69 Bug 1024360 - Remove usage of deprecated mozIStorageBaseStatement methods. r=mak 2014-06-27 09:59:09 -05:00
Ms2ger
71fc09547a Bug 968804 - Part m: Add outer window assertions to DispatchCustomEvent; r=khuey 2014-06-29 17:31:13 +02:00
Phil Ringnalda
7235f6934a Merge m-c to m-i 2014-06-28 20:51:49 -07:00
Phil Ringnalda
02bb2e2ec7 Merge m-i to m-c, a=merge 2014-06-28 17:39:03 -07:00
Blake Kaplan
d96a208414 Bug 949617 - Make the login manager work in e10s. r=dolske/mconley/mfinkle/jimm 2014-06-28 11:09:45 -07:00
Blake Kaplan
5b8b70881e Bug 995489 - Generalize AutoCompleteE10S.jsm for use from other code. r=felipe 2014-06-28 11:09:45 -07:00
Blake Kaplan
2f3a35bb35 Bug 993197 - Asynchronize nsILoginManager::autoCompleteSearch. r=dolske 2014-06-28 11:09:45 -07:00
Wes Kocher
8f891b42c0 Merge m-c to fx-team a=merge 2014-06-27 17:54:18 -07:00
Wes Kocher
b7cfc12713 Merge inbound to m-c a=merge 2014-06-27 17:40:49 -07:00
Wes Kocher
785ee4384b Merge b2g-inbound to m-c a=merge 2014-06-27 17:11:25 -07:00
Ryan VanderMeulen
a83452fb9b Backed out changeset 123e07744d21 (bug 1012398) for mochitest-other failures.
CLOSED TREE
2014-06-27 15:48:26 -04:00
Magnus Melin
88d09e13a2 Bug 1012398 - Completion doesn't take capitalization from address book entry. Also fixes bug 1009469. r=Enn 2014-06-27 21:29:07 +03:00
Jim Blandy
15b78ecf33 Bug 800200: Remove references to JSD from outside js/jsd. r=mccr8,bholley,ted,smaug 2014-06-27 11:05:08 -07:00
Jim Blandy
49dfe7b943 Bug 800200: Delete all references to the obsolete Venkman chrome debugger from the tree. r=ted 2014-06-27 11:05:07 -07:00
Carsten "Tomcat" Book
5f55649839 Merge mozilla-central to b2g-inbound 2014-06-27 15:56:37 +02:00
Carsten "Tomcat" Book
2f05201952 merge fx-team to mozilla-central a=merge 2014-06-27 15:47:39 +02:00
Carsten "Tomcat" Book
11b78eff19 merge mozilla-inbound to mozilla-central a=merge 2014-06-27 15:34:28 +02:00
Carsten "Tomcat" Book
872094d8fd Backed out changeset f556e62f5ee8 (bug 993197) for causing bug 1030663 a=orange 2014-06-27 15:18:16 +02:00
Carsten "Tomcat" Book
5fa000ac0f Backed out changeset 4a6ff8b73d5c (bug 995489) 2014-06-27 15:17:43 +02:00
Carsten "Tomcat" Book
2ab07cce72 Backed out changeset 8c1ee05fbbd6 (bug 949617) 2014-06-27 15:17:42 +02:00
Carsten "Tomcat" Book
79897f0740 Backed out changeset 958aaea55e3f (bug 1029128) 2014-06-27 15:17:37 +02:00
Carsten "Tomcat" Book
697df61130 Backed out changeset df7bcbbeda21 (bug 1029128) 2014-06-27 15:17:23 +02:00
Ryan VanderMeulen
3fb7520283 Merge inbound to m-c on a CLOSED TREE. a=merge 2014-06-26 17:13:04 -04:00
Matthew Noorenberghe
9d92f9b1c8 Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb 2014-06-26 13:17:17 -04:00
Andrew McCreight
768bc361e3 Bug 1024801, part 2 - LookupCache::GetPrefixes should free arr even on failure. r=gcp 2014-06-26 09:29:06 -07:00
Andrew McCreight
54977ed708 Bug 1024801, part 1 - Free prefixArray if nsUrlClassifierPrefixSet::GetPrefixes returns an error. r=gcp 2014-06-26 09:29:06 -07:00
Tim Taubert
15b3e6f664 Bug 1030719 - Properly restore form data for contenteditables r=smacleod 2014-06-26 15:55:16 +02:00
Erik Vold
812eca6632 Bug 1009328 - Change the signature of callBootstrapMethod to be more flexible for changes r=Unfocused 2014-06-27 14:00:16 -07:00
Justin Dolske
4b94c326de Bug 1023508 - Add telemetry for HiDPI usage. r=felipe 2014-06-27 11:20:02 -07:00
Carsten "Tomcat" Book
af394a68f4 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
39ff1551ea merge fx-team to mozilla-central a=merge 2014-06-26 15:33:24 +02:00
Paolo Amadini
9e91c18016 Bug 1020495 - Add registration of requestAutocomplete UI handlers on initialization. r=MattN 2014-06-26 14:32:24 +01:00
Michael Brennan
3afd8aa770 Bug 1028887 - Cause tests to fail when autoclosing Sqlite.jsm. r=Yoric 2014-06-26 06:24:21 +02:00
Alexandre Poirot
bd01301016 Bug 1020948 - Ensure fetching script sources when DebuggerObject.source fails. r=past 2014-06-26 06:39:00 +02:00
Wes Kocher
c8c625d1b9 Merge m-c to fx-team a=merge 2014-06-25 18:44:50 -07:00
Wes Kocher
19b35e69b7 Merge inbound to m-c a=merge 2014-06-25 18:18:43 -07:00
J. Ryan Stinnett
936fa498cb Bug 975591 - Part 1: Add device discovery service. r=paul
--HG--
rename : toolkit/devtools/moz.build => toolkit/devtools/discovery/moz.build
rename : toolkit/devtools/moz.build => toolkit/devtools/discovery/tests/moz.build
2014-06-26 16:40:00 +02:00
J. Ryan Stinnett
5634a307aa Bug 1025799 - Progress events for app install. r=ochameau 2014-06-26 14:19:00 +02:00
Joe Walker
e7a791a174 Bug 1022587 - Kill reference to this._tabActor.browser in CSS Coverage; r=paul 2014-06-27 08:31:21 +01:00
Joe Walker
41f600c327 Bug 1025044 - CSS coverage actor should have started and stopped events; r=harth 2014-06-27 08:31:20 +01:00
Brian Grinstead
3643fd6f75 Bug 1029162 - Add querySelector[All] to tern docs. r=past 2014-06-25 04:57:00 -04:00
Victor Porof
e8717a6204 Bug 1023525 - Make the canvas, webgl and webaudio actors also be global actors, r=jsantell 2014-06-25 13:35:10 -04:00
Victor Porof
c896500356 Bug 1029559 - The framerate front should have a means of clamping the generated values (relanded), r=pbrosset 2014-06-25 13:32:07 -04:00
Blake Kaplan
fdbc8ba291 Bug 1029128 - Fix bug in failure case biting debugging mochitest failures. r=dolske 2014-06-24 16:57:39 -04:00
Blake Kaplan
c9b6697513 Bug 1029128 - Fix strict-mode error in the JSON storage file. r=dolske 2014-06-24 16:57:40 -04:00
Brian Grinstead
4639208c3e Bug 1029162 - Update tern to 0.6.2. r=past 2014-06-24 13:53:00 -04:00
Paolo Amadini
7436cbb7de Bug 1030714 - Clarify that unhandled rejections indicate an issue with the code. r=Yoric 2014-06-26 13:40:12 +01:00
Blair McBride
7383b283fe Bug 994915 - Part 2: Add error handling in BackgoundPageThumbs for invalid URLs. r=adw 2014-07-01 22:27:40 +12:00
Jordan Santell
02bfe91cc4 Bug 999687 - Only show enum names in canvas debugger for appropriate method and arguments. r=vp 2014-06-27 12:09:00 +02:00
Sam Penrose
560e49f1af Bug 1030227 - FxA must fire onlogin() for RPs that have called watch(). r=jedp 2014-06-26 10:04:03 -07:00
Harsh Pathak
fffec87019 Bug 643041 - Merge nsIX509Cert2 and nsIX509Cert3 into nsIX509Cert, and merge nsIX509CertDB2 into nsIX509CertDB. r=keeler
--HG--
extra : rebase_source : 5283c637e45dbee9f741d56cda54fdef1afce16e
2014-07-03 22:09:24 -07:00
Walter Litwinczyk
324cfd1c23 Bug 701948 - Rename nsIGfxInfo::FEATURE_NO_INFO to nsIGfxInfo::FEATURE_STATUS_OK. r=jgilbert 2014-07-01 14:44:09 -07:00
Wes Kocher
dd1f16a365 Merge m-c to inbound a=merge 2014-07-01 17:38:49 -07:00
Monica Chew
3610af3dd0 Bug 1032875: Move empty gethash URL check in case listmanager is not ready (r=gcp) 2014-07-01 10:31:31 -07:00
Monica Chew
c95bda7aa1 Bug 1024610: Register tracking protection list and hook it up in nsChannelClassifier (r=gcp) 2014-07-02 12:41:00 -07:00
Chris Pearce
faf29e148d Bug 1023771 - Use fastSeek() in videocontrols only on B2G, not on all touch controls. r=blassey 2014-07-03 07:40:38 +12:00
Carsten "Tomcat" Book
23d6a7ded4 Merge mozilla-central to mozilla-inbound 2014-06-25 15:42:28 +02:00
Carsten "Tomcat" Book
9bf09b73ad merge fx-team to mozilla-central a=merge 2014-06-25 15:34:21 +02:00
Carsten "Tomcat" Book
0fedf193db Backed out changeset 24fb014f1ae3 (bug 1021618) for Linux Memory Leak on a CLOSED TREE 2014-06-25 10:03:44 +02:00
David Rajchenbach-Teller
a82c78cd53 Bug 1023787 - Make Task.jsm stack rewriting play nicely with xpcshell and mochi tests. r=paolo, r=mikedeboer 2014-06-20 14:23:00 -04:00
Jacek Caban
53a170226d Bug 1022847 - toolkit/mozapps/update fails to compile with MinGW r=netzen
--HG--
extra : rebase_source : d876570cbfb29bc86cf1435f8e0f79eda49b5764
2014-06-25 11:30:05 +02:00
Carsten "Tomcat" Book
44ac68d674 Merge mozilla-central to mozilla-inbound 2014-07-02 15:09:37 +02:00
Tom Schuster
9777274923 Bug 673569 - Let each frame script have its own scope (r=smaug) 2014-06-13 19:56:38 +02:00
Wes Kocher
cf3ebe1f47 Merge m-c to inbound 2014-07-16 17:42:00 -07:00
Mike Hommey
260f946298 Fixup for bug 1038639. r=me 2014-07-17 09:37:21 +09:00
Tim Abraldes
2271b8aa31 bug 985252. Build sandbox code regardless of whether --enable-content-sandbox/MOZ_CONTENT_SANDBOX is provided. Enable sandboxing of GMP plugins. Enable SandboxBroker to set different security policies for different process types. r=bbondy, r=cpearce, r=bent 2014-07-16 16:01:34 -07:00
Mike Conley
608a78e3ff Bug 1039586 - Ensure no add-on shim code gets executed when browser.tabs.remote.autostart is false. r=billm,jimm.
--HG--
extra : rebase_source : 9e7b62c32e01698992757cca5b6283ed2aa95f27
extra : histedit_source : 404875166004053aca7ccaa805bc616f8910f143
2014-07-16 14:13:33 -04:00
Bobby Holley
ff0345aeaf Bug 1038278 - Remove spam. r=me 2014-07-16 10:37:37 -07:00
Monica Chew
a78d3a2975 Bug 1021419: Implement per-table update and gethash requests 2014-06-12 10:24:03 -07:00
Wes Johnston
6586998316 Bug 1018468 - Add fullscreen button to video controls. r=mfinkle 2014-06-11 10:25:18 -07:00
Patrick Brosset
657f763085 Bug 971662 - part 1 - GCLI command that highlights all nodes that match a selector; r=jwalker 2014-06-25 16:40:43 +02:00
Patrick Brosset
2073828ccc bug 971662 - part 0 - The BoxModelHighlighter has options for drawing regions and guides; r=miker 2014-06-25 16:40:34 +02:00
Carsten "Tomcat" Book
47cf842c48 Merge mozilla-central to fx-team 2014-06-25 15:48:21 +02:00
Ed Morley
923f8d47f1 Bug 919016 - Disable test_privbrowsing_perwindowpb.html on all platforms for crying wolf one too many times (even though it's likely just been eaten == tough)
--HG--
extra : rebase_source : 3712f24a7eb9f9e55218b70ab72c6c2f3e945414
2014-06-27 16:30:17 +01:00
Wes Johnston
35f5e1509d Bug 1014712 - Store ms tile image information for showing on about:home. r=rnewman,lucasr 2014-06-10 06:22:47 -07:00
Matthew Noorenberghe
35e13a0727 Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb 2014-06-25 02:38:24 -04:00
Jim Blandy
4d6a633bba Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Brian R. Bondy
9886164729 Bug 598615 - Rename HAVE_64BIT_OS to HAVE_64BIT_BUILD. r=ted 2014-06-24 22:16:25 -04:00
Mike Hommey
d6955a43ab Bug 1027497 - Move Gtest startup after Qt/Gtk initialization. r=BenWa 2014-06-25 08:36:12 +09:00
Wes Kocher
591c1722c3 Merge m-c to inbound a=merge on a CLOSED TREE 2014-06-24 18:39:27 -07:00
Wes Kocher
3796960cd0 Backed out changeset d4b46f6800f8 (bug 1027497) for B2G Windows build bustage on a CLOSED TREE 2014-06-24 18:34:44 -07:00
Wes Kocher
731dbac067 Backed out 6 changesets (bug 1028559, bug 1028565) for android mochitest bustage on a CLOSED TREE
Backed out changeset fdd74c065e5d (bug 1028565)
Backed out changeset 5e9777d38052 (bug 1028565)
Backed out changeset 3510bcdba3fc (bug 1028565)
Backed out changeset 62ad3254903e (bug 1028565)
Backed out changeset e7557f70acfe (bug 1028565)
Backed out changeset 5b1b527abe47 (bug 1028559)

--HG--
rename : editor/composer/nsIEditingSession.idl => editor/composer/public/nsIEditingSession.idl
rename : editor/composer/crashtests/351236-1.html => editor/composer/src/crashtests/351236-1.html
rename : editor/composer/crashtests/407062-1.html => editor/composer/src/crashtests/407062-1.html
rename : editor/composer/crashtests/419563-1.xhtml => editor/composer/src/crashtests/419563-1.xhtml
rename : editor/composer/crashtests/428844-1-inner.xhtml => editor/composer/src/crashtests/428844-1-inner.xhtml
rename : editor/composer/crashtests/428844-1.html => editor/composer/src/crashtests/428844-1.html
rename : editor/composer/crashtests/461049-1.html => editor/composer/src/crashtests/461049-1.html
rename : editor/composer/crashtests/crashtests.list => editor/composer/src/crashtests/crashtests.list
rename : editor/composer/crashtests/removing-editable-xslt-inner.xhtml => editor/composer/src/crashtests/removing-editable-xslt-inner.xhtml
rename : editor/composer/crashtests/removing-editable-xslt.html => editor/composer/src/crashtests/removing-editable-xslt.html
rename : editor/composer/nsComposeTxtSrvFilter.cpp => editor/composer/src/nsComposeTxtSrvFilter.cpp
rename : editor/composer/nsComposeTxtSrvFilter.h => editor/composer/src/nsComposeTxtSrvFilter.h
rename : editor/composer/nsComposerCommands.cpp => editor/composer/src/nsComposerCommands.cpp
rename : editor/composer/nsComposerCommands.h => editor/composer/src/nsComposerCommands.h
rename : editor/composer/nsComposerCommandsUpdater.cpp => editor/composer/src/nsComposerCommandsUpdater.cpp
rename : editor/composer/nsComposerCommandsUpdater.h => editor/composer/src/nsComposerCommandsUpdater.h
rename : editor/composer/nsComposerController.cpp => editor/composer/src/nsComposerController.cpp
rename : editor/composer/nsComposerController.h => editor/composer/src/nsComposerController.h
rename : editor/composer/nsComposerDocumentCommands.cpp => editor/composer/src/nsComposerDocumentCommands.cpp
rename : editor/composer/nsComposerRegistration.cpp => editor/composer/src/nsComposerRegistration.cpp
rename : editor/composer/nsEditingSession.cpp => editor/composer/src/nsEditingSession.cpp
rename : editor/composer/nsEditingSession.h => editor/composer/src/nsEditingSession.h
rename : editor/composer/nsEditorSpellCheck.cpp => editor/composer/src/nsEditorSpellCheck.cpp
rename : editor/composer/nsEditorSpellCheck.h => editor/composer/src/nsEditorSpellCheck.h
rename : editor/composer/res/EditorOverride.css => editor/composer/src/res/EditorOverride.css
rename : editor/composer/res/grabber.gif => editor/composer/src/res/grabber.gif
rename : editor/composer/res/table-add-column-after-active.gif => editor/composer/src/res/table-add-column-after-active.gif
rename : editor/composer/res/table-add-column-after-hover.gif => editor/composer/src/res/table-add-column-after-hover.gif
rename : editor/composer/res/table-add-column-after.gif => editor/composer/src/res/table-add-column-after.gif
rename : editor/composer/res/table-add-column-before-active.gif => editor/composer/src/res/table-add-column-before-active.gif
rename : editor/composer/res/table-add-column-before-hover.gif => editor/composer/src/res/table-add-column-before-hover.gif
rename : editor/composer/res/table-add-column-before.gif => editor/composer/src/res/table-add-column-before.gif
rename : editor/composer/res/table-add-row-after-active.gif => editor/composer/src/res/table-add-row-after-active.gif
rename : editor/composer/res/table-add-row-after-hover.gif => editor/composer/src/res/table-add-row-after-hover.gif
rename : editor/composer/res/table-add-row-after.gif => editor/composer/src/res/table-add-row-after.gif
rename : editor/composer/res/table-add-row-before-active.gif => editor/composer/src/res/table-add-row-before-active.gif
rename : editor/composer/res/table-add-row-before-hover.gif => editor/composer/src/res/table-add-row-before-hover.gif
rename : editor/composer/res/table-add-row-before.gif => editor/composer/src/res/table-add-row-before.gif
rename : editor/composer/res/table-remove-column-active.gif => editor/composer/src/res/table-remove-column-active.gif
rename : editor/composer/res/table-remove-column-hover.gif => editor/composer/src/res/table-remove-column-hover.gif
rename : editor/composer/res/table-remove-column.gif => editor/composer/src/res/table-remove-column.gif
rename : editor/composer/res/table-remove-row-active.gif => editor/composer/src/res/table-remove-row-active.gif
rename : editor/composer/res/table-remove-row-hover.gif => editor/composer/src/res/table-remove-row-hover.gif
rename : editor/composer/res/table-remove-row.gif => editor/composer/src/res/table-remove-row.gif
rename : editor/composer/res/text_caret.png => editor/composer/src/res/text_caret.png
rename : editor/composer/res/text_caret@1.5x.png => editor/composer/src/res/text_caret@1.5x.png
rename : editor/composer/res/text_caret@2.25x.png => editor/composer/src/res/text_caret@2.25x.png
rename : editor/composer/res/text_caret@2x.png => editor/composer/src/res/text_caret@2x.png
rename : editor/composer/res/text_caret_tilt_left.png => editor/composer/src/res/text_caret_tilt_left.png
rename : editor/composer/res/text_caret_tilt_left@1.5x.png => editor/composer/src/res/text_caret_tilt_left@1.5x.png
rename : editor/composer/res/text_caret_tilt_left@2.25x.png => editor/composer/src/res/text_caret_tilt_left@2.25x.png
rename : editor/composer/res/text_caret_tilt_left@2x.png => editor/composer/src/res/text_caret_tilt_left@2x.png
rename : editor/composer/res/text_caret_tilt_right.png => editor/composer/src/res/text_caret_tilt_right.png
rename : editor/composer/res/text_caret_tilt_right@1.5x.png => editor/composer/src/res/text_caret_tilt_right@1.5x.png
rename : editor/composer/res/text_caret_tilt_right@2.25x.png => editor/composer/src/res/text_caret_tilt_right@2.25x.png
rename : editor/composer/res/text_caret_tilt_right@2x.png => editor/composer/src/res/text_caret_tilt_right@2x.png
rename : editor/composer/res/text_selection_handle.png => editor/composer/src/res/text_selection_handle.png
rename : editor/composer/res/text_selection_handle@1.5.png => editor/composer/src/res/text_selection_handle@1.5.png
rename : editor/composer/res/text_selection_handle@2.png => editor/composer/src/res/text_selection_handle@2.png
rename : editor/nsIContentFilter.idl => editor/idl/nsIContentFilter.idl
rename : editor/nsIDocumentStateListener.idl => editor/idl/nsIDocumentStateListener.idl
rename : editor/nsIEditActionListener.idl => editor/idl/nsIEditActionListener.idl
rename : editor/nsIEditor.idl => editor/idl/nsIEditor.idl
rename : editor/nsIEditorIMESupport.idl => editor/idl/nsIEditorIMESupport.idl
rename : editor/nsIEditorMailSupport.idl => editor/idl/nsIEditorMailSupport.idl
rename : editor/nsIEditorObserver.idl => editor/idl/nsIEditorObserver.idl
rename : editor/nsIEditorSpellCheck.idl => editor/idl/nsIEditorSpellCheck.idl
rename : editor/nsIEditorStyleSheets.idl => editor/idl/nsIEditorStyleSheets.idl
rename : editor/nsIHTMLAbsPosEditor.idl => editor/idl/nsIHTMLAbsPosEditor.idl
rename : editor/nsIHTMLEditor.idl => editor/idl/nsIHTMLEditor.idl
rename : editor/nsIHTMLInlineTableEditor.idl => editor/idl/nsIHTMLInlineTableEditor.idl
rename : editor/nsIHTMLObjectResizeListener.idl => editor/idl/nsIHTMLObjectResizeListener.idl
rename : editor/nsIHTMLObjectResizer.idl => editor/idl/nsIHTMLObjectResizer.idl
rename : editor/nsIPlaintextEditor.idl => editor/idl/nsIPlaintextEditor.idl
rename : editor/nsITableEditor.idl => editor/idl/nsITableEditor.idl
rename : editor/nsIURIRefObject.idl => editor/idl/nsIURIRefObject.idl
rename : editor/nsPIEditorTransaction.idl => editor/idl/nsPIEditorTransaction.idl
rename : editor/libeditor/ChangeAttributeTxn.cpp => editor/libeditor/base/ChangeAttributeTxn.cpp
rename : editor/libeditor/ChangeAttributeTxn.h => editor/libeditor/base/ChangeAttributeTxn.h
rename : editor/libeditor/ChangeCSSInlineStyleTxn.cpp => editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
rename : editor/libeditor/ChangeCSSInlineStyleTxn.h => editor/libeditor/base/ChangeCSSInlineStyleTxn.h
rename : editor/libeditor/CreateElementTxn.cpp => editor/libeditor/base/CreateElementTxn.cpp
rename : editor/libeditor/CreateElementTxn.h => editor/libeditor/base/CreateElementTxn.h
rename : editor/libeditor/DeleteNodeTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
rename : editor/libeditor/DeleteNodeTxn.h => editor/libeditor/base/DeleteNodeTxn.h
rename : editor/libeditor/DeleteRangeTxn.cpp => editor/libeditor/base/DeleteRangeTxn.cpp
rename : editor/libeditor/DeleteRangeTxn.h => editor/libeditor/base/DeleteRangeTxn.h
rename : editor/libeditor/DeleteTextTxn.cpp => editor/libeditor/base/DeleteTextTxn.cpp
rename : editor/libeditor/DeleteTextTxn.h => editor/libeditor/base/DeleteTextTxn.h
rename : editor/libeditor/EditActionListener.h => editor/libeditor/base/EditActionListener.h
rename : editor/libeditor/EditAggregateTxn.cpp => editor/libeditor/base/EditAggregateTxn.cpp
rename : editor/libeditor/EditAggregateTxn.h => editor/libeditor/base/EditAggregateTxn.h
rename : editor/libeditor/EditTxn.cpp => editor/libeditor/base/EditTxn.cpp
rename : editor/libeditor/EditTxn.h => editor/libeditor/base/EditTxn.h
rename : editor/libeditor/IMETextTxn.cpp => editor/libeditor/base/IMETextTxn.cpp
rename : editor/libeditor/IMETextTxn.h => editor/libeditor/base/IMETextTxn.h
rename : editor/libeditor/InsertElementTxn.cpp => editor/libeditor/base/InsertElementTxn.cpp
rename : editor/libeditor/InsertElementTxn.h => editor/libeditor/base/InsertElementTxn.h
rename : editor/libeditor/InsertTextTxn.cpp => editor/libeditor/base/InsertTextTxn.cpp
rename : editor/libeditor/InsertTextTxn.h => editor/libeditor/base/InsertTextTxn.h
rename : editor/libeditor/JoinElementTxn.cpp => editor/libeditor/base/JoinElementTxn.cpp
rename : editor/libeditor/JoinElementTxn.h => editor/libeditor/base/JoinElementTxn.h
rename : editor/libeditor/PlaceholderTxn.cpp => editor/libeditor/base/PlaceholderTxn.cpp
rename : editor/libeditor/PlaceholderTxn.h => editor/libeditor/base/PlaceholderTxn.h
rename : editor/libeditor/SetDocTitleTxn.cpp => editor/libeditor/base/SetDocTitleTxn.cpp
rename : editor/libeditor/SetDocTitleTxn.h => editor/libeditor/base/SetDocTitleTxn.h
rename : editor/libeditor/SplitElementTxn.cpp => editor/libeditor/base/SplitElementTxn.cpp
rename : editor/libeditor/SplitElementTxn.h => editor/libeditor/base/SplitElementTxn.h
rename : editor/libeditor/crashtests/336104.html => editor/libeditor/base/crashtests/336104.html
rename : editor/libeditor/crashtests/382527-1.html => editor/libeditor/base/crashtests/382527-1.html
rename : editor/libeditor/crashtests/402172-1.html => editor/libeditor/base/crashtests/402172-1.html
rename : editor/libeditor/crashtests/407079-1.html => editor/libeditor/base/crashtests/407079-1.html
rename : editor/libeditor/crashtests/407256-1.html => editor/libeditor/base/crashtests/407256-1.html
rename : editor/libeditor/crashtests/430624-1.html => editor/libeditor/base/crashtests/430624-1.html
rename : editor/libeditor/crashtests/459613-iframe.html => editor/libeditor/base/crashtests/459613-iframe.html
rename : editor/libeditor/crashtests/459613.html => editor/libeditor/base/crashtests/459613.html
rename : editor/libeditor/crashtests/475132-1.xhtml => editor/libeditor/base/crashtests/475132-1.xhtml
rename : editor/libeditor/crashtests/633709.xhtml => editor/libeditor/base/crashtests/633709.xhtml
rename : editor/libeditor/crashtests/636074-1.html => editor/libeditor/base/crashtests/636074-1.html
rename : editor/libeditor/crashtests/713427-1.html => editor/libeditor/base/crashtests/713427-1.html
rename : editor/libeditor/crashtests/713427-2.xhtml => editor/libeditor/base/crashtests/713427-2.xhtml
rename : editor/libeditor/crashtests/762183.html => editor/libeditor/base/crashtests/762183.html
rename : editor/libeditor/crashtests/766360.html => editor/libeditor/base/crashtests/766360.html
rename : editor/libeditor/crashtests/766413.html => editor/libeditor/base/crashtests/766413.html
rename : editor/libeditor/crashtests/766845.xhtml => editor/libeditor/base/crashtests/766845.xhtml
rename : editor/libeditor/crashtests/768765.html => editor/libeditor/base/crashtests/768765.html
rename : editor/libeditor/crashtests/771749.html => editor/libeditor/base/crashtests/771749.html
rename : editor/libeditor/crashtests/772282.html => editor/libeditor/base/crashtests/772282.html
rename : editor/libeditor/crashtests/776323.html => editor/libeditor/base/crashtests/776323.html
rename : editor/libeditor/crashtests/crashtests.list => editor/libeditor/base/crashtests/crashtests.list
rename : editor/libeditor/nsEditProperty.h => editor/libeditor/base/nsEditProperty.h
rename : editor/libeditor/nsEditPropertyAtomList.h => editor/libeditor/base/nsEditPropertyAtomList.h
rename : editor/libeditor/nsEditRules.h => editor/libeditor/base/nsEditRules.h
rename : editor/libeditor/nsEditor.cpp => editor/libeditor/base/nsEditor.cpp
rename : editor/libeditor/nsEditor.h => editor/libeditor/base/nsEditor.h
rename : editor/libeditor/nsEditorCommands.cpp => editor/libeditor/base/nsEditorCommands.cpp
rename : editor/libeditor/nsEditorCommands.h => editor/libeditor/base/nsEditorCommands.h
rename : editor/libeditor/nsEditorController.cpp => editor/libeditor/base/nsEditorController.cpp
rename : editor/libeditor/nsEditorController.h => editor/libeditor/base/nsEditorController.h
rename : editor/libeditor/nsEditorEventListener.cpp => editor/libeditor/base/nsEditorEventListener.cpp
rename : editor/libeditor/nsEditorEventListener.h => editor/libeditor/base/nsEditorEventListener.h
rename : editor/libeditor/nsEditorUtils.cpp => editor/libeditor/base/nsEditorUtils.cpp
rename : editor/libeditor/nsEditorUtils.h => editor/libeditor/base/nsEditorUtils.h
rename : editor/libeditor/nsIAbsorbingTransaction.h => editor/libeditor/base/nsIAbsorbingTransaction.h
rename : editor/libeditor/nsSelectionState.cpp => editor/libeditor/base/nsSelectionState.cpp
rename : editor/libeditor/nsSelectionState.h => editor/libeditor/base/nsSelectionState.h
rename : editor/libeditor/nsStyleSheetTxns.cpp => editor/libeditor/base/nsStyleSheetTxns.cpp
rename : editor/libeditor/nsStyleSheetTxns.h => editor/libeditor/base/nsStyleSheetTxns.h
rename : editor/libeditor/tests/chrome.ini => editor/libeditor/base/tests/chrome.ini
rename : editor/libeditor/tests/file_bug586662.html => editor/libeditor/base/tests/file_bug586662.html
rename : editor/libeditor/tests/mochitest.ini => editor/libeditor/base/tests/mochitest.ini
rename : editor/libeditor/tests/moz.build => editor/libeditor/base/tests/moz.build
rename : editor/libeditor/tests/test_bug408231.html => editor/libeditor/base/tests/test_bug408231.html
rename : editor/libeditor/tests/test_bug46555.html => editor/libeditor/base/tests/test_bug46555.html
rename : editor/libeditor/tests/test_bug502673.html => editor/libeditor/base/tests/test_bug502673.html
rename : editor/libeditor/tests/test_bug514156.html => editor/libeditor/base/tests/test_bug514156.html
rename : editor/libeditor/tests/test_bug567213.html => editor/libeditor/base/tests/test_bug567213.html
rename : editor/libeditor/tests/test_bug586662.html => editor/libeditor/base/tests/test_bug586662.html
rename : editor/libeditor/tests/test_bug599983.html => editor/libeditor/base/tests/test_bug599983.html
rename : editor/libeditor/tests/test_bug599983.xul => editor/libeditor/base/tests/test_bug599983.xul
rename : editor/libeditor/tests/test_bug646194.xul => editor/libeditor/base/tests/test_bug646194.xul
rename : editor/libeditor/tests/test_bug742261.html => editor/libeditor/base/tests/test_bug742261.html
rename : editor/libeditor/tests/test_bug773262.html => editor/libeditor/base/tests/test_bug773262.html
rename : editor/libeditor/tests/test_bug795785.html => editor/libeditor/base/tests/test_bug795785.html
rename : editor/libeditor/tests/test_dragdrop.html => editor/libeditor/base/tests/test_dragdrop.html
rename : editor/libeditor/tests/test_selection_move_commands.xul => editor/libeditor/base/tests/test_selection_move_commands.xul
rename : editor/nsEditorCID.h => editor/public/nsEditorCID.h
rename : editor/txmgr/nsITransaction.idl => editor/txmgr/idl/nsITransaction.idl
rename : editor/txmgr/nsITransactionList.idl => editor/txmgr/idl/nsITransactionList.idl
rename : editor/txmgr/nsITransactionListener.idl => editor/txmgr/idl/nsITransactionListener.idl
rename : editor/txmgr/nsITransactionManager.idl => editor/txmgr/idl/nsITransactionManager.idl
rename : editor/txmgr/nsTransactionManagerCID.h => editor/txmgr/public/nsTransactionManagerCID.h
rename : editor/txmgr/nsTransactionItem.cpp => editor/txmgr/src/nsTransactionItem.cpp
rename : editor/txmgr/nsTransactionItem.h => editor/txmgr/src/nsTransactionItem.h
rename : editor/txmgr/nsTransactionList.cpp => editor/txmgr/src/nsTransactionList.cpp
rename : editor/txmgr/nsTransactionList.h => editor/txmgr/src/nsTransactionList.h
rename : editor/txmgr/nsTransactionManager.cpp => editor/txmgr/src/nsTransactionManager.cpp
rename : editor/txmgr/nsTransactionManager.h => editor/txmgr/src/nsTransactionManager.h
rename : editor/txmgr/nsTransactionManagerFactory.cpp => editor/txmgr/src/nsTransactionManagerFactory.cpp
rename : editor/txmgr/nsTransactionStack.cpp => editor/txmgr/src/nsTransactionStack.cpp
rename : editor/txmgr/nsTransactionStack.h => editor/txmgr/src/nsTransactionStack.h
rename : editor/txtsvc/nsIInlineSpellChecker.idl => editor/txtsvc/public/nsIInlineSpellChecker.idl
rename : editor/txtsvc/nsISpellChecker.h => editor/txtsvc/public/nsISpellChecker.h
rename : editor/txtsvc/nsITextService.h => editor/txtsvc/public/nsITextService.h
rename : editor/txtsvc/nsITextServicesDocument.h => editor/txtsvc/public/nsITextServicesDocument.h
rename : editor/txtsvc/nsITextServicesFilter.idl => editor/txtsvc/public/nsITextServicesFilter.idl
rename : editor/txtsvc/nsTextServicesCID.h => editor/txtsvc/public/nsTextServicesCID.h
rename : editor/txtsvc/nsFilteredContentIterator.cpp => editor/txtsvc/src/nsFilteredContentIterator.cpp
rename : editor/txtsvc/nsFilteredContentIterator.h => editor/txtsvc/src/nsFilteredContentIterator.h
rename : editor/txtsvc/nsTSAtomList.h => editor/txtsvc/src/nsTSAtomList.h
rename : editor/txtsvc/nsTextServicesDocument.cpp => editor/txtsvc/src/nsTextServicesDocument.cpp
rename : editor/txtsvc/nsTextServicesDocument.h => editor/txtsvc/src/nsTextServicesDocument.h
rename : editor/txtsvc/nsTextServicesFactory.cpp => editor/txtsvc/src/nsTextServicesFactory.cpp
rename : xpcom/string/nsAString.h => xpcom/string/public/nsAString.h
rename : xpcom/string/nsAlgorithm.h => xpcom/string/public/nsAlgorithm.h
rename : xpcom/string/nsCharTraits.h => xpcom/string/public/nsCharTraits.h
rename : xpcom/string/nsDependentString.h => xpcom/string/public/nsDependentString.h
rename : xpcom/string/nsDependentSubstring.h => xpcom/string/public/nsDependentSubstring.h
rename : xpcom/string/nsEmbedString.h => xpcom/string/public/nsEmbedString.h
rename : xpcom/string/nsLiteralString.h => xpcom/string/public/nsLiteralString.h
rename : xpcom/string/nsPrintfCString.h => xpcom/string/public/nsPrintfCString.h
rename : xpcom/string/nsPromiseFlatString.h => xpcom/string/public/nsPromiseFlatString.h
rename : xpcom/string/nsReadableUtils.h => xpcom/string/public/nsReadableUtils.h
rename : xpcom/string/nsString.h => xpcom/string/public/nsString.h
rename : xpcom/string/nsStringBuffer.h => xpcom/string/public/nsStringBuffer.h
rename : xpcom/string/nsStringFwd.h => xpcom/string/public/nsStringFwd.h
rename : xpcom/string/nsStringIterator.h => xpcom/string/public/nsStringIterator.h
rename : xpcom/string/nsSubstring.h => xpcom/string/public/nsSubstring.h
rename : xpcom/string/nsSubstringTuple.h => xpcom/string/public/nsSubstringTuple.h
rename : xpcom/string/nsTDependentString.h => xpcom/string/public/nsTDependentString.h
rename : xpcom/string/nsTDependentSubstring.h => xpcom/string/public/nsTDependentSubstring.h
rename : xpcom/string/nsTLiteralString.h => xpcom/string/public/nsTLiteralString.h
rename : xpcom/string/nsTPromiseFlatString.h => xpcom/string/public/nsTPromiseFlatString.h
rename : xpcom/string/nsTString.h => xpcom/string/public/nsTString.h
rename : xpcom/string/nsTSubstring.h => xpcom/string/public/nsTSubstring.h
rename : xpcom/string/nsTSubstringTuple.h => xpcom/string/public/nsTSubstringTuple.h
rename : xpcom/string/nsUTF8Utils.h => xpcom/string/public/nsUTF8Utils.h
rename : xpcom/string/nsXPCOMStrings.h => xpcom/string/public/nsXPCOMStrings.h
rename : xpcom/string/nsXPIDLString.h => xpcom/string/public/nsXPIDLString.h
rename : xpcom/string/string-template-def-char.h => xpcom/string/public/string-template-def-char.h
rename : xpcom/string/string-template-def-unichar.h => xpcom/string/public/string-template-def-unichar.h
rename : xpcom/string/string-template-undef.h => xpcom/string/public/string-template-undef.h
rename : xpcom/string/nsDependentString.cpp => xpcom/string/src/nsDependentString.cpp
rename : xpcom/string/nsDependentSubstring.cpp => xpcom/string/src/nsDependentSubstring.cpp
rename : xpcom/string/nsPromiseFlatString.cpp => xpcom/string/src/nsPromiseFlatString.cpp
rename : xpcom/string/nsReadableUtils.cpp => xpcom/string/src/nsReadableUtils.cpp
rename : xpcom/string/nsString.cpp => xpcom/string/src/nsString.cpp
rename : xpcom/string/nsStringComparator.cpp => xpcom/string/src/nsStringComparator.cpp
rename : xpcom/string/nsStringObsolete.cpp => xpcom/string/src/nsStringObsolete.cpp
rename : xpcom/string/nsSubstring.cpp => xpcom/string/src/nsSubstring.cpp
rename : xpcom/string/nsSubstringTuple.cpp => xpcom/string/src/nsSubstringTuple.cpp
rename : xpcom/string/nsTDependentString.cpp => xpcom/string/src/nsTDependentString.cpp
rename : xpcom/string/nsTDependentSubstring.cpp => xpcom/string/src/nsTDependentSubstring.cpp
rename : xpcom/string/nsTPromiseFlatString.cpp => xpcom/string/src/nsTPromiseFlatString.cpp
rename : xpcom/string/nsTString.cpp => xpcom/string/src/nsTString.cpp
rename : xpcom/string/nsTStringComparator.cpp => xpcom/string/src/nsTStringComparator.cpp
rename : xpcom/string/nsTStringObsolete.cpp => xpcom/string/src/nsTStringObsolete.cpp
rename : xpcom/string/nsTSubstring.cpp => xpcom/string/src/nsTSubstring.cpp
rename : xpcom/string/nsTSubstringTuple.cpp => xpcom/string/src/nsTSubstringTuple.cpp
rename : xpcom/string/nsUTF8UtilsSSE2.cpp => xpcom/string/src/nsUTF8UtilsSSE2.cpp
2014-06-24 18:32:55 -07:00
Marco Castelluccio
5115fd88f7 Bug 981251 - Test app uninstallation. r=myk
--HG--
rename : toolkit/webapps/tests/test_hosted.xul => toolkit/webapps/tests/test_hosted_uninstall.xul
rename : toolkit/webapps/tests/test_packaged.xul => toolkit/webapps/tests/test_packaged_uninstall.xul
2014-06-25 02:37:28 +02:00
Birunthan Mohanathas
d72b561e31 Bug 1028565 - Part 4: Flatten editor/libeditor/base/ directory. r=ehsan
--HG--
rename : editor/libeditor/base/ChangeAttributeTxn.cpp => editor/libeditor/ChangeAttributeTxn.cpp
rename : editor/libeditor/base/ChangeAttributeTxn.h => editor/libeditor/ChangeAttributeTxn.h
rename : editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp => editor/libeditor/ChangeCSSInlineStyleTxn.cpp
rename : editor/libeditor/base/ChangeCSSInlineStyleTxn.h => editor/libeditor/ChangeCSSInlineStyleTxn.h
rename : editor/libeditor/base/CreateElementTxn.cpp => editor/libeditor/CreateElementTxn.cpp
rename : editor/libeditor/base/CreateElementTxn.h => editor/libeditor/CreateElementTxn.h
rename : editor/libeditor/base/DeleteNodeTxn.cpp => editor/libeditor/DeleteNodeTxn.cpp
rename : editor/libeditor/base/DeleteNodeTxn.h => editor/libeditor/DeleteNodeTxn.h
rename : editor/libeditor/base/DeleteRangeTxn.cpp => editor/libeditor/DeleteRangeTxn.cpp
rename : editor/libeditor/base/DeleteRangeTxn.h => editor/libeditor/DeleteRangeTxn.h
rename : editor/libeditor/base/DeleteTextTxn.cpp => editor/libeditor/DeleteTextTxn.cpp
rename : editor/libeditor/base/DeleteTextTxn.h => editor/libeditor/DeleteTextTxn.h
rename : editor/libeditor/base/EditActionListener.h => editor/libeditor/EditActionListener.h
rename : editor/libeditor/base/EditAggregateTxn.cpp => editor/libeditor/EditAggregateTxn.cpp
rename : editor/libeditor/base/EditAggregateTxn.h => editor/libeditor/EditAggregateTxn.h
rename : editor/libeditor/base/EditTxn.cpp => editor/libeditor/EditTxn.cpp
rename : editor/libeditor/base/EditTxn.h => editor/libeditor/EditTxn.h
rename : editor/libeditor/base/IMETextTxn.cpp => editor/libeditor/IMETextTxn.cpp
rename : editor/libeditor/base/IMETextTxn.h => editor/libeditor/IMETextTxn.h
rename : editor/libeditor/base/InsertElementTxn.cpp => editor/libeditor/InsertElementTxn.cpp
rename : editor/libeditor/base/InsertElementTxn.h => editor/libeditor/InsertElementTxn.h
rename : editor/libeditor/base/InsertTextTxn.cpp => editor/libeditor/InsertTextTxn.cpp
rename : editor/libeditor/base/InsertTextTxn.h => editor/libeditor/InsertTextTxn.h
rename : editor/libeditor/base/JoinElementTxn.cpp => editor/libeditor/JoinElementTxn.cpp
rename : editor/libeditor/base/JoinElementTxn.h => editor/libeditor/JoinElementTxn.h
rename : editor/libeditor/base/PlaceholderTxn.cpp => editor/libeditor/PlaceholderTxn.cpp
rename : editor/libeditor/base/PlaceholderTxn.h => editor/libeditor/PlaceholderTxn.h
rename : editor/libeditor/base/SetDocTitleTxn.cpp => editor/libeditor/SetDocTitleTxn.cpp
rename : editor/libeditor/base/SetDocTitleTxn.h => editor/libeditor/SetDocTitleTxn.h
rename : editor/libeditor/base/SplitElementTxn.cpp => editor/libeditor/SplitElementTxn.cpp
rename : editor/libeditor/base/SplitElementTxn.h => editor/libeditor/SplitElementTxn.h
rename : editor/libeditor/base/crashtests/336104.html => editor/libeditor/crashtests/336104.html
rename : editor/libeditor/base/crashtests/382527-1.html => editor/libeditor/crashtests/382527-1.html
rename : editor/libeditor/base/crashtests/402172-1.html => editor/libeditor/crashtests/402172-1.html
rename : editor/libeditor/base/crashtests/407079-1.html => editor/libeditor/crashtests/407079-1.html
rename : editor/libeditor/base/crashtests/407256-1.html => editor/libeditor/crashtests/407256-1.html
rename : editor/libeditor/base/crashtests/430624-1.html => editor/libeditor/crashtests/430624-1.html
rename : editor/libeditor/base/crashtests/459613-iframe.html => editor/libeditor/crashtests/459613-iframe.html
rename : editor/libeditor/base/crashtests/459613.html => editor/libeditor/crashtests/459613.html
rename : editor/libeditor/base/crashtests/475132-1.xhtml => editor/libeditor/crashtests/475132-1.xhtml
rename : editor/libeditor/base/crashtests/633709.xhtml => editor/libeditor/crashtests/633709.xhtml
rename : editor/libeditor/base/crashtests/636074-1.html => editor/libeditor/crashtests/636074-1.html
rename : editor/libeditor/base/crashtests/713427-1.html => editor/libeditor/crashtests/713427-1.html
rename : editor/libeditor/base/crashtests/713427-2.xhtml => editor/libeditor/crashtests/713427-2.xhtml
rename : editor/libeditor/base/crashtests/762183.html => editor/libeditor/crashtests/762183.html
rename : editor/libeditor/base/crashtests/766360.html => editor/libeditor/crashtests/766360.html
rename : editor/libeditor/base/crashtests/766413.html => editor/libeditor/crashtests/766413.html
rename : editor/libeditor/base/crashtests/766845.xhtml => editor/libeditor/crashtests/766845.xhtml
rename : editor/libeditor/base/crashtests/768765.html => editor/libeditor/crashtests/768765.html
rename : editor/libeditor/base/crashtests/771749.html => editor/libeditor/crashtests/771749.html
rename : editor/libeditor/base/crashtests/772282.html => editor/libeditor/crashtests/772282.html
rename : editor/libeditor/base/crashtests/776323.html => editor/libeditor/crashtests/776323.html
rename : editor/libeditor/base/crashtests/crashtests.list => editor/libeditor/crashtests/crashtests.list
rename : editor/libeditor/base/nsEditProperty.h => editor/libeditor/nsEditProperty.h
rename : editor/libeditor/base/nsEditPropertyAtomList.h => editor/libeditor/nsEditPropertyAtomList.h
rename : editor/libeditor/base/nsEditRules.h => editor/libeditor/nsEditRules.h
rename : editor/libeditor/base/nsEditor.cpp => editor/libeditor/nsEditor.cpp
rename : editor/libeditor/base/nsEditor.h => editor/libeditor/nsEditor.h
rename : editor/libeditor/base/nsEditorCommands.cpp => editor/libeditor/nsEditorCommands.cpp
rename : editor/libeditor/base/nsEditorCommands.h => editor/libeditor/nsEditorCommands.h
rename : editor/libeditor/base/nsEditorController.cpp => editor/libeditor/nsEditorController.cpp
rename : editor/libeditor/base/nsEditorController.h => editor/libeditor/nsEditorController.h
rename : editor/libeditor/base/nsEditorEventListener.cpp => editor/libeditor/nsEditorEventListener.cpp
rename : editor/libeditor/base/nsEditorEventListener.h => editor/libeditor/nsEditorEventListener.h
rename : editor/libeditor/base/nsEditorUtils.cpp => editor/libeditor/nsEditorUtils.cpp
rename : editor/libeditor/base/nsEditorUtils.h => editor/libeditor/nsEditorUtils.h
rename : editor/libeditor/base/nsIAbsorbingTransaction.h => editor/libeditor/nsIAbsorbingTransaction.h
rename : editor/libeditor/base/nsSelectionState.cpp => editor/libeditor/nsSelectionState.cpp
rename : editor/libeditor/base/nsSelectionState.h => editor/libeditor/nsSelectionState.h
rename : editor/libeditor/base/nsStyleSheetTxns.cpp => editor/libeditor/nsStyleSheetTxns.cpp
rename : editor/libeditor/base/nsStyleSheetTxns.h => editor/libeditor/nsStyleSheetTxns.h
rename : editor/libeditor/base/tests/chrome.ini => editor/libeditor/tests/chrome.ini
rename : editor/libeditor/base/tests/file_bug586662.html => editor/libeditor/tests/file_bug586662.html
rename : editor/libeditor/base/tests/mochitest.ini => editor/libeditor/tests/mochitest.ini
rename : editor/libeditor/base/tests/moz.build => editor/libeditor/tests/moz.build
rename : editor/libeditor/base/tests/test_bug408231.html => editor/libeditor/tests/test_bug408231.html
rename : editor/libeditor/base/tests/test_bug46555.html => editor/libeditor/tests/test_bug46555.html
rename : editor/libeditor/base/tests/test_bug502673.html => editor/libeditor/tests/test_bug502673.html
rename : editor/libeditor/base/tests/test_bug514156.html => editor/libeditor/tests/test_bug514156.html
rename : editor/libeditor/base/tests/test_bug567213.html => editor/libeditor/tests/test_bug567213.html
rename : editor/libeditor/base/tests/test_bug586662.html => editor/libeditor/tests/test_bug586662.html
rename : editor/libeditor/base/tests/test_bug599983.html => editor/libeditor/tests/test_bug599983.html
rename : editor/libeditor/base/tests/test_bug599983.xul => editor/libeditor/tests/test_bug599983.xul
rename : editor/libeditor/base/tests/test_bug646194.xul => editor/libeditor/tests/test_bug646194.xul
rename : editor/libeditor/base/tests/test_bug742261.html => editor/libeditor/tests/test_bug742261.html
rename : editor/libeditor/base/tests/test_bug773262.html => editor/libeditor/tests/test_bug773262.html
rename : editor/libeditor/base/tests/test_bug795785.html => editor/libeditor/tests/test_bug795785.html
rename : editor/libeditor/base/tests/test_dragdrop.html => editor/libeditor/tests/test_dragdrop.html
rename : editor/libeditor/base/tests/test_selection_move_commands.xul => editor/libeditor/tests/test_selection_move_commands.xul
2014-06-23 16:27:43 -07:00
Mike Hommey
da7221475c Bug 1027497 - Move Gtest startup after Qt/Gtk initialization. r=BenWa 2014-06-25 08:36:12 +09:00
Nathan Froyd
7a4dfe1208 Bug 728600 - define TARGET_XPCOM_ABI in mozilla-config.h; r=glandium 2014-06-23 15:06:48 -04:00
Ryan VanderMeulen
530fc0209a Backed out 5 changesets (bug 993197, bug 949617, bug 995489, bug 1029128) for Android test failures.
Backed out changeset 033d6271fd19 (bug 1029128)
Backed out changeset f568b1dc9880 (bug 1029128)
Backed out changeset daa9c46d19dc (bug 949617)
Backed out changeset 2baf5c61cbf5 (bug 995489)
Backed out changeset 654c1f0c88bc (bug 993197)
2014-06-24 15:36:18 -04:00
Ryan VanderMeulen
2623923b74 Backed out changeset ed7a9a1038c5 (bug 1027057) for suspected Windows mochitest-5 permafail.
CLOSED TREE
2014-06-24 14:58:51 -04:00
Blake Kaplan
bc3494e538 Bug 1029128 - Fix strict-mode error in the JSON storage file. r=dolske 2014-06-24 14:34:02 -04:00
Blake Kaplan
4ae88afdbf Bug 1029128 - Fix bug in failure case biting debugging mochitest failures. r=dolske 2014-06-24 14:34:02 -04:00
Blake Kaplan
2b62edfe4f Bug 949617 - Make the login manager work in e10s. r=dolske 2014-06-24 14:34:02 -04:00
Blake Kaplan
010a135eb8 Bug 995489 - Generalize AutoCompleteE10S.jsm for use from other code. r=felipe 2014-06-24 14:34:02 -04:00
Blake Kaplan
55b638c742 Bug 993197 - Asynchronize nsILoginManager::autoCompleteSearch. r=dolske 2014-06-24 14:34:02 -04:00
Neil Deakin
465f56589a Bug 1027057, use correct origin for arrowpanel animations in rtl, r=dao 2014-06-24 12:35:26 -04:00
Ed Morley
4ffd0ec330 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Gabriel Luong
f73fe0c96b Bug 966896 - [rule view] Editing rules' selectors for the current selection in the CSS rule-view r=pbrosset 2014-06-24 10:02:16 +02:00
James Long
d87fd67865 Bug 1026041 - make _clearSteppingHooks in ThreadActor check if the frame is live. r=fitzgen 2014-06-23 12:58:00 +02:00
Wes Kocher
3f15cb212c Merge fx-team to m-c a=merge 2014-06-23 17:56:11 -07:00
Jeremie Patonnier
18e4100f8c Bug 1028570 - Remove unnecessary preprocessing of minimal-xul.css. r=jwatt 2014-06-21 20:17:32 +02:00
Nick Fitzgerald
f79fcccd5f Bug 1000967 - Add source notes for |new| expression and function calls to improve source maps and debugging. r=ejpbruel 2014-06-20 13:09:00 -04:00
Jordan Santell
030bd5449f Bug 980506 - Emit destruction events on AudioNodes in the WebAudioActor. r=vp 2014-06-20 12:05:00 -04:00
Gabriel Luong
02a5a17d87 Bug 803831 - GCLI Command to open Profile Directory. r=jwalker 2014-06-15 22:57:00 -04:00
Ryan VanderMeulen
0c2067d9e5 Merge inbound to m-c. a=merge 2014-06-23 10:42:32 -04:00
Justin Dolske
34772eae63 Bug 499649: trivial followup to remove temporary dump() logging. 2014-06-22 14:03:26 -07:00
Tim Taubert
43f6ec0719 merge m-c to fx-team 2014-06-20 18:49:23 +02:00
Masayuki Nakano
128d884dc9 Bug 1026986 Allow to build InstallX11ErrorHandler() at building Qt-build r=karlt 2014-06-20 14:41:32 +09:00
Wes Kocher
0581005adc Merge inbound to m-c a=merge 2014-06-19 18:07:43 -07:00
Ed Morley
7dd2371081 Merge mozilla-central and fx-team 2014-06-19 17:20:10 +01:00
Ed Morley
ff723affc4 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-19 15:59:56 +01:00
Paul Rouget
5bce55dba2 Bug 1012760 - build a webide-specific addon manager. r=ochameau 2014-06-19 05:19:56 +08:00
David Rajchenbach-Teller
55ed50c27f Bug 1027033 - AsyncShutdown errors should cause test failures but should not break AsyncShutdown. r=froydnj 2014-06-18 05:40:00 -04:00
Ryan VanderMeulen
61c70bb676 Merge m-c to fx-team. a=merge 2014-06-18 16:17:58 -04:00
Ryan VanderMeulen
f6dab57b4b Merge fx-team to m-c. a=merge 2014-06-18 16:15:32 -04:00
Ryan VanderMeulen
de68c2db12 Merge b2g-inbound to m-c. a=merge 2014-06-18 15:59:37 -04:00
Sam Penrose
01e1625cb1 Bug 1025309 - Fire FxA onlogout for RPs such as FMD. r=jedp 2014-06-17 11:28:25 -07:00
David Rajchenbach-Teller
312556619d Bug 1008944 - Expose AsyncShutdown barriers for OS.File. r=froydnj 2014-06-17 15:11:00 -04:00
Eddy Bruel
1c230bfb39 Bug 1014141 - Fix a regression in the remote debugger;r=mar.castellucio;r=past 2014-06-18 15:26:53 +02:00
Carsten "Tomcat" Book
17929c3ef6 Merge mozilla-central to fx-team 2014-06-18 14:42:45 +02:00
Jeremy Poulin
7769347d37 Bug 1024639 - Added telemetry tracking for used, total, and unused telemetry connections. r=hurley 2014-06-17 13:35:25 -07:00
Birunthan Mohanathas
f475f7189b Bug 1026535 - Fix mismatched class/struct tags. r=ehsan 2014-06-18 17:57:51 -07:00
Birunthan Mohanathas
ec8396a564 Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin 2014-06-18 17:56:02 -07:00
Michael Ratcliffe
0626f25d04 Bug 1016047 - Stop box model highlighter causing toolbox jumping on small screen r=bgrins 2014-06-11 16:05:22 +01:00
Michael Ratcliffe
cbe5d2d41f Bug 1003569 - Hide node infobar when it is outside the viewport r=jwalker 2014-06-20 12:25:09 +01:00
Michael Ratcliffe
b64c6c1739 Bug 1020984 - Fix highlighter when transforms have width & height of 0 r=pbrosset 2014-06-20 13:32:32 +01:00
Vikneshwar
42a40075c1 Bug 1027622 - Removed obsolete .toolbar-holder CSS rule. r=dao 2014-06-20 14:50:20 +02:00
Patrick Brosset
85a49d809b Bug 1028043 - Clean up unnecessary references to inspector in highlighter.js; r=bgrins 2014-06-20 13:45:05 +02:00
Wes Kocher
b8d6b378bf Merge m-c to fx-team 2014-06-19 18:33:19 -07:00
Wes Kocher
bc83e1f001 Backed out changeset 332504a9d638 (bug 980506) for devtools bustage 2014-06-19 16:22:08 -07:00
Jordan Santell
0341043b95 Bug 980506 - Implement GC listeners for AudioNodes in the WebAudioActor. r=vp
From f5f7afd0e7ff794caae1f8fb1e298f0f57fb014f Mon Sep 17 00:00:00 2001
---
 browser/devtools/webaudioeditor/test/browser.ini   |  2 +
 .../test/browser_webaudio-actor-destroy-node.js    | 41 ++++++++++++++++++
 .../webaudioeditor/test/doc_destroy-nodes.html     | 32 ++++++++++++++
 browser/devtools/webaudioeditor/test/head.js       | 10 +++++
 toolkit/devtools/server/actors/call-watcher.js     |  9 ++--
 toolkit/devtools/server/actors/webaudio.js         | 49 ++++++++++++++++++++++
 6 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 browser/devtools/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
 create mode 100644 browser/devtools/webaudioeditor/test/doc_destroy-nodes.html
2014-06-17 13:04:37 -07:00
Jordan Santell
34256306a2 Bug 1026766 - Support Media AudioNodes in the web audio editor. r=vp
From fe7f1f72bdb00e0ad2d687d40548138de506a4d6 Mon Sep 17 00:00:00 2001
---
 browser/devtools/webaudioeditor/test/browser.ini   |  2 +
 .../test/browser_wa_properties-view-media-nodes.js | 45 ++++++++++++++++++++++
 .../test/doc_media-node-creation.html              | 29 ++++++++++++++
 browser/devtools/webaudioeditor/test/head.js       | 16 ++++++++
 toolkit/devtools/server/actors/webaudio.js         |  7 +++-
 5 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 browser/devtools/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
 create mode 100644 browser/devtools/webaudioeditor/test/doc_media-node-creation.html
2014-06-17 15:54:53 -07:00
Heather Arthur
5c8da4144d Bug 1025521 - Only update @media rule list once per update. r=bgrins 2014-06-15 16:30:00 +02:00
Wes Kocher
27119a093c merge fx-team to m-c a=merge 2014-06-17 18:50:12 -07:00
J. Ryan Stinnett
29d1d1d492 Bug 1021775 - Reply to bulk app install message. r=ochameau 2014-06-16 16:56:00 -04:00
Eddy Bruel
1988c9ea43 Bug 1016301 - Convert testactors.js to use native promises;r=past 2014-06-17 21:53:35 +02:00
Eddy Bruel
f62de5d055 Bug 1003095 - Clean up how we provide several APIs;r=past 2014-06-17 21:51:43 +02:00
Yury Delendik
8323f999d0 Bug 1026256 - Add additional telemetry values for pdf.js. r=yury 2014-06-16 22:17:22 -05:00
Ryan VanderMeulen
deaae864eb Merge m-c to mozilla-inbound. a=merge 2014-06-17 15:43:06 -04:00
Boris Zbarsky
fd7e32dab4 Bug 1019194 part 1. Get rid of nsIIndexedDatabaseManager. r=paul,khuey,mossop 2014-06-17 15:01:47 -04:00
Bill McCloskey
680aedb411 Bug 1024761 - Don't try to send XUL element over message manager channel (r=felipe) 2014-06-17 11:21:12 -07:00
James Long
a9d5ba1636 Bug 1024574 - Make xpcshell tests show RDP logs. r=past 2014-06-12 09:59:00 -04:00
Carsten "Tomcat" Book
86bbfb82a8 merge fx-team to mozilla-central a=merge 2014-06-17 14:09:46 +02:00