Ryan VanderMeulen
f4b0acaa11
Merge fx-team to m-c. a=merge
2014-10-31 16:16:38 -04:00
Panos Astithas
bd868bfd71
Don't use the aurora-specific profile by default, if this is not aurora (bug 1090967). r=bsmedberg
...
--HG--
extra : rebase_source : 5bfd3551ed6305e0a58ad1be98e60d210ba78730
2014-10-31 17:25:34 +02:00
Althaf Hameez
05091f1634
Bug 1090205 - Move getReversedHost from Bookmarks.jsm to PlacesUtils. r=mak
2014-10-30 17:36:00 -04:00
Georg Fritzsche
da5565617c
Bug 1069874 - Add keyed histogram types. r=froydnj
2014-10-30 20:51:01 +01:00
Georg Fritzsche
bc8f16cd33
Bug 1069953 - Part 1: Make min/max/bucket_count optional for nsITelemetry newHistogram(). r=froydnj
2014-10-28 12:47:38 +01:00
Carsten "Tomcat" Book
1ddef21ea8
Backed out changeset 77052db08766 (bug 611388)
2014-10-31 13:12:18 +01:00
David Rajchenbach-Teller
05ddb95d48
Bug 1083989
- Adapting e10s mochitests that expect Promise.jsm in the scope. r=yoric
2014-10-30 23:39:48 +01:00
David Rajchenbach-Teller
c4629ef361
Bug 1083989
- Adapting Devtools tests that expect Promise.jsm in the scope. r=paul
2014-10-27 22:45:03 +01:00
Nick Fitzgerald
1d2453ddd8
Bug 1087054 - Actually use the source map request cache. r=past
2014-10-27 14:08:00 -04:00
Brad Lassey
700f51942f
bug 1092163 - back out changeset a6240694a609 (bug 1088904
) for causing bug 1092163 r=jimm
2014-10-31 12:45:50 -04:00
Blake Kaplan
3d1299294d
Bug 1056018 - Mark the a few IPC calls as urgent priority to deal with edge cases involving CPOWs. r=billm (with one bugfix written by him and r=me)
2014-10-30 15:51:39 -07:00
Ryan VanderMeulen
618a8fabc6
Merge m-c to inbound. a=merge
...
--HG--
rename : dom/tv/test/file_app.sjs => dom/tv/test/mochitest/file_app.sjs
rename : dom/tv/test/file_app.template.webapp => dom/tv/test/mochitest/file_app.template.webapp
rename : dom/tv/test/file_tv_non_permitted_app.html => dom/tv/test/mochitest/file_tv_non_permitted_app.html
rename : dom/tv/test/mochitest.ini => dom/tv/test/mochitest/mochitest.ini
rename : dom/tv/test/test_tv_non_permitted_app.html => dom/tv/test/mochitest/test_tv_non_permitted_app.html
extra : rebase_source : 43e1262bc9912ae6b97ec9302a1bc149e51c8e1e
2014-10-30 16:19:07 -04:00
Ryan VanderMeulen
40eb4a65d8
Merge b2g-inbound to m-c. a=merge
2014-10-30 15:58:07 -04:00
David Keeler
2fa7ba1743
bug 1085509
- add telemetry for how many permanent certificate overrides users have r=mmc r=jcj
2014-10-29 16:25:16 -07:00
Masatoshi Kimura
bcda188339
Bug 1088915 - Stop offering RC4 in the first handshakes. r=keeler
2014-10-22 01:11:29 +09:00
Dave Camp
ec3c49661b
Bug 1081689 - Allow unregistration of a protocol.js type. r=paul
2014-10-12 09:18:00 +03:00
J. Ryan Stinnett
1fe96f430c
Bug 1090450 - Properly check add-on update state during update interval. r=Mossop
...
A refactoring in bug 995108 inadvertently disabled background add-on updates by
moving the timer handler to AddonManagerPrivate without fixing the values the
method uses to point to meaningful locations.
2014-10-28 20:26:00 -04:00
Carsten "Tomcat" Book
b26432a3ec
Merge mozilla-central to fx-team
2014-10-30 15:16:37 +01:00
Carsten "Tomcat" Book
72ea59b550
merge fx-team to mozilla-central a=merge
2014-10-30 14:49:31 +01:00
David Rajchenbach-Teller
7abbe11005
Bug 1087674 - Handle XHR abort()/timeout and certificate errors more gracefully in GMPInstallmanager. r=gfritzsche
...
Prior to this patch, a Man in the Middle (MITM) attack on SSL could cause GMPInstallManager to fail during the check for updates, which in turn would cause a crash during shutdown. This was observed in the wild by users of recent versions of Avast, which performs such attacks on SSL as part of its "HTTPS scanning" feature. With this patch, errors are handled more gracefully. The attack still prevents any update (including the install of OpenH264) but at least it does not cause a crash anymore.
2014-10-30 11:27:02 +01:00
Mike Hommey
47c853314f
Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
...
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.
Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.
Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
2014-10-30 13:06:12 +09:00
Mike Hommey
0cd72b4901
Bug 1077148 part 3 - Do not link PrimitiveTest, SimpleTypeLib, TestAUSHelper, TestAUSReadStrings and screentopng against mozglue on Linux. r=gps
...
There is no reason these should be linked to mozglue on Linux only. This
makes the intent clearer for the related changes in part 4.
2014-10-30 13:06:04 +09:00
Dave Townsend
33002c3689
Bug 1075658: Make browser.loadURI synchronously update the browser remoteness. r=ttaubert
2014-10-29 13:26:14 -07:00
Ryan VanderMeulen
a4bc246b14
Merge m-c to inbound. a=merge
2014-10-29 16:51:39 -04:00
Monica Chew
4b6c70b098
Bug 1088904: Disable e10s autostart and prompt when tracking protection is enabled (r=felipe,billm)
2014-10-27 11:37:16 -07:00
Carsten "Tomcat" Book
ec3e0f1265
merge fx-team to mozilla-central a=merge
2014-10-29 13:31:40 +01:00
Carsten "Tomcat" Book
059bc8bcd2
Backed out changeset 48099863baec (bug 1075438) for add-on bustage
2014-10-29 12:57:14 +01:00
Phil Ringnalda
f500006515
Back out 8a1dfdaaeb3c (bug 1063156) for Android bustage
...
CLOSED TREE
2014-10-28 23:26:07 -07:00
Allison Naaktgeboren
12e9fe5781
Bug 1063156 - Enable e10s shims by default, even when browser.tabs.remote.autostart pref is false.r=billm
2014-10-28 22:08:07 -07:00
Mike Conley
6f3cd935e0
Bug 1082575 - Make PrintUtils and printPreviewBindings.xml more e10s friendly. r=Mossop.
...
--HG--
extra : rebase_source : c26a2bb4b84cb8ce7bbbdf8dc3e05793cb118a3d
2014-10-28 10:58:07 -04:00
Kyle Huey
676dcb5e20
Bug 1090598: Once we have hit the ah_crap_handler, allow any process (such as gdb) to ptrace us. r=froydnj
2014-10-28 18:27:53 -07:00
Tim Nguyen
3481ab94f3
Bug 1053434 - CSS changes for DevEdition on Windows. r=Gijs
2014-10-28 16:51:41 -07:00
Etienne Segonzac
2315b2d0d9
Bug 1082652 - [b2g-desktop] Dispatch touchstart/touchend on the system app to match on device behavior. r=ochameau
2014-10-17 07:14:00 -04:00
Ryan VanderMeulen
10b87c9f24
Merge inbound to m-c. a=merge
2014-10-28 16:10:05 -04:00
Ryan VanderMeulen
153ae6e6ce
Backed out changeset fa5969baa9a9 (bug 1044020) for ASAN leaks.
...
CLOSED TREE
2014-10-28 14:22:25 -04:00
Steven Michaud
574535f470
Bug 1088938 - Allow annotations set using CrashReporter::AnnotateCrashReport() to be removed subsequently. r=ted
2014-10-28 11:08:46 -05:00
Gaurav Rai
086f2a8caa
Bug 1075438 - Removed readTo function from two files and fixed read function to work without readTo.Also removed the test for readTo function from mochi and xpcshell tests. r=Yoric
2014-10-27 06:59:00 -04:00
Paul Rouget
964675ce55
Bug 1073584 - timeline.js: support root actor. r=pbrosset
2014-10-28 02:21:00 -04:00
Carsten "Tomcat" Book
51b468217d
merge fx-team to mozilla-central a=merge
2014-10-28 15:20:23 +01:00
Carsten "Tomcat" Book
b4bfea0bd6
Backed out changeset b591ad43d53e (bug 1085509
)
2014-10-28 14:09:44 +01:00
Wes Kocher
7c8bee6a68
Merge fx-team to m-c a=merge
2014-10-27 17:49:25 -07:00
Wes Kocher
d39bee3e52
Merge inbound to m-c a=merge
2014-10-27 17:27:13 -07:00
Wes Kocher
c0d1485126
Backed out changeset 4e5999f39bb7 (bug 1082575) for bc1 orange on a CLOSED TREE
2014-10-27 15:45:51 -07:00
David Keeler
90283cf32b
bug 1085509
- add telemetry for how many permanent certificate overrides users have r=mmc r=jcj
2014-10-27 09:32:33 -07:00
Sparsh Paliwal
b58bf185e4
Bug 1088578 - Replace rgba(...,0) and hsla(...,0) with 'transparent' in CSS gradients. r=dao
2014-10-26 11:08:00 +01:00
Alexandre Poirot
69fccd83fd
Bug 1019714 - Forbid overloading apps not being pushed via devtools. r=jryans, r=fabrice
2014-10-27 11:17:40 -04:00
Carsten "Tomcat" Book
38668bd0ef
merge fx-team to mozilla-central a=merge
2014-10-27 15:56:31 +01:00
Carsten "Tomcat" Book
8f9ca11b22
merge mozilla-inbound to mozilla-central a=merge
2014-10-27 15:50:43 +01:00
Fabrice Desré
76d467444b
Bug 1088800 - Apps fail to launch on b2g desktop with OOP enabled r=bholley
2014-10-26 13:32:26 -07:00
Phil Ringnalda
eab7ec3c8b
Merge b-i to m-c, a=merge
2014-10-26 09:42:41 -07:00