Mike Taylor
17a0eb7774
Bug 1092006 - Fix substitution variable name used in content.css. r=wesj
2014-12-16 13:00:00 +01:00
Carsten "Tomcat" Book
edefedeca8
Merge mozilla-central to fx-team
2014-12-22 14:06:42 +01:00
abdelrhman
fc21ed37c1
Bug 1112552 - Clean up global-scope pollution from browser-fxaccounts.js. r=dao
2014-12-22 13:28:29 +01:00
Carsten "Tomcat" Book
ca2660700d
merge fx-team to mozilla-central a=merge
2014-12-22 13:22:28 +01:00
Carsten "Tomcat" Book
f0efa91f20
merge mozilla-inbound to mozilla-central a=merge
2014-12-22 13:13:43 +01:00
Carsten "Tomcat" Book
bdd00af753
merge b2g-inbound to mozilla-central a=merge
2014-12-22 13:08:39 +01:00
Carsten "Tomcat" Book
92ecd32f49
Backed out changeset 4aad6ecf4b7d (bug 1098161) for marionette test failures
2014-12-22 09:34:14 +01:00
Bobby Holley
078237732a
Bug 1109437 - Only switch to buffering mode when the reader is waiting for data. r=cpearce
2014-12-22 00:20:31 -08:00
Bobby Holley
10d012cc54
Bug 1109437 - Implement non-polling buffering. r=cpearce
2014-12-22 00:20:31 -08:00
Bobby Holley
4e63580a0f
Bug 1109437 - Schedule the state machine thread in MediaSourceDecoder::Load. r=cpearce
...
This is necessary to get the state machine moving after it's initialized.
MediaDecoder::Load does this, but it looks like we missed this in the override.
So the current code relies on the ScheduleStateMachine call at the end of
TrackBuffer::AppendData to get things rolling. We're going to be removing that
call, so we need to fix this.
2014-12-22 00:20:31 -08:00
Bobby Holley
cdd1259acb
Bug 1109437 - Switch m{Audio,Video}RequestPending to a tri-state. r=cpearce
2014-12-22 00:20:31 -08:00
Bobby Holley
4166dff3db
Bug 1109437 - Stop using buffering heuristics when they're not requested. r=cpearce
...
Given that we set the buffering wait to 0 in this case already, the only practical
impact on our behavior of this change is that we'll no longer ping-pong between
states.
2014-12-22 00:20:30 -08:00
Bobby Holley
72d88fedcb
Bug 1109437 - Generalize GetBufferingWait to UseBufferingHeuristics. r=cpearce
2014-12-22 00:20:30 -08:00
Bobby Holley
fa6c808af5
Bug 1109437 - Remove MOZ_COUNT_{C,D}TOR on refcounted promise classes. r=cpearce
...
These were accidental and redundant, because refcounted classes get this behavior
automatically. And this is very lucky, because it turns out that our MOZ_COUNT_*
infrastructure can't handle varying-sized instances identified with the same
string, which is exactly what we can get with these templated types.
The only remaining use of these macros is on the non-templated ThenValueBase,
which is happily not variable-sized. \o/
2014-12-22 00:20:30 -08:00
Carsten "Tomcat" Book
0b4b40c804
Backed out changeset 8fd0df8e208c (bug 423758) for bustage
2014-12-22 09:05:34 +01:00
B2G Bumper Bot
36b0ccb663
Bumping manifests a=b2g-bump
2014-12-21 23:52:02 -08:00
B2G Bumper Bot
7901c1aaed
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/24f27472ae6d
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #26932 from begeeben/1113538_text_font_of_app_icon
Bug 1113538 - [Stingray] text font of App icon is not correct in App deck, r=tzhuang
========
https://hg.mozilla.org/integration/gaia-central/rev/fdedf9626247
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1113538 - [Stingray] text font of App icon is not correct in App deck
* Change styles according to the UI spec
2014-12-21 23:47:23 -08:00
Bill McCloskey
ea0245e40a
Backout bug 1072980 due to regressions (a=backout)
2014-12-20 21:15:36 -08:00
Phil Ringnalda
bb626226c0
Merge f-t to m-c, a=merge
2014-12-20 12:18:28 -08:00
Phil Ringnalda
2d053c9645
Merge m-i to m-c, a=merge
2014-12-20 12:17:31 -08:00
Richard Newman
c4fe28a657
Bug 1093172 - Follow-up: include missing import. r=trivial
2014-12-20 07:34:07 -08:00
Ehsan Akhgari
0d896679b7
Bug 1113796 - Use the WhiteSpaceOrNewlineIsSignificant() helper method; r=roc
2014-12-20 10:27:25 -05:00
Ehsan Akhgari
e6bf8b9624
Bug 1113005 - Copy only the necessary number of bytes from the source buffer; r=froydnj
...
--HG--
extra : amend_source : 2367a3ad35a599790fc333e35e1b9272653463a1
2014-12-20 10:25:02 -05:00
ffxbld
55f91907fb
No bug, Automated blocklist update from host bld-linux64-spot-115 - a=blocklist-update
2014-12-20 03:20:59 -08:00
ffxbld
2e74909c2f
No bug, Automated HPKP preload list update from host bld-linux64-spot-115 - a=hpkp-update
2014-12-20 03:20:57 -08:00
ffxbld
bf0ab57a50
No bug, Automated HSTS preload list update from host bld-linux64-spot-115 - a=hsts-update
2014-12-20 03:20:56 -08:00
Magnus Melin
5622905944
Bug 984194 - reenable test_encoding.js now that bug 1012917 is fixed. r=sworkman
2014-12-20 10:38:19 +02:00
Ryan VanderMeulen
0a21cc6b87
Merge inbound to m-c. a=merge
...
CLOSED TREE
2014-12-19 21:57:29 -05:00
Ryan VanderMeulen
5826c0d2fe
Merge fx-team to m-c. a=merge
2014-12-19 21:54:11 -05:00
B2G Bumper Bot
b1aea122f8
Bumping manifests a=b2g-bump
2014-12-19 16:34:11 -08:00
Wes Kocher
db1adaeb72
Merge m-c to fx-team a=merge CLOSED TREE
2014-12-19 16:04:50 -08:00
Wes Kocher
cf4ed8d8f9
Merge m-c to inbound a=merge CLOSED TREE
2014-12-19 16:01:05 -08:00
Wes Kocher
4e511cba4e
Merge m-c to inbound a=merge CLOSED TREE
2014-12-19 15:59:42 -08:00
Wes Kocher
6a88b77d9e
Merge fx-team to m-c a=merge
2014-12-19 15:43:34 -08:00
Steven Michaud
8f72781932
Bug 997908 - crash in ReleaseSliceNow(unsigned int, void*) accessing memory at 0x5a5a5a5a5a5a5a5a, another test patch. r=continuation
2014-12-19 17:26:13 -06:00
Ehsan Akhgari
1f73b7f639
Clarify the MakeUnique documentation (comment only change, no bug)
...
DONTBUILD, CLOSED TREE
--HG--
extra : amend_source : 92e8482f1dfb6f9f47acdec1e570d62887257122
2014-12-19 17:51:10 -05:00
Nick Fitzgerald
183545d747
Bug 1106695 - Part 2: Use ScriptStore in the script actors. r=jlongster
2014-12-19 14:40:58 -08:00
Nick Fitzgerald
47bf2ea90c
Bug 1106695 - Part 1: Add toolkit/devtools/server/actors/utils/ScriptStore.js. r=jlongster
2014-12-19 14:40:55 -08:00
Brian Grinstead
1eff8428f7
Bug 1112715 - Remove undefined tab-hover-color reference and tab-color variable, which was never applied due to specificity;r=Gijs
2014-12-19 14:25:48 -08:00
Ryan VanderMeulen
ae24bc27ec
Backed out 7 changesets (bug 1109437) for suspicious-looking crashes on a CLOSED TREE.
...
Backed out changeset dc45e97d102d (bug 1109437)
Backed out changeset e6350e4fb18b (bug 1109437)
Backed out changeset 4c38dda06880 (bug 1109437)
Backed out changeset 72f171ec04ba (bug 1109437)
Backed out changeset ec275f65c676 (bug 1109437)
Backed out changeset 65d172e7a1cf (bug 1109437)
Backed out changeset 0b8a156dcff0 (bug 1109437)
2014-12-19 17:02:27 -05:00
Ryan VanderMeulen
84ddefdf5b
Backed out changeset ded76f782c5e (bug 1106432) for leaks.
2014-12-19 16:54:30 -05:00
B2G Bumper Bot
f42240e3e4
Bumping manifests a=b2g-bump
2014-12-19 13:54:07 -08:00
B2G Bumper Bot
1b2bcf8a03
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3d66911e8f08
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #26915 from mwargers/marketplace5"
This reverts commit 654bf90145126043eae0a27f96186eb4f0c928b2, reversing
changes made to 4c230b117c55d987ae0ff71df9d4d8f080b93d3f.
========
https://hg.mozilla.org/integration/gaia-central/rev/0231afe15d2c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1113812 - merge pull request #26923 from KevinGrandon:bug_1113812_cards_view_string to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/94d235d0d8ff
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1113812 - Remove strings from index.html for cards view
2014-12-19 13:53:50 -08:00
Ryan VanderMeulen
68a9b89f29
Merge inbound to m-c. a=merge
2014-12-19 15:03:54 -05:00
Ryan VanderMeulen
48929b60c8
Merge b2g-inbound to m-c. a=merge
2014-12-19 15:01:52 -05:00
Nathan Froyd
17b074b56f
Bug 1113819 - fix deprecated let block construct in server.js; r=jmaher
2014-12-19 14:51:47 -05:00
Bill McCloskey
671759283a
Bug 1087117 - Disable test_bug457672.html in e10s for intermittent failures
2014-12-19 09:22:05 -08:00
Blake Kaplan
0a4a7c82ef
Bug 1113313 - Rename these functions to better reflect what they do. r=billm
...
--HG--
extra : rebase_source : ae61b3dd6dd5ce50a131a640060d7be57e562e4d
2014-12-19 12:07:04 -05:00
Ryan VanderMeulen
7da05807b7
Backed out changesets 6bd00fa70b00, 4e2f8f3b8f6b, and c89fec9c8b55 (bug 879717) for introducting multiple new intermittent failures.
...
--HG--
extra : rebase_source : 4aad9383081f256484dd06e87f14cc82ecf186b5
2014-12-19 12:07:20 -05:00
Joel Maher
f545dce95a
Bug 1113713 - deploy talos to the latest version [fix tests for e10s]. r=dminor
2014-12-19 12:07:00 -05:00