Nick Alexander
4b1bd40609
Bug 976699 - Place architecture specific assets in assets/$(ANDROID_CPU_ARCH). r=glandium
2014-11-03 20:04:20 -08:00
Stephen Pohl
dbfd76eadc
Bug 1091109: Followup to fix test failures. r=myk
2014-11-03 17:13:20 -05:00
Stephen Pohl
9c340b2c43
Bug 1091109: Don't sign webapprt-stub on OSX because webapps fail to launch due to quarantine bit. r=smichaud,myk
2014-11-03 17:13:16 -05:00
Ryan VanderMeulen
3e14f64be4
Merge fx-team to m-c. a=merge
2014-11-03 16:47:18 -05:00
Panos Astithas
e91463ccc0
Bug 1090967 part 2 - Don't use "default" as the name of the default profile on Aurora. r=bsmedberg
2014-11-03 16:38:54 +02:00
Akshendra Pratap
8525cfed49
Bug 1064365 - Deprecated GetKeywordForURI. r=mak
2014-10-31 06:35:00 +01:00
Gavin Sharp
86128fa211
Re-land patch from bug 1088904
2014-11-02 14:56:17 -08:00
Phil Ringnalda
40f98f6be9
Merge b-i to m-c, a=merge
2014-11-02 09:03:04 -08:00
Phil Ringnalda
3207cbeaa2
Merge f-t to m-c, a=merge
2014-11-02 08:55:19 -08:00
Kyle Huey
0d851fffc2
Bug 820716: Disable MOZ_ASSERT(OOPInitialized()). no-review
2014-11-01 08:45:25 -07:00
Ryan VanderMeulen
26d2f595c7
Backed out changeset 5eebce6c8845 (bug 1091109) for webapp test failures.
2014-11-01 00:15:44 -04:00
Allison Naaktgeboren
8a59a0a606
Bug 1063156 - Enable e10s shims by default, even when browser.tabs.remote.autostart pref is false.r=billm
2014-10-31 17:44:58 -07:00
Ryan VanderMeulen
e7353cb4a6
Merge fx-team to m-c. a=merge
2014-10-31 16:16:38 -04:00
Panos Astithas
d7346c38d4
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
38a8007713
Bug 1090205 - Move getReversedHost from Bookmarks.jsm to PlacesUtils. r=mak
2014-10-30 17:36:00 -04:00
Georg Fritzsche
2767c3f14a
Bug 1069874 - Add keyed histogram types. r=froydnj
2014-10-30 20:51:01 +01:00
Georg Fritzsche
b6d0063f79
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
74eaea3f51
Backed out changeset 77052db08766 (bug 611388)
2014-10-31 13:12:18 +01:00
David Rajchenbach-Teller
6f79d6fee9
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
0b22cd2596
Bug 1083989 - Adapting Devtools tests that expect Promise.jsm in the scope. r=paul
2014-10-27 22:45:03 +01:00
Nick Fitzgerald
f6ad6d6d08
Bug 1087054 - Actually use the source map request cache. r=past
2014-10-27 14:08:00 -04:00
Brad Lassey
5426e7f547
bug 1092163 - back out changeset a6240694a609 (bug 1088904) for causing bug 1092163 r=jimm
2014-10-31 12:45:50 -04:00
Blake Kaplan
fb67749925
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
d18b779a40
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
8c34f2b388
Merge b2g-inbound to m-c. a=merge
2014-10-30 15:58:07 -04:00
Stephen Pohl
b4fd3bc4b5
Bug 1091109: Don't sign webapprt-stub on OSX because webapps fail to launch due to quarantine bit. r=smichaud,myk
2014-10-31 20:39:07 -04:00
Georg Fritzsche
e9686e7bbe
Bug 1089670 - Record searches in Telemetry. r=bwinton
2014-10-31 21:47:13 +01:00
Georg Fritzsche
7038f23d85
Bug 1092176 - Add keyed histogram section in about:telemetry. r=froydnj
2014-10-31 21:47:13 +01:00
Georg Fritzsche
78189842a9
Bug 1092219 - Fix keyedHistogram.add() passing the wrong argument to Histogram::Add(). r=froydnj
2014-10-31 21:47:12 +01:00
David Keeler
0b77e828f8
bug 1085509 - add telemetry for how many permanent certificate overrides users have r=mmc r=jcj
2014-10-29 16:25:16 -07:00
Georg Fritzsche
d3d7e3a685
Bug 1069953 - Part 2: Make min/max/bucket_count optional for nsITelemetry registerAddonHistogram(). r=froydnj
2014-10-17 17:38:43 +02:00
Bill McCloskey
7ab580e6f0
Bug 1091953 - [e10s] Add missing argument for about: protocol shim (r=mconley)
2014-11-03 07:10:27 -08:00
Bill McCloskey
564d056326
Bug 1091959 - [e10s] Reduce number of messages used for content policy shim (r=mconley)
2014-11-03 07:10:27 -08:00
Bill McCloskey
076c4996ba
Bug 1092444 - [e10s] Add test for expanded principal sandboxes (r=mconley)
2014-11-03 07:10:27 -08:00
Bill McCloskey
4ce05eed23
Bug 1092444 - [e10s] Add shim support for expanded principal sandboxes (r=mconley)
2014-11-03 07:10:27 -08:00
Masatoshi Kimura
b7148d9fc4
Bug 1091608 - Attach the console if the process is running the GTest. r=ted
2014-11-03 22:22:39 +09:00
Jacek Caban
972d8d67b1
Bug 856566 - Fix crashreporter compilation and profiler on mingw. r=ted
...
--HG--
extra : rebase_source : def8db32e1474876ea10cc3f106a2ce75acda8e9
2014-11-03 14:15:17 +01:00
Masatoshi Kimura
72b1c83560
Bug 1088915 - Stop offering RC4 in the first handshakes. r=keeler
2014-10-22 01:11:29 +09:00
Dave Camp
db52304165
Bug 1081689 - Allow unregistration of a protocol.js type. r=paul
2014-10-12 09:18:00 +03:00
J. Ryan Stinnett
622df41542
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
b594586d35
Merge mozilla-central to fx-team
2014-10-30 15:16:37 +01:00
Carsten "Tomcat" Book
c061fbc484
merge fx-team to mozilla-central a=merge
2014-10-30 14:49:31 +01:00
David Rajchenbach-Teller
53e4b14b6f
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
d667f4bb59
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
6bcd36f9cd
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
848b7faf85
Bug 1075658: Make browser.loadURI synchronously update the browser remoteness. r=ttaubert
2014-10-29 13:26:14 -07:00
Ryan VanderMeulen
bcc3ab5ec1
Merge m-c to inbound. a=merge
2014-10-29 16:51:39 -04:00
Monica Chew
19907f349a
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
af77b8b7d6
merge fx-team to mozilla-central a=merge
2014-10-29 13:31:40 +01:00
Carsten "Tomcat" Book
6a87d3f589
Backed out changeset 48099863baec (bug 1075438) for add-on bustage
2014-10-29 12:57:14 +01:00
