Commit Graph

32864 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
181cf11158 Merge mozilla-central to mozilla-inbound 2015-01-20 13:25:34 +01:00
Carsten "Tomcat" Book
935a218dcb merge b2g-inbound to mozilla-central a=merge 2015-01-20 12:12:12 +01:00
Nicholas Nethercote
cc06604267 Bug 1123527 - Fix syntax error in BT_WARNING and BT_LOGD. r=btian.
cppcheck identified the extra ')' at the end of these macros. This code must
not be compiled in any of our standard configurations.

--HG--
extra : rebase_source : 4044d377e3a15ef725ac276ab54a192df63a8eb6
2015-01-19 19:12:43 -08:00
Phil Ringnalda
00a90b88bb Merge m-c to b-i 2015-01-19 18:44:24 -08:00
Phil Ringnalda
3a4450c087 Merge b-i to m-c, a=merge 2015-01-19 18:36:55 -08:00
Thomas Zimmermann
2eed89da86 Bug 1119746: Support random postfix for Bluetooth daemon socket name, r=btian
This patch adds support for a random postfix for bluetoothd's socket
name. The postfix is re-generated for every instance of the daemon.
This prevents name collisions between mutliple sessions and malicious
programs from taking over the connection easily.
2015-01-20 10:17:45 +08:00
Thomas Zimmermann
b65367839d Bug 1119746: Listen for socket connections when starting Bluetooth, r=btian
Currently, Gecko connects to a running instance of bluetoothd when
it starts the daemon backend. This contains a race condition between
the startup of the daemon and the startup of Gecko.

This patch changes the initialization and cleanup of Bluetooth's
daemon backend so that the Bluetooth daemon connects to Gecko. The
daemon process is now started as part of the initialization and
quits during shutdown. The steps are strictly ordered, so no race
condition exists.

The initialization and cleanup procedures should now be compatible
with BlueZ 5.
2015-01-20 10:17:40 +08:00
Thomas Zimmermann
dd06eecb9d Bug 1119746: Fix ref-counting of bluetoothd channels, r=btian
The class |BluetoothDaemonChannel| for the bluetoothd channels
supports reference counting. This patch fixes the respective
variable to use |nsRefPtr| instead of |nsAutoPtr|.
2015-01-20 10:17:31 +08:00
Jamin Liu
fed4403689 Bug 1119734 - Delay registering Bluetooth signal handler if pairing event handlers haven't been attached. r=btian 2015-01-20 09:52:41 +08:00
Ehsan Akhgari
ad89cf8ff2 Merge m-c into b2g-inbound 2015-01-19 14:35:38 -05:00
Fernando Jimenez
56324f5e54 Bug 1097928 - Convert MozPaymentProvider to WebIDL. Android. r=wjohnston 2015-01-19 14:50:54 +01:00
Fernando Jimenez
d48b684909 Bug 1097928 - Convert MozPaymentProvider to WebIDL. r=bholley,fabrice 2015-01-19 14:50:32 +01:00
Ehsan Akhgari
9036a7eadd Bug 1122987 - Mark nsPIDOMWindow::mInnerWindow as non-owning; r=smaug
The inner window holds an owning reference to its outer window,
and the outer window holds a non-owning reference back to its
inner window.  The non-owning reference is managed by
nsGlobalWindow.
2015-01-17 21:19:17 -05:00
Phil Ringnalda
53a5e2bb9c Back out 3 changesets (bug 885982, bug 1118063) for b2g mochitest-6 bustage
CLOSED TREE

Backed out changeset 865e7bc208df (bug 885982)
Backed out changeset 9ede577f5ada (bug 885982)
Backed out changeset 6ccc86f7429e (bug 1118063)

--HG--
rename : dom/network/interfaces/nsITCPServerSocketInternal.idl => dom/network/interfaces/nsIDOMTCPServerSocket.idl
2015-01-17 13:26:10 -08:00
Phil Ringnalda
2cd21e3280 Merge m-c to m-i 2015-01-17 13:11:55 -08:00
Phil Ringnalda
3974bffbb7 Merge b-i to m-c, a=merge 2015-01-17 13:06:16 -08:00
Andrea Marchesini
15c180d225 Bug 1122553 - BroadcastChannel should keep FileImpl alive when sent to the PBackground actors, r=bent 2015-01-17 07:29:15 +00:00
Wes Kocher
adad8db983 Merge m-c to b2g-inbound a=merge 2015-01-16 18:07:28 -08:00
Wes Kocher
9ecc429a06 Merge inbound to m-c a=merge 2015-01-16 17:33:04 -08:00
Bill McCloskey
cb8c3ea750 Backout bug 1118618 on a CLOSED TREE 2015-01-16 14:46:05 -08:00
Fabrice Desré
ff4dd4c94a Bug 1113779 - UserCustomizations.jsm spams desktop mochitest test logs r=mccr8 2015-01-16 14:16:03 -08:00
Aaron Klotz
ef6504b6e6 Bug 1117244: Prevent e10s plugin module bridging from preempting async init messages; r=jimm
--HG--
extra : rebase_source : 205864aff2e571b27e11f4d4ec2ec1fa17e7841e
2015-01-16 14:03:27 -07:00
Mason Chang
6c10033ff7 Bug 1119981. Disable test_deferred_start.html on b2g for race condition in test. r=bbirtles 2015-01-16 09:33:49 -08:00
Barbara Guida
e664fe84a3 Bug 1122586 - Unbreak build on platforms missing std::llabs since bug 1073716. r=dholbert 2015-01-16 17:50:00 +01:00
Carsten "Tomcat" Book
efe3acd08b Merge mozilla-central to b2g-inbound 2015-01-16 16:23:41 +01:00
Carsten "Tomcat" Book
31f6d06813 merge b2g-inbound to mozilla-central a=merge 2015-01-16 15:04:49 +01:00
Nicholas Nethercote
2116ab605f Bug 1123151 (part 3) - Make PLDHashTable::ops private. r=froydnj.
This required adding a getter and a setter, but they're used sparingly.

--HG--
extra : rebase_source : 2a40e459de2a7a9e2bb6d65b046e4a920b212326
2015-01-19 16:34:44 -08:00
Nicholas Nethercote
8bd1f6f072 Bug 1123151 (part 2) - Add PLDHashTable::IsInitialized(). r=froydnj.
This encapsulates most of the uses of PLDHashTable::ops.

--HG--
extra : rebase_source : 7760ce8e46a37e87dcfe590e809a21df01fe510f
2015-01-19 16:11:34 -08:00
Nicholas Nethercote
bd573c9b9c Bug 1123151 (part 1) - Set PLDHashTable::ops consistently. r=froydnj.
Currently the setting of PLDHashTable::ops is very haphazard.

- PLDHashTable has no constructor, so it's not auto-nulled, so lots of places
  null it themselves.

- In the fallible PLDHashTable::Init() function, if the entry storage
  allocation fails we'll be left with a table that has |ops| set -- indicating
  it's been initialized -- but has null entry storage. I'm not certain this can
  cause problems but it feels unsafe, and some (but not all) callers of Init()
  null it on failure.

- PLDHashTable does not null |ops| in Finish(), so some (but not all) callers
  do this themselves.

This patch makes things simpler.

- It adds a constructor that zeroes |ops|.

- It modifies Init() so that it only sets |ops| once success is ensured.

- It zeroes |ops| in Finish().

- Finally, it removes all the now-unnecessary |ops| nulling done by the users
  of PLDHashTable.

--HG--
extra : rebase_source : bb34979c218d152562a2f9c7e5215256c111cc5b
2015-01-19 16:01:24 -08:00
Jean-Yves Avenard
7823a3b9f4 Bug 1121342: Re-Request audio or video to decode first frame after a failed attempt. r=cpearce
--HG--
extra : rebase_source : 3434fc4a46cc32622241cc2e36a713bf38623b6a
2015-01-16 15:48:40 +11:00
Phil Ringnalda
b46cbfd26f Backed out 2 changesets (bug 1095218) on suspicion of causing b2g mochitest-6 failures and hangs
CLOSED TREE

Backed out changeset f666641df41e (bug 1095218)
Backed out changeset 5f513dc1a248 (bug 1095218)
2015-01-15 20:44:18 -08:00
Chris Double
976cf3f159 Bug 1055904 - Improve MSE eviction calculation - r=jya
Fixes a bug in the SourceBufferResource eviction code where it was
using the mOffset of the resource as the min bound for what to evict.
This offset is almost always zero though due to ReadFromCache being
used which never updates the offset. This prevented eviction from
happening in most cases.

Moves the code to remove old decoders so that it does this during
the same loop as that which remove data from existing decoders.
This more aggressively prunes old decoders and is more likely to
keep data in the current playing decoder around for seeking, etc.

Prevent removing any decoder that the MediaSourceReader is
currently using for playback to prevent RemoveDecoder crashes.

Add a threshold to subtract from the current time when working out
the time bound to evict before to make it less likely to evict
current data that is needed for current playback.

Remove all data from evicted decoders in the initial iteration then
iterate after to remove empty decoders to put the RemoveDecoder
logic in one place.

Iterate decoders in order that they were added rather than sorted
by time so the logic that removes entire decoders can do it only
to those old decoders that existed before the existing one was
created.

Keeps track of the time that was evicted from the current decoder
and uses that as the time to EvictBefore for all decoders in the
track buffer when doing MediaSource::NotifyEvict.

--HG--
extra : rebase_source : f7b4fe263a8041b3882585caea389742b2a1a9b3
2015-01-16 16:14:56 +13:00
Josh Matthews
6334294144 Bug 885982 - Add missing IDL on a CLOSED TREE. 2015-01-17 12:17:26 -05:00
Bruce Sun
899a86f835 Bug 1121930: Sync Bluetooth daemon protocol with BlueZ 5.27, r=shuang 2015-01-15 19:44:02 +08:00
Yoshi Huang
86e65bebb0 Bug 1093517 - remove impl for connect and close of MozNFCTag. r=dimi
From 8d41372b81f36efced2f46bfa8428eb12688ffd7 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 27 ++-------------------------
 dom/nfc/gonk/Nfc.js                | 12 +-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  4 +---
 dom/nfc/gonk/NfcMessageHandler.cpp | 35 -----------------------------------
 dom/nfc/gonk/NfcMessageHandler.h   |  2 --
 dom/nfc/nsINfcContentHelper.idl    | 30 +-----------------------------
 6 files changed, 5 insertions(+), 105 deletions(-)
2015-01-15 15:41:43 +08:00
Yoshi Huang
a3c2b470b3 Bug 1121840 - Use Cu.cloneInto for the result of NFCTag.transceive. r=dimi 2015-01-15 14:55:25 +08:00
Phil Ringnalda
bb80f4e10c Bug 744125 - Disable test_pointerlock-api.html on 10.10, too
--HG--
extra : rebase_source : 99f3369b5956d9567051037e2befef7ea1391aab
2015-01-14 22:32:08 -08:00
Phil Ringnalda
ee0549460e Bug 639705 - update test_fullscreen-api.html hacks to cover OS X 10.10 too
--HG--
extra : rebase_source : c558c2d257909dbf5f33b2dd453016a401d51153
2015-01-14 22:30:04 -08:00
Yoshi Huang
2fe2c60a92 Bug 1121818 - Reject promise with instance of 'Error'. r=dimi
From da865c1cd62df020eba8515c3e19b962ccddd322 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2015-01-15 12:17:46 +08:00
Ben Tian
313c39fbfe Bug 1121334 - [bluetooth2] Append device name to BluetoothDevice in BluetoothPairingEvent, r=shuang, f=jaliu 2015-01-16 10:53:55 +08:00
Wes Kocher
295f54f807 Merge m-c to b2g-inbound a=merge 2015-01-15 17:57:43 -08:00
Wes Kocher
8e4db8cafc Merge inbound to m-c a=merge 2015-01-15 16:14:14 -08:00
Kyle Machulis
4202f2bf99 Bug 1107674 - Change settings:wallpaper.image permission from PROMPT to ALLOW for privileged apps; r=fabrice 2015-01-15 14:56:11 -08:00
Nicholas Nethercote
69fe655b04 Bug 1121304 (part 2, attempt 2) - Remove PLDHashTableOps::{alloc,free}Table. r=froydnj.
--HG--
extra : rebase_source : bc119bd0d3b6944e8c5a000950e0c4052cb70aef
2015-01-14 14:35:56 -08:00
Jeff Gilbert
625fccbb86 Bug 1109945 - Rewrite shader/program handling. - r=kamidphish 2015-01-15 15:40:39 -08:00
Wes Kocher
ed4c2aa486 Merge m-c to inbound a=merge CLOSED TREE 2015-01-15 17:55:54 -08:00
Wes Kocher
7777c308be Backed out 4 changesets (bug 1118978) for b2g build bustage on a CLOSED TREE
Backed out changeset e0ecb643aa2b (bug 1118978)
Backed out changeset bf31c6661b2c (bug 1118978)
Backed out changeset 5a4839c2fd53 (bug 1118978)
Backed out changeset 40b84c88ed16 (bug 1118978)
2015-01-15 15:52:41 -08:00
Nils Ohlmeier [:drno]
0e90bcb6ed Bug 1115212: replace onaddstream boolean with counters r=bwc
--HG--
extra : rebase_source : 7844a573a7100ddf144146d6a914139a1ba9c22f
extra : amend_source : 2d581214bdfa83cbcd05a9be34427e3622b8d0ec
2015-01-14 15:47:00 -08:00
Carsten "Tomcat" Book
4d2773b297 Backed out changeset 142031795f33 (bug 992685) for failing w3 and w4 tests 2015-01-20 11:21:51 +01:00
Carsten "Tomcat" Book
7cb1a027a7 Backed out changeset c4d8cf5b47ef (bug 992685) 2015-01-20 11:21:25 +01:00