Ryan VanderMeulen
98457578ce
Merge fx-team to m-c. a=merge
...
CLOSED TREE
2014-12-09 14:16:03 -05:00
Ryan VanderMeulen
4e4081663d
Merge b2g-inbound to m-c. a=merge
2014-12-09 14:11:06 -05:00
Ryan VanderMeulen
dc8568d63a
Backed out changesets fb903f13f215, 9c5c712698e4, and 36d257ead3da (bug 1092835) for causing test_csp_allow_https_schemes.html permafail on Android 2.3.
...
CLOSED TREE
2014-12-09 14:00:47 -05:00
Ryan VanderMeulen
2b9ca1c991
Bug 1092835 - Bump the nsIWebProgressListener UUID. CLOSED TREE
2014-12-09 12:37:15 -05:00
Ryan VanderMeulen
f150bb479c
Backed out changeset a0a2ada42652 (bug 936724) because something in the push made Gij(2) permafail.
...
CLOSED TREE
2014-12-09 12:09:09 -05:00
Ryan VanderMeulen
0e0519738e
Backed out 5 changesets (bug 1092888) because something in the push made Gij(2) permafail.
...
Backed out changeset 0ad25135a27f (bug 1092888)
Backed out changeset 7cd8260bfc16 (bug 1092888)
Backed out changeset 86385291d8c8 (bug 1092888)
Backed out changeset be16d194d5df (bug 1092888)
Backed out changeset daee46827258 (bug 1092888)
2014-12-09 12:08:59 -05:00
Ryan VanderMeulen
f452af0124
Backed out changeset d4dfb076f5f1 (bug 1108714) because something in the push made Gij(2) permafail.
2014-12-09 12:08:45 -05:00
Martyn Haigh
a894fba492
Bug 1100464 - Add back button to top left of the tabs panel (r=lucasr)
2014-12-09 17:07:26 +00:00
Richard Newman
c58ef4efa2
Bug 1108252 - Remove launcher icon for search activity. r=mfinkle
2014-12-09 16:37:58 +00:00
B2G Bumper Bot
77514005b9
Bumping manifests a=b2g-bump
2014-12-09 08:26:51 -08:00
B2G Bumper Bot
7899456084
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0e1227044422
Author: Mike Habicher <mikeh@mozilla.com>
Desc: Merge pull request #26663 from mikeaich/bug1107284_2
Bug 1107284 - remove callbacks from focus.js as well, r=wilsonpage
========
https://hg.mozilla.org/integration/gaia-central/rev/d943b5d95cc4
Author: Mike Habicher <mikeh@mozilla.com>
Desc: Bug 1107284 - remove callbacks from focus.js as well
2014-12-09 08:17:41 -08:00
B2G Bumper Bot
ee8206d7ee
Bumping manifests a=b2g-bump
2014-12-09 08:11:57 -08:00
B2G Bumper Bot
878283949b
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/83fd6aa5185b
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26615 from npark-mozilla/1100390_2ndAttempt
Bug 1100390: Create a new test case for the deletion of video from Preview
========
https://hg.mozilla.org/integration/gaia-central/rev/118ad5d4ee24
Author: No-Jun <npark@mozilla.com>
Desc: Bug 1100390: Create a new test case for the deletion of video from Preview
New wait syntax used
method name changed to is_video_play_button_visible from is_preview_visible
========
https://hg.mozilla.org/integration/gaia-central/rev/7443efe4efdc
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26041 from JohanLorenzo/bug-1093589
Bug 1093589 - [DSDS] Add test to receive phone call on second SIM
========
https://hg.mozilla.org/integration/gaia-central/rev/561842b6cf95
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1093589 - [DSDS] Add test to receive phone call on second SIM
2014-12-09 08:02:17 -08:00
B2G Bumper Bot
553da4a947
Bumping manifests a=b2g-bump
2014-12-09 07:52:01 -08:00
B2G Bumper Bot
0c09425534
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/91b6e108c833
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #26639 from bebef1987/fix_cost_control
Bug 1107926 - Update cost_control app object to reflect changes in Bug 1...
========
https://hg.mozilla.org/integration/gaia-central/rev/405143dde9a7
Author: bebef1987 <florin.strugariu@softvision.ro>
Desc: Bug 1107926 - Update cost_control app object to reflect changes in Bug 1089968
2014-12-09 07:47:22 -08:00
B2G Bumper Bot
8c87d60f24
Bumping manifests a=b2g-bump
2014-12-09 07:13:51 -08:00
B2G Bumper Bot
455a209b5a
Bumping manifests a=b2g-bump
2014-12-09 06:17:02 -08:00
B2G Bumper Bot
97c54744d0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1427918430cc
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #26657 from JohanLorenzo/bug-1108534
Bug 1108534 - test_delete_call_log should use a hard-coded phone, not re...
========
https://hg.mozilla.org/integration/gaia-central/rev/52da9928def6
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1108534 - test_delete_call_log should use a hard-coded phone, not remote_phone_number
2014-12-09 06:12:17 -08:00
B2G Bumper Bot
36291d587c
Bumping manifests a=b2g-bump
2014-12-09 06:01:53 -08:00
B2G Bumper Bot
9acf7352a0
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a4ce4f4bbed5
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1109002 - Bump gaiatest version to 0.32. r=fstrugariu
2014-12-09 05:57:15 -08:00
Carsten "Tomcat" Book
cf609031ef
Merge mozilla-central to b2g-inbound
2014-12-09 13:20:50 +01:00
Carsten "Tomcat" Book
23b15dcbbd
merge fx-team to mozilla-central a=merge
2014-12-09 13:08:37 +01:00
Carsten "Tomcat" Book
4b45e18db5
merge mozilla-inbound to mozilla-central a=merge
2014-12-09 12:51:54 +01:00
B2G Bumper Bot
3a4aa14d13
Bumping manifests a=b2g-bump
2014-12-08 23:22:01 -08:00
B2G Bumper Bot
35c2c50260
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/00c26c7075f1
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1042673 - merge pull request #26653 from julienw:1042673-hysteresis-luminosity-control-v2 to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/3b53d202e034
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1042673 - Automatic brightness needs some hysteresis r=timdream
2014-12-08 23:17:23 -08:00
B2G Bumper Bot
9f093bb584
Bumping manifests a=b2g-bump
2014-12-08 23:07:01 -08:00
B2G Bumper Bot
d5addb8663
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ab0000d0f6dc
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1101518 - [Build] Don't rewrite "async" scripts, and fix the skipping operation r=rickychien
2014-12-08 23:02:20 -08:00
Phil Ringnalda
5ac2c7b278
Back out eb203c9db11d (bug 1107541) for e10s dt bustage
...
CLOSED TREE
2014-12-08 20:24:52 -08:00
Nick Alexander
9f48ddca50
Bug 1084098 - Add Android tools tags to some Remote Tabs home panel views. r=mcomella
...
These tags are used by Android tools (including IntelliJ) at design-time
to show "sample data". They're stripped entirely at build time.
2014-12-08 19:32:51 -08:00
Nick Alexander
8166aad816
Bug 1084098 - Adjust padding/margins of Sync tabs panel items. r=mcomella
...
Pretty straight-forward implementation of the mock. The mock shows a
different "bookmark star" icon, with slightly different right-margins,
and implementing that change requires changing the TwoLinePageRow layout
to not use drawableRight for the star. (Otherwise, the star will not be
vertically centered in the container.) I don't care to make that change
for this ticket.
2014-12-08 19:32:37 -08:00
Nick Alexander
eb243e86cb
Bug 1084098 - Pre: Don't require GeckoApplication in Themed*widgets. r=mcomella
...
In editors (Eclipse and IntelliJ), Android View sub-classes are created
in a "Bridging" mock context. There is no ambient GeckoApplication in
this case. It's already okay for the LWT to be null; let's loosen the
requirement that there be an ambient GeckoApplication to let these View
sub-classes render in editors.
2014-12-08 18:58:37 -08:00
B2G Bumper Bot
b3ec105684
Bumping manifests a=b2g-bump
2014-12-08 16:01:51 -08:00
B2G Bumper Bot
04c47a1885
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/331d7bdc01ab
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #26662 from KevinGrandon/bug_1103087_collection_inner_html
Bug 1103087 - Collection offline textContent r=Cwiiis
========
https://hg.mozilla.org/integration/gaia-central/rev/638c5f901643
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1103087 - Collection offline textContent
2014-12-08 15:57:12 -08:00
James Long
f2486c2b8a
Bug 1107541 - display eval scripts with a sourceURL pragma correctly in the debugger r=fitzgen
2014-12-08 15:49:34 -08:00
Chris Manchester
cb425e733f
Bug 1108714 - Make marionette's skip_if_b2g run desktop tests. r=mdas
2014-12-08 17:21:59 -05:00
B2G Bumper Bot
181cb8ac46
Bumping manifests a=b2g-bump
2014-12-08 14:01:48 -08:00
B2G Bumper Bot
980ad3980a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fc40d72424e2
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #26658 from yzen/bug-1108684
Bug 1108684 - removed <br> from event-multiple-day-duration aria-label
========
https://hg.mozilla.org/integration/gaia-central/rev/546a725cb1d6
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1108684 - removed <br> from event-multiple-day-duration aria-label
2014-12-08 13:52:39 -08:00
Ryan VanderMeulen
be6607416e
Merge inbound to m-c. a=merge
2014-12-08 15:46:14 -05:00
Ryan VanderMeulen
b066802438
Merge fx-team to m-c. a=merge
2014-12-08 15:37:46 -05:00
Ryan VanderMeulen
8b716a35b2
Backed out changesets ae63e2dda6e0, a9ca0113db3c, and d0a6757e24bd (bug 1097823) for bustage.
...
DONTBUILD CLOSED TREE
2014-12-08 15:00:02 -05:00
Bobby Holley
081dbd1936
Bug 1097823 - Implement Media Promises. r=cpearce
2014-12-08 11:34:50 -08:00
Bobby Holley
a809fdd3f0
Bug 1097823 - Implement MediaTaskQueue::ForceDispatch. r=cpearce
...
This is necessary to have strong guarantees that promises will be resolved.
While we're flushing the task queue, normal dispatch starts to fail,
meaning that we can't dispatch promise resolution. We have 3 options to handle
this:
(A) Never respond to the promise.
(B) Invoke the Resolve/Reject callback synchronously if dispatch fails.
(C) Prevent dispatch from failing.
(C) seems like the option least likely to violate invariants if we can get away
with it. Promise resolution is unlikely to be a heavyweight task in the way that
a decode task might be, so this should hopefully be ok.
Note that this still doesn't help for bonafide task queue shutdown. It's up to
consumers to tear down their MediaPromiseHolders before the task queues are shut
down.
2014-12-08 11:34:50 -08:00
Bobby Holley
8aa19738d9
Bug 1097823 - Move NotDecodedReason from RequestSampleCallback to MediaDecoderReader. r=cpearce
2014-12-08 11:34:50 -08:00
Margaret Leibovic
a38ecda195
Bug 1105290 - Add null check to createEngineFromFileList. r=rnewman
...
--HG--
extra : rebase_source : 5a02f71a93659a297de3f8b2a8facb7c6a32f37e
extra : amend_source : 9ff1f1b354f6a50d5d49b060d1e1eac118ad712e
2014-12-08 11:12:44 -08:00
Victor Porof
da808ccd66
Bug 1106137 - Make canvas debugger faster by avoiding a double-copy operation when deserializing image data, r=pbrosset
2014-12-09 10:57:53 -05:00
Victor Porof
da31b9fba1
Bug 1101197 - Improve performance of framerate view in new performance tool, r=jsantell
2014-12-08 13:09:25 -05:00
B2G Bumper Bot
ac0c026dbf
Bumping manifests a=b2g-bump
2014-12-08 09:51:56 -08:00
B2G Bumper Bot
669a9e8c38
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0d6dca3dab03
Author: Augustin Trancart <augustin.trancart@gmail.com>
Desc: Bug 918970 - display existing thread when sending a sms from contact app r=julien
2014-12-08 09:42:16 -08:00
Mike de Boer
bf4d9aa706
Bug 1092954: add tests for forced disconnect handling on room deletion. r=Standard8
2014-12-08 17:45:36 +01:00
Mike de Boer
115475c901
Bug 1092954: oust all users from a room when it's deleted. r=Standard8
2014-12-08 17:45:32 +01:00
