5c359d92c8
merge mozilla-inbound to mozilla-central a=merge
2015-11-10 11:59:34 +01:00
ade40baf2d
Bug 938994 - Move build/mobile/robocop into mobile/android/tests/browser/robocop. r=gbrown
...
This builds the Robocop tests with |mach build mobile/android|, making
it easier for developers to build Fennec and the tests at the same
time.
--HG--
rename : build/mobile/robocop/AndroidManifest.xml.in => mobile/android/tests/browser/robocop/AndroidManifest.xml.in
rename : build/mobile/robocop/Makefile.in => mobile/android/tests/browser/robocop/Makefile.in
rename : build/mobile/robocop/README => mobile/android/tests/browser/robocop/README
rename : build/mobile/robocop/moz.build => mobile/android/tests/browser/robocop/moz.build
rename : build/mobile/robocop/res/values/strings.xml => mobile/android/tests/browser/robocop/res/values/strings.xml
rename : build/mobile/robocop/robotium-solo-4.3.1.jar => mobile/android/tests/browser/robocop/robotium-solo-4.3.1.jar
extra : commitid : BuNBjgXdm1d
extra : rebase_source : c36b8bf0183d8f5821b7f7839668ca963065d894
extra : histedit_source : a86fef3b834420ea496a9c2644ca72786a2d7da9
2015-11-09 12:55:38 -08:00
3b93da9d48
Bug 1208167 - Telemetry probe for click-to-play images r=mfinkle,ally
...
- A telemetry probe for when a user clicks to unblock an image.
- A second probe for sending the size of the image being unblocked.
Since we don't have information on the image size the best option
was to make make an XHR HEAD request. We make an approximation
of the image size from the content length which we send in kB.
--HG--
extra : commitid : G0ixOr8xmju
extra : rebase_source : cfb7d0d5777f6d0c657f6aafa18c58ec2b882789
2015-10-29 02:15:41 -04:00
ab0808d7b1
Bug 1194986 - fix consumeanchor inheritance on badged and menu-button buttons, r=jaws
...
--HG--
extra : commitid : 1LF4LuGyqzX
extra : rebase_source : 734db6fe8714242125b8e87c8458ca3c8a6633cb
extra : amend_source : fb11408a93ec0b52783bceb8c89f49b1e1dd0cbe
2015-11-04 20:16:26 +00:00
2ef375af3f
Bug 1217073 - Update restricted profile toggles to account for new settings organization. r=sebastian
...
--HG--
extra : commitid : 3amJfMfOEPv
extra : rebase_source : 8c9f38614d37608448c4ffedadfc7ee737e9827e
2015-11-06 17:26:03 -05:00
fa0974c68e
Bug 1210703 - fix toolkit theme overlap, r=dao
...
--HG--
extra : commitid : 5R9wy1enkoL
extra : rebase_source : 1feee16e611c1ce68f86e7806c5dc21cf89dbecd
2015-11-09 15:22:24 +00:00
4ae0332034
Merge mozilla-central to fx-team
2015-11-09 14:59:44 +01:00
1b3c24bb15
Bug 1222503 - Fix Telemetry not reporting any GMPlugns. r=gfritzsche
2015-11-06 09:51:00 +01:00
11f2e3253c
Bug 1220246 - fix test_geodefaults.js to avoid failing when the http server takes more than 1000ms to reply, r=Gijs.
2015-11-06 15:53:11 +01:00
7abd0ba4b7
Bug 1192433: Return an empty list rather than throwing an error when attempting to read a directory in an app: URL (fixes M1 bustage). r=trivial
...
--HG--
extra : commitid : IGRDtHsZdIv
extra : rebase_source : 973bc727663a864cf497c1f2239ee34b74374b35
2015-11-05 20:13:19 -08:00
0614b39cb9
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : J6I6LGuQcFJ
2015-11-05 18:47:26 -08:00
0069e6af90
Merge inbound to central, a=merge
...
--HG--
extra : commitid : 426lsCwC1FX
2015-11-05 18:44:24 -08:00
0cb3e0be35
Bug 1221697 - Add a telemetry probe for time-to-composite. r=kats
2015-11-05 10:24:12 -08:00
4a1b170b2c
Bug 1192433: Part 3 - Support localized names and descriptions in WebExtension manifests. r=Mossop
...
--HG--
extra : commitid : 79RHXd1mZtp
extra : rebase_source : 3bbd8ae3184d58ba5d2c1d332e0209fb2d0a19ef
2015-11-02 16:50:42 -08:00
8863e4ca89
Bug 1210879 - remove unused searchengine files, r=gijs
...
--HG--
extra : commitid : LoEIqgMYNwX
extra : amend_source : 17ba5698facfe0b4fe4b04368dbf8a8b1f8dabc7
2015-11-05 16:36:54 +00:00
0a34392a9e
Merge mozilla-central to fx-team
2015-11-05 12:17:28 +01:00
bb068eacd7
merge mozilla-inbound to mozilla-central a=merge
...
--HG--
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
2015-11-05 11:58:55 +01:00
c7e3e516d1
Bug 1182722 - Fix l10n-check on Windows. r=me on a CLOSED TREE
2015-11-04 22:44:30 -06:00
a56cc47ac7
Bug 1221185 - Enable more e10s tests in toolkit/mozapps/extensions/test/browser/. r=felipe
2015-11-03 09:12:00 +01:00
4926726649
Bug 1191557 - User inner-window-destroyed notification (r=kmag)
2015-11-04 13:40:15 -08:00
e18450690a
Bug 1192433: Part 2 - [webext] Allow loading and querying all available locales. r=billm
...
--HG--
extra : commitid : 2Rg9jCXTjYd
extra : rebase_source : 092d6dd0d0ea56227a9b78cc4871cd55fe810d81
2015-10-30 12:09:55 +01:00
8de53e6e63
Bug 1192433: Part 1 - [webext] Split Extension class to allow accessing data from non-running extensions. r=billm
...
--HG--
extra : commitid : HgrqIT04IEH
extra : rebase_source : 3825c166f65716f2ea4cb5b390793569c74ca359
2015-10-30 12:01:40 +01:00
30c2dfa81b
Bug 1220878-switch Hello from React.addons.classSet to classnames package, r=edilee,gerv
2015-11-05 16:40:11 -08:00
f0fa455c61
Bug 1173583 - Make autocompletion from the username field work outside of <form>. r=MattN
...
--HG--
extra : commitid : 6OTlSjPqFHy
extra : rebase_source : da9e041025fe8e489b5c47765838d70af3649151
2015-10-29 16:44:20 -04:00
5d6812e289
Bug 1182722 - Move DevTools l10n files. r=ochameau,glandium,Pike,bgrins
...
Move DevTools l10n files under /devtools/client and /devtools/shared.
A script is attached to the bug for l10n repos to migrate their strings.
--HG--
rename : browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd => devtools/client/locales/en-US/VariablesView.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd => devtools/client/locales/en-US/aboutdebugging.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties => devtools/client/locales/en-US/aboutdebugging.properties
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd => devtools/client/locales/en-US/animationinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.properties => devtools/client/locales/en-US/animationinspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/app-manager.properties => devtools/client/locales/en-US/app-manager.properties
rename : browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties => devtools/client/locales/en-US/appcacheutils.properties
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd => devtools/client/locales/en-US/canvasdebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties => devtools/client/locales/en-US/canvasdebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd => devtools/client/locales/en-US/connection-screen.dtd
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.properties => devtools/client/locales/en-US/connection-screen.properties
rename : browser/locales/en-US/chrome/browser/devtools/debugger.dtd => devtools/client/locales/en-US/debugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/debugger.properties => devtools/client/locales/en-US/debugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/device.properties => devtools/client/locales/en-US/device.properties
rename : browser/locales/en-US/chrome/browser/devtools/eyedropper.properties => devtools/client/locales/en-US/eyedropper.properties
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd => devtools/client/locales/en-US/filterwidget.dtd
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.properties => devtools/client/locales/en-US/filterwidget.properties
rename : browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd => devtools/client/locales/en-US/font-inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/graphs.properties => devtools/client/locales/en-US/graphs.properties
rename : browser/locales/en-US/chrome/browser/devtools/har.properties => devtools/client/locales/en-US/har.properties
rename : browser/locales/en-US/chrome/browser/devtools/inspector.dtd => devtools/client/locales/en-US/inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/inspector.properties => devtools/client/locales/en-US/inspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/jsonview.properties => devtools/client/locales/en-US/jsonview.properties
rename : browser/locales/en-US/chrome/browser/devtools/layoutview.dtd => devtools/client/locales/en-US/layoutview.dtd
rename : browser/locales/en-US/chrome/browser/devtools/markers.properties => devtools/client/locales/en-US/markers.properties
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd => devtools/client/locales/en-US/netmonitor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.properties => devtools/client/locales/en-US/netmonitor.properties
rename : browser/locales/en-US/chrome/browser/devtools/performance.dtd => devtools/client/locales/en-US/performance.dtd
rename : browser/locales/en-US/chrome/browser/devtools/performance.properties => devtools/client/locales/en-US/performance.properties
rename : browser/locales/en-US/chrome/browser/devtools/projecteditor.properties => devtools/client/locales/en-US/projecteditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd => devtools/client/locales/en-US/promisedebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties => devtools/client/locales/en-US/promisedebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties => devtools/client/locales/en-US/responsiveUI.properties
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd => devtools/client/locales/en-US/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.properties => devtools/client/locales/en-US/scratchpad.properties
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd => devtools/client/locales/en-US/shadereditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.properties => devtools/client/locales/en-US/shadereditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/shared.properties => devtools/client/locales/en-US/shared.properties
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd => devtools/client/locales/en-US/sourceeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties => devtools/client/locales/en-US/sourceeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/storage.properties => devtools/client/locales/en-US/storage.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd => devtools/client/locales/en-US/styleeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.properties => devtools/client/locales/en-US/styleeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd => devtools/client/locales/en-US/styleinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/tilt.properties => devtools/client/locales/en-US/tilt.properties
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.dtd => devtools/client/locales/en-US/toolbox.dtd
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.properties => devtools/client/locales/en-US/toolbox.properties
rename : browser/locales/en-US/chrome/browser/devtools/webConsole.dtd => devtools/client/locales/en-US/webConsole.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd => devtools/client/locales/en-US/webaudioeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties => devtools/client/locales/en-US/webaudioeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/webconsole.properties => devtools/client/locales/en-US/webconsole.properties
rename : browser/locales/en-US/chrome/browser/devtools/webide.dtd => devtools/client/locales/en-US/webide.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webide.properties => devtools/client/locales/en-US/webide.properties
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd => devtools/shared/locales/en-US/csscoverage.dtd
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties => devtools/shared/locales/en-US/csscoverage.properties
rename : toolkit/locales/en-US/chrome/global/devtools/debugger.properties => devtools/shared/locales/en-US/debugger.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gcli.properties => devtools/shared/locales/en-US/gcli.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties => devtools/shared/locales/en-US/gclicommands.properties
rename : toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties => devtools/shared/locales/en-US/styleinspector.properties
extra : commitid : 8hcm3tr7AAi
2015-11-04 15:35:53 -06:00
7299e7329c
Bug 1219240 - Telemetry probe to measure user interaction with reader view button. r=mfinkle,vladan
...
--HG--
extra : commitid : AkVI6BQJXxc
extra : rebase_source : 63312b16c2d837bb986e3af33f20669425273d38
2015-10-28 17:07:24 -04:00
3a98b54f34
Bug 1221356 - Don't package mozharness for Thunderbird builds. r=gps
...
--HG--
extra : rebase_source : ca3f0cb22899616c4eb1c28b8256f7f33f6ddf54
2015-11-04 01:26:46 +01:00
87ca5f5de2
Merge mozilla-central to mozilla-inbound
2015-11-05 12:15:35 +01:00
d9df20222c
Bug 1216250 - Limit amount of DOM Storage data stored by Session Restore. r=ttaubert
...
DOM Storage is a pretty inefficient and memory-hungry storage mechanism. Session Store attempts to record DOM Storage for each tab, which leads to (possibly very large) objects being serialized once to be sent from frame/content to parent and once to be sent from the main thread to the I/O thread. This is a suspect behind a number of crashes (see bug 1106264 for a discussion on the topic).
This patch limits the amount of DOM Storage that Session Restore attempts to store. We perform a quick estimate on the amount of memory needed to serialize DOM Storage and prevent storage larger than ~10M chars being sent from frame/content to the parent. Once this patch has landed, we will need to watch FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS to find out whether our threshold is meaningful.
--HG--
extra : transplant_source : %26%07%ADzjT%A9%E3%B9%B9%EC%9D%97n%23%B5%F2%DAZ%CD
2015-10-20 14:15:17 +02:00
9f7aafb6cf
Bug 1213568: Maximize standalone video when pressing F11. r=bz
...
--HG--
extra : commitid : MYYsTaF8BS
extra : rebase_source : 97d336cf5133140a044edade08a9ded1bf46b4e0
2015-10-10 00:27:49 +02:00
3e11f2fe34
merge mozilla-inbound to mozilla-central a=merge
2015-11-04 11:59:46 +01:00
15320b5333
merge fx-team to mozilla-central a=merge
2015-11-04 11:57:59 +01:00
12f67129e4
Merge mozilla-central to b2g-inbound
2015-11-03 12:14:19 +01:00
8232c46c4f
merge mozilla-inbound to mozilla-central a=merge
2015-11-03 12:00:30 +01:00
902cea2b9a
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : 9dyZ3yocWTJ
2015-11-02 15:59:07 -08:00
3696443a14
Merge inbound to m-c a=merge
...
--HG--
extra : commitid : Iy93sktRpdv
2015-11-02 15:12:16 -08:00
3193935f35
Bug 1220376 - Use %1$S instead of %1$s. r=gfritzsche
...
'%1$s' only takes the first character of the format parameter.
--HG--
extra : commitid : 1VbdalRLYyh
extra : amend_source : de65bdb1099a3cbd627f15216091a0b085569260
2015-11-02 06:37:00 -08:00
7a70d4ebe3
Merge mozilla-central to fx-team
2015-11-02 12:05:19 +01:00
c544f0d430
merge mozilla-inbound to mozilla-central a=merge
2015-11-02 11:54:07 +01:00
1c94c75132
Bug 1219878 - [Metrics] There is no histogram definition for uss memory ('enhanced' metrics). r=vladan
2015-11-02 09:51:03 -08:00
9985829ecc
Bug 1219392 - Capitalize mozilla::unused to avoid conflicts. r=froydnj
2015-11-02 07:53:26 +02:00
3b20ee2cf4
Bug 1220442 - Check if safe browsing's updateCheckers have already been set to null. r=gcp
2015-11-01 10:16:42 +01:00
f3b461c82a
Backout bug 1220442 for typo in bug number. r=backout
2015-11-01 21:20:17 +01:00
5e3f00c149
Bug 1220422 - Check if safe browsing's updateCheckers have already been set to null. r=gcp
2015-11-01 10:16:42 +01:00
fbf89fb02e
Bug 120684 - use ChromeNodeList in toolkit's listboxes' selectedItems implementation, r=dao,smaug
...
--HG--
extra : commitid : DzQPAIbbhpX
extra : rebase_source : 4bd9ac283e1c789c2577dc5d4cc85511f35ac27d
2015-10-26 17:25:29 +01:00
0ebfb49f0c
Bug 1219733 - Allow a 'bug_numbers' field in Histograms.json entries. r=vladan
2015-11-02 11:32:53 +01:00
12489bbca0
Bug 1220407 - include sys/resource.h for struct rusage and getrusage() on all unices, not linux only. r=yoric
2015-10-31 14:49:00 +01:00
dbee79bdd5
Bug 1211599 - Only allow whitelisted histograms to have > 100 buckets. r=nfroyd
2015-10-28 07:09:00 +01:00
501c275eec
Bug 1205843 - Part 2: Disable maintenance service on WinXP < SP3 - r=rstrong
...
Attempt to get around the fact that XP SP2 (and below) systems won't be able to
handle Authenticode signatues with SHA-2 digests by disabling the maintenance
service, the only thing on our update path that uses Authenticode, on systems
running WinXP below SP3.
This patch both prevents the service from being included in new installations,
and prevents the service from being used where it is already installed.
--HG--
extra : transplant_source : %F7%BE%0B%FDYd%CF%24%E7%B2%A5l%40%8D%E5%81%88F%E4%07
2015-10-27 14:31:34 -07:00
9768c79d20
Bug 1213632: Prevent WebExtensions from using versioned JavaScript. r=billm
...
--HG--
extra : commitid : 3aQ4wS5I7LP
extra : rebase_source : 252277140f700ab305877f3bfd0ba9b582ff0b7a
2015-10-22 23:25:43 -07:00
Carsten "Tomcat" Book
Nick Alexander
Jonathan Almeida [:jonalmeida]
Gijs Kruitbosch
Margaret Leibovic
Alessio Placitelli
Florian Quèze
Kris Maglione
Wes Kocher
Mason Chang
Eduard Hanu
J. Ryan Stinnett
Andrew McCreight
Bill McCloskey
Dan Mosedale
Andrew Krawchyk
aleth
David Rajchenbach-Teller
Steffen Wilberg
Chris H-C
Russ Nicoletti
Birunthan Mohanathas
Sebastian Hengst
Georg Fritzsche
Landry Breuil
Matt Howell