Commit Graph

420833 Commits

Author SHA1 Message Date
Wes Kocher
7a898726ae Merge b2ginbound to m-c a=merge CLOSED TREE 2015-05-07 15:23:42 -07:00
Wes Kocher
21cde85b46 Merge inbound to m-c a=merge 2015-05-07 15:12:38 -07:00
B2G Bumper Bot
ee187a11a7 Bumping manifests a=b2g-bump 2015-05-07 15:01:55 -07:00
B2G Bumper Bot
fa3ab04c3e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/14d4b951363a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29938 from KevinGrandon/bug_1161545_contact_matching_list_escaping

Bug 1161545 - Use tagged template library for contact matcher

========

https://hg.mozilla.org/integration/gaia-central/rev/9be73f58f1e3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1161545 - Use tagged template library for contact matcher r=francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/97a907b3864e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29939 from KevinGrandon/bug_1161545_dialer_number_tagged_library

Bug 1161545 - Use tagged template library for dialer suggestion

========

https://hg.mozilla.org/integration/gaia-central/rev/05ceddd9af59
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1161545 - Use tagged template library for dialer suggestion r=gsvelto
2015-05-07 14:59:38 -07:00
B2G Bumper Bot
eb68474c1a Bumping manifests a=b2g-bump 2015-05-07 14:17:33 -07:00
B2G Bumper Bot
be4037902e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b57a789528fa
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1113969 - merge pull request #29795 from gabrielesvelto:bug-1113969-wappush-l10n to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/0aa3f61d8ae5
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1113969 - Get rid of the deprecated mozL10n.get uses r=gandalf,julienw
2015-05-07 14:15:12 -07:00
Wes Kocher
69af8d694d Backed out changeset 2b3aaabb8026 (bug 1161299) for f5 orange 2015-05-07 13:44:28 -07:00
B2G Bumper Bot
4b4724aae6 Bumping manifests a=b2g-bump 2015-05-07 12:53:26 -07:00
B2G Bumper Bot
1e7e2516e7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/68b48659a34c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156701 - merge pull request #29706 from mikehenrty:bug-1156701-download-icons to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/afc53c7aa15f
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1156701 - Update download icons to be dark against white bg

========

https://hg.mozilla.org/integration/gaia-central/rev/63c87e2a2413
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1161481 - merge pull request #29898 from autonome:1161481-theme-transitions to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/3118c6a4d84f
Author: autonome <autonome@gmail.com>
Desc: Bug 1161481 - Changing the theme will break all transitions (r=etienne)
2015-05-07 12:50:28 -07:00
B2G Bumper Bot
62ee5aacc5 Bumping manifests a=b2g-bump 2015-05-07 12:32:50 -07:00
B2G Bumper Bot
19cffed177 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8b25f1edadcb
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #29952 from mwargers/1162645

Bug 1162645 - Disable test_gallery_flick.py until it gets fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/6240f11467a8
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1162645 - Disable test_gallery_flick.py until it gets fixed
2015-05-07 12:30:31 -07:00
Ralph Giles
c832f2d6d6 Bug 1161339 - Add gtest calling rust code. r=cajbir
This is mostly to verify compilation and linkage.
The test itself just verifies the contents of an
returned string.

--HG--
extra : rebase_source : b35f41d565c6fda85ad010a328cd61b3c37681da
2015-05-07 12:15:00 -07:00
Ralph Giles
2ea918802d Bug 1161339 - Add rust support to moz.build. r=ted
Add .rs as a recognized file extension in SOURCES.

Propagate that through to the Makefile backend and add a dependency
generated and an explicit rule to call $(RUSTC) to compile them.

rustc builds static libraries, not obj files. At least, if one
asks it to output an obj file, I'm not clear how to get all the
compiler-specific runtime libraries the code will expect to link
to. Therefore we generate a static library for each rust source
file (which must be a complete crate for the time being) and link
that. Because of the extension it ends up on the LIBS line in the
the corresponding .desc file.

Note that the static library does still depend on some system
libraries, e.g. -ldl -lpthread -lm on linux. Gecko already
links to all of those, so we don't keep track of it here.

Should we need to add explicit linkage for other targets,
rustc does print a list to stderr which can be parsed.

--HG--
extra : rebase_source : 9f66101fd15a649a952d5481cf9561416204272a
2015-05-08 15:18:00 -07:00
Boris Zbarsky
59ea7eac31 Bug 1162013. Process the Promise queue between adjacent setTimeout callback invocations when we're going through the callback list without returning to the event loop. r=smaug 2015-05-07 14:49:31 -04:00
Chris Pearce
d383fa3c40 Bug 1160382 - Verify that Adobe EME plugin exists before instantiating it. r=edwin 2015-05-08 13:36:40 +12:00
Chris Pearce
256c472d27 Bug 1159495 - Change Windows to Unix line endings in GMPUtils.cpp. r=whitespace 2015-05-08 13:36:37 +12:00
Chris Pearce
0689f38a70 Bug 1162358 - Defer processing GMP DecodingComplete() calls until intr shmem allocs are finished. r=jesup 2015-05-08 13:36:34 +12:00
Chris Pearce
3b0a4f8c14 Bug 1160321 - Test whether we can create H.264/AAC decoders before we report we support them. r=mattwoodrow 2015-05-08 13:36:32 +12:00
Shu-yu Guo
ae7e7a3c6d Bug 1161362 - When initializing a trivial script, also initialize its call object shape to the empty shape. (r=jimb) 2015-05-07 18:16:53 -07:00
Shu-yu Guo
5e9e729e61 Bug 1161351 - Fix unwound exit frame sizes in JitProfilingFrameIterator. (r=nbp) 2015-05-07 18:16:53 -07:00
Shu-yu Guo
c6e095450a Bug 1158223 - Tweak XPConnect stack size on 64bit Windows. (r=bholley) 2015-05-07 18:16:53 -07:00
Ehsan Akhgari
4336f915ab Bug 1130101 - Part 3: Add unit tests for the handling of the Service-Worker-Allowed header; r=nsm 2015-05-07 21:07:10 -04:00
Ehsan Akhgari
ac2874c72f Bug 1130101 - Part 2: Honor the Service-Worker-Allowed header when prefix matching the service worker scope; r=nsm 2015-05-07 21:06:34 -04:00
Ehsan Akhgari
0053c63b09 Bug 1130101 - Part 1: Store the value of the Service-Worker-Allowed header in the CompareManager object; r=nsm 2015-05-07 21:06:33 -04:00
Valentin Gosu
b4379aa7b4 Bug 1153929 - Add assertions and null checks to fix windows crash in nsHttpTransaction r=mcmanus 2015-05-08 03:54:06 +03:00
Geoff Brown
550cacb4e3 Bug 1162285 - Remove unused environment vars on Android; r=jmaher 2015-05-07 18:49:15 -06:00
Geoff Brown
b5f94612ad Bug 1140459 - Skip IsRenderbuffer assertions on Android emulator; r=jgilbert 2015-05-07 18:49:14 -06:00
Kevin Grandon
2dae6d9494 Bug 1160666 - Allow per-product b2g branding. r=fabrice 2015-05-07 11:44:24 -07:00
B2G Bumper Bot
60f4ee07a4 Bumping manifests a=b2g-bump 2015-05-07 11:27:47 -07:00
B2G Bumper Bot
3e913c5709 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/81df37202dbc
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #29935 from mwargers/1159352

Bug 1159352 - test_play_mp4_video.py:  AssertionError: 'content' != u'none'

========

https://hg.mozilla.org/integration/gaia-central/rev/b6fa16c6bcb5
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1159352 - test_play_mp4_video.py:  AssertionError: 'content' != u'none'

========

https://hg.mozilla.org/integration/gaia-central/rev/a3194d9e1165
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1147315 - merge pull request #29927 from sfoster:task-manager-flip-bug-1147315 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/5bab64d8ca31
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1147315 - No resize for 180 orientation changes. r=etienne
2015-05-07 11:25:34 -07:00
B2G Bumper Bot
504db32853 Bumping manifests a=b2g-bump 2015-05-07 11:10:04 -07:00
B2G Bumper Bot
610c65cb5a Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ab3e18eaa32a
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1162527 - merge pull request #29949 from KevinGrandon:bug_1162527_autolander_test_jshint to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/9b9fb511e5a0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1162527 - Fix jshint issue for shared/js/dialer/contacts.js r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/55d8b4df288f
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1056770 - merge pull request #29765 from albertopq:1056770-back-forward-animation2 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/e8b39198391f
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1056770 - Improve back and forward chrome animations

========

https://hg.mozilla.org/integration/gaia-central/rev/c7d1cc570e4f
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1162274 - merge pull request #29943 from stasm:1162274-settings-link to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/9918c88d348d
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1162274 - "Settings" in search suggestion dialog is not linked. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/5ad438151222
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1162110 - merge pull request #29928 from KevinGrandon:bug_1162110_consolidate_touch_event_pref to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/50f8abced9c3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1162110 - Consolidate usage of test pref, dom.w3c_touch_events.enabled

========

https://hg.mozilla.org/integration/gaia-central/rev/8fe3cf33d590
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1158517 - merge pull request #29823 from gasolin:issue-1158517 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/743869161211
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1158517 - Fix remaining keyboard jshint issues, r=rudy
2015-05-07 11:07:48 -07:00
Wes Kocher
a72c5d5617 Backed out changeset 7ec5c7a4830f (bug 896139) for adding a test that times out a=merge
--HG--
extra : source : f8ad92bbeea604d2cd367773ca7c21e63900cc8d
2015-05-07 10:13:59 -07:00
Mike Conley
1f5e274f86 Bug 1136478 - Fire pagehide / pageshow events in content after swapping remote frame loaders. r=smaug.
--HG--
extra : rebase_source : fbe5ee7bb8aeac7edabb580bcab0254aebcbc1e0
2015-05-07 11:43:40 -04:00
Michal Novotny
faa2a67d00 Bug 1156493 - e10s: move .cacheKey to nsICacheInfoChannel so child channels can get/set it, r=jduell 2015-05-10 02:26:39 +02:00
Fabrice Desré
747ca7e05a Bug 1161299 - Update the DNT prefs from tri-states to two-states r=ferjm 2015-05-07 07:22:47 -07:00
B2G Bumper Bot
b900fd47a5 Bumping manifests a=b2g-bump 2015-05-07 07:49:55 -07:00
Carsten "Tomcat" Book
b48b9014ff Merge mozilla-central to b2g-inbound on a CLOSED TREE 2015-05-07 16:15:54 +02:00
Carsten "Tomcat" Book
60f46579a5 Merge mozilla-central to fx-team on a CLOSED TREEx 2015-05-07 16:11:08 +02:00
Carsten "Tomcat" Book
5265727d85 Merge mozilla-central to mozilla-inbound 2015-05-07 15:59:06 +02:00
Sotaro Ikeda
e2d6f1ea99 Bug 1091037 - Raise ImageBridge thread priority r=gsvelto,nical 2015-05-07 06:53:47 -07:00
Eddy Bruël
e1a73c0076 Bug 896139 - Breakpoints not triggering when reloading script;r=jimb 2015-05-07 15:40:39 +02:00
Carsten "Tomcat" Book
41416405bc merge mozilla-inbound to mozilla-central a=merge 2015-05-07 15:38:45 +02:00
Carsten "Tomcat" Book
a2faec5d69 merge fx-team to mozilla-central a=merge
--HG--
rename : browser/base/content/test/general/browser_fxa_profile_channel.html => browser/base/content/test/general/browser_fxa_web_channel.html
rename : browser/base/content/test/general/browser_fxa_profile_channel.js => browser/base/content/test/general/browser_fxa_web_channel.js
rename : services/fxaccounts/FxAccountsProfileChannel.jsm => services/fxaccounts/FxAccountsWebChannel.jsm
rename : services/fxaccounts/tests/xpcshell/test_profile_channel.js => services/fxaccounts/tests/xpcshell/test_web_channel.js
rename : browser/devtools/commandline/commands-index.js => toolkit/devtools/gcli/commands/index.js
rename : browser/locales/en-US/chrome/browser/devtools/gcli.properties => toolkit/locales/en-US/chrome/global/devtools/gcli.properties
rename : browser/locales/en-US/chrome/browser/devtools/gclicommands.properties => toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties
extra : rebase_source : 705c7bf98a773fc66bfab781bbc925d79404605c
2015-05-07 15:28:00 +02:00
Mark Banner
e47a855193 Bug 1161926 - Standalone UI doesn't always show 'Something went wrong' if the network connection dies. Upgrade jquery due to not always properly catching errors from $.ajax. r=dmose CLOSED TREE
--HG--
rename : browser/components/loop/content/shared/libs/jquery-2.1.0.js => browser/components/loop/content/shared/libs/jquery-2.1.4.js
2015-05-07 09:49:11 +01:00
Mark Banner
b3ff681c8e Fix browser_parsable_css.js bustage from bug 1142515 - use correct way to reset padding-left to default. rs=bustage-fix for CLOSED TREE 2015-05-07 13:25:05 +01:00
Carsten "Tomcat" Book
99b05f33d8 Backed out changeset 93f39df2f4f3 (bug 1161926) for test failures in browser_parsable_css.js
--HG--
rename : browser/components/loop/content/shared/libs/jquery-2.1.4.js => browser/components/loop/content/shared/libs/jquery-2.1.0.js
2015-05-07 14:04:57 +02:00
Phil Ringnalda
fa6795f7e7 Back out cb1b4b057dad (bug 1161362) for Linux64 cgc failures
CLOSED TREE
2015-05-06 21:15:22 -07:00
Phil Ringnalda
24bb7f3b9f Back out dc2fed1aa0af (bug 1144906) for ASan, Android debug, and OS X 10.10 mochitest-gl bustage
CLOSED TREE
2015-05-06 19:55:40 -07:00
Bobby Holley
bc1b71c78e Bug 1131707 - Transparently forward the construct bit for function forwarders. r=gabor 2015-05-06 18:11:51 -07:00