Граф коммитов

43035 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher e53dc84f5c Merge b2ginbound to central, a=merge 2015-09-30 13:53:55 -07:00
Wes Kocher 7c2b0c515f Merge inbound to central, a=merge 2015-09-30 13:49:27 -07:00
Andrea Marchesini 7373ebaca0 Bug 1209919 - Improving naming and comments in StructuredCloneHelper, r=smaug
--HG--
rename : dom/base/StructuredCloneHelper.cpp => dom/base/StructuredCloneHolder.cpp
rename : dom/base/StructuredCloneHelper.h => dom/base/StructuredCloneHolder.h
2015-09-30 13:22:08 +01:00
Carsten "Tomcat" Book 4cb1341e89 Merge mozilla-central to b2g-inbound 2015-09-30 14:00:16 +02:00
Andrea Marchesini 4c9d29dcec Bug 1186805 - Replace nsBaseHashtable::EnumerateRead() calls in dom/datastore/ with iterators, r=njn 2015-09-30 11:59:52 +01:00
Nigel Babu deed7a3903 Backed out changeset 2fd54f322e75 (bug 1166647) for build bustage 2015-09-30 15:27:46 +05:30
Shawn Huang 05a0212871 Bug 1166647 - Implement MAP bMessage class, r=btian 2015-09-30 16:44:27 +08:00
Alastor Wu 4c8b8db1c6 Bug 1196358 - update volume setting to database when the volume changing. r=sotaro.
--HG--
extra : transplant_source : %F7%C4%E9b0%23%91e%88p%A7_2%14D.%88J%7E%FE
2015-09-30 16:14:59 +08:00
Thomas Zimmermann 242a6e7b49 Bug 1207649: Remove obsolete string/address conversion from Bluetooth backend, r=brsun
The code in Bluetooth's current backend doesn't use address strings any
longer. This patch removes the related conversion functions.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann 5facd8834c Bug 1207649: Convert Bluetooth GATT backend to |BluetoothAddress|, r=joliu
This patch converts all methods in Bluetooth's GATT interface to
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann 40676b1f19 Bug 1207649: Convert Bluetooth AVRCP backend to |BluetoothAddress|, r=shuang
This patch converts all methods in Bluetooth's AVRCP interface to
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann 67ae102c63 Bug 1207649: Convert Bluetooth A2DP backend to |BluetoothAddress|, r=shuang
This patch converts all methods in Bluetooth's A2DP interface to
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann dff6da9218 Bug 1207649: Convert Bluetooth Handsfree backend to |BluetoothAddress|, r=brsun
This patch converts all methods in Bluetooth's Handsfree interface to
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann bccae2b2f9 Bug 1207649: Convert Bluetooth Socket backend to |BluetoothAddress|, r=brsun
This patch converts all methods in Bluetooth's Socket interface to
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann 4a49e25f31 Bug 1207649: Convert Bluetooth Core backend to |BluetoothAddress|, r=brsun
This patch converts all methods in Bluetooth's Core interface to use
|BluetoothAddress|.
2015-09-30 09:42:33 +02:00
Thomas Zimmermann 25f47780dd Bug 1207649: Prepare |BluetoothAddress| for general use throughout Bluetooth code, r=brsun
This patch moves |BluetoothAddress| to BluetoothCommon.h, where it is
available for general use. New utility function convert between strings
and addresses. A new hash-key class allowes for using |BluetoothAddress|
as the key in a hash table.
2015-09-30 09:42:33 +02:00
Wes Kocher 69c6f1bd2f Merge inbound to central, a=merge 2015-09-29 15:35:49 -07:00
Wes Kocher df21b43278 Backed out changeset d0e88c95f3c5 (bug 1167100) for crashes a=backout 2015-09-29 10:25:20 -07:00
Carsten "Tomcat" Book b63d7b04fc merge mozilla-inbound to mozilla-central a=merge 2015-09-29 12:00:25 +02:00
Nigel Babu 2ea092cec1 Backed out changeset 5f02a9d37e56 (bug 1208622) for windows build bustage
CLOSED TREE
2015-09-29 12:10:45 +05:30
Nigel Babu 8852703ac2 Backed out changeset 37c89ad82a13 (bug 1207090) for hazards bustage ON A CLOSED TREE
--HG--
extra : rebase_source : 25a1aed587390254f54c73f87451440dd32ed4f3
extra : amend_source : 1210caccf9a96a464febeac9a1ee11ca0388f490
2015-09-29 11:42:44 +05:30
Bobby Holley 46f21127a1 Bug 1208622 - Separate API entry points. r=bz 2015-09-28 22:51:30 -07:00
Kit Cambridge a958ff06d5 Bug 1209361 - Add missing includes to `dom/base`. r=mccr8
--HG--
extra : commitid : 3rsv1VgB0jB
extra : rebase_source : 677d913e8a0e0955963bbdb65d0e759e9148df7a
2015-09-28 21:31:56 -07:00
Brian Birtles 7f205b8334 Backout changeset 4867b986b2c7 and b4185d03b6d5 (bug 1180589) for bustage on CLOSED TREE 2015-09-29 13:50:23 +09:00
Wes Kocher e03ead4753 Merge m-c to b2ginbound, a=merge 2015-09-28 16:32:01 -07:00
Tim Chien c251097169 Bug 1160923 - [B2G] Waiting for explicit mozContentEvent before sending out mozChromeEvents, r=vingtetun, f=ochaumeau 2015-09-28 09:27:49 -07:00
Christiane Ruetten 4ca99aaf68 Bug 1209091 - Disable add-on signature workaround. r=fabrice
--HG--
extra : rebase_source : fcce79c08380fe8807273bda52839a3928b7548b
2015-09-28 17:22:04 +02:00
Andreas Pehrson 9914ff85f8 Bug 1103188 - Keep track of stopped tracks in gUM stream listener. r=jib
This is needed to avoid something like:
* [old stream] stop track 1 -> deallocate MediaDevice for track 1
* [new stream] gUM() -> allocate MediaDevice for track 1
* [old stream] stop stream -> deallocate MediaDevice for track 1
* [new stream] gUM() -> start MediaDevice for track 1 (oops, MediaDevice was no more!)

--HG--
extra : commitid : FmkFYbCfel7
extra : rebase_source : e17ad400705198c48e3d561241dd50d0844c472e
2015-09-30 14:08:33 +08:00
Andreas Pehrson 6f60cbc89d Bug 1103188 - Keep track of capture stop only in gUM stream listener. r=jib
--HG--
extra : commitid : AqIOlsR7w1y
extra : rebase_source : 6f5670be3bf711a38eb9f914dc69c5b987dd9b9e
2015-09-30 14:08:26 +08:00
Andreas Pehrson aaef4911a9 Bug 1103188 - Always call MediaManager::NotifyFinished/NotifyRemoved on main thread. r=jib
--HG--
extra : commitid : 8kb5G98FAY9
extra : rebase_source : 97086507d1c546f9423f4d2f790924c21ccfa28a
2015-09-30 14:08:22 +08:00
Andreas Pehrson f5d99891ad Bug 1103188 - Always check tracks on getUserMedia(). r=jib
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 9820d09e7152de7c59a0aa81dde715dfa21fed18
2015-09-30 09:32:06 +08:00
Andreas Pehrson f8854279f0 Bug 1103188 - MediaStream::AddTrack/RemoveTrack tests. r=jib,roc
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 5f0de2f5babfd762ec81ecaf2cf060f93d616326
2015-09-30 09:32:06 +08:00
Andreas Pehrson eb480b5acd Bug 1103188 - Break out MediaTrackListListener to an interface. r=roc
Other modules than MediaTrackLists may want to receive updates on a
DOMMediaStream's track set. This moves the MediaTrackListListener out of
the MediaTrackList class into DOMMediaStream as a general interface.

The logic for adding MediaTracks to the MediaTrackList when
MediaStreamTracks are added or removed from a DOMMediaStream is moved to
HTMLMediaElement as this fits the model better - HTMLMediaElement is the
owner of the MediaTrackLists.

--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 66b8ffcfb5343811c181e4169f295b08494f2ee0
2015-09-30 09:32:06 +08:00
Andreas Pehrson 0239788481 Bug 1103188 - Deprecate DOMMediaStream::Stop(). r=jib
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : cc7351a34694b7b0e822bcd0b7025ded0ab54b9d
2015-09-30 09:32:06 +08:00
Andreas Pehrson ce2776ea0d Bug 1103188 - Remove identical override nsDOMUserMediaStream::Stop(). r=jib
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 2e37a21b1789bf4ab893c6fb8b2dd2c75f613855
2015-09-30 09:32:05 +08:00
Andreas Pehrson aa989a17b6 Bug 1103188 - MediaStream::AddTrack/RemoveTrack implementation. r=roc
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 7c8a9d50e5dbb672c773faa3675fe674aed9fb67
2015-09-30 09:32:05 +08:00
Andreas Pehrson bf0d10f4e7 Bug 1103188 - MediaStream WebIDL update with addTrack/removeTrack. r=smaug,jib
--HG--
extra : commitid : 3I8mAeBB3oL
extra : rebase_source : 030f83f3a79a7f4cb938cb509983f87a5a557aab
2015-09-30 09:32:05 +08:00
Andreas Pehrson f7821ba184 Bug 1170958 - Destroy track-locked MediaInputPorts when the track ends. r=roc
This is needed to make tests pass until we have bug 1208316 implemented.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : b7cb9cb1678a582fbf85b729b8f43508889f5c78
2015-09-30 09:31:54 +08:00
Andreas Pehrson 2415aa80a7 Bug 1170958 - Don't create owned MediaStreamTracks in MetadataLoaded. r=roc
When play()ing a media element after it has ended, MediaDecoder will
again call MetadataLoaded(). When capturing the media to a
DOMMediaStream, that will attempt to create new MediaStreamTracks in the
stream with the original TrackIDs. That won't work, since the original
tracks with the same TrackIDs have already ended.

We solve it by only explicitly creating MediaStreamTracks in the stream
in captureStream(), and only if they're already known. Otherwise the
tracks will be created asynchronously when available in the underlying
stream.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 3ba4a6fc7cc46a8bedf1799c4c6aa25585361269
2015-09-30 09:31:54 +08:00
Andreas Pehrson 867415c0b5 Bug 1170958 - Remove ProcessedMediaStream::ForwardTrackEnabled. r=roc,jesup
TrackUnionStream guarantees that TrackIDs are maintained if no tracks
have claimed them before.

In the gUM case, we have a SourceMediaStream which we wholly own (the
DOMMediaStream's Input stream), piped into a TrackUnionStream which
no-one external is able to add tracks to (the DOMMediaStream's Owned
stream) - addTrack()ed tracks are added to the DOMMediaStream's Playback
stream.

The MediaStreamTracks being enabled/disable refer to a TrackID in the
DOMMediaStream's Owned stream.

Alas, we don't need to forward a track's enabled state, we can just do
it on the source.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 4388211be87ebe8a3839ea031b5c504d642806ab
2015-09-30 09:31:54 +08:00
Andreas Pehrson 0a75ffee8d Bug 1170958 - Add DOMMediaStream::OwnedStreamListener. r=roc
A DOMMediaStream's owned stream is piped from the input stream which is
under the control of the DOMMediaStream's owner/producer (like
captureStream or gUM). When producers like these create new tracks after
the stream has already been created (the initial set should be available
to JS synchronously), it is nice if the DOMMediaStream picks them up
automatically and create the corresponding MediaStreamTracks.

The OwnedStreamListener added here does just that; creates an owned
MediaStreamTrack when a track appeared in the stream that didn't already
have a MediaStreamTrack.

It also moves the logic for ended tracks from the PlaybackStreamListener
to the OwnedStreamListener as we previously would see a track end in the
playbak stream after removeTrack() and that would be interpreted as the
track ending at the source.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : ee7d81282ee3fe0e05b55358dee8fc97a22473fe
2015-09-30 09:31:54 +08:00
Andreas Pehrson 5b79fead9f Bug 1170958 - Improve logging of MediaStreams and playback. r=roc
--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 7463915dc8f14e6f9dde2e934e55b9c68d4148d6
2015-09-30 09:31:54 +08:00
Andreas Pehrson 9ecf8f59c7 Bug 1170958 - Feed a SourceMediaStream-backed dom stream instead of a raw SourceMediaStream in MediaManager. r=jesup
Simplifies the structure of MediaManager somewhat. Possible since
MediaManager owns both the SourceMediaStream and the DOMMediaStream.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 494b8b673084ea050420dfaf8d16e44a3bc49672
2015-09-30 09:31:54 +08:00
Andreas Pehrson 937747498a Bug 1170958 - Refactor DOMMediaStream to contain a 3-stage track chain. r=roc
This lets us separate tracks by ownership like so:
* Input    - Owned by the producer of the DOMMediaStream (gUM etc.)
* Owned    - Contains Input tracks (per above) or tracks cloned tracks
             if this DOMMediaStream is a clone.
* Playback - Contains Owned tracks plus tracks addTrack()ed to this
             DOMMediaStream minus tracks removeTrack()ed from this
             DOMMediaStream.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : fba22e96c6c65a74e012509f3da67a4d7df7a244
2015-09-30 09:31:54 +08:00
Andreas Pehrson 53a6c38d0d Bug 1170958 - Allow MediaInputPort to lock to a specific input track. r=roc
Locking to specific tracks lets us dynamically remove and add single
tracks to a ProcessedMediaStream.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 0b1b79077f95bbefc8c71de551c5e3483a7d6ac0
2015-09-30 09:31:53 +08:00
Andreas Pehrson 2802ee3e88 Bug 1170958 - Add input stream and track as args to NotifyQueuedTrackChanges. r=roc
This allows for tracking the input track of an added track (for
ProcessedMediaStream tracks; SourceMediaStream tracks don't have input
tracks) directly in the NotifyQueuedTrackChanges handler, which will be
necessary for locking MediaInputPorts to specific tracks.

--HG--
extra : commitid : GPSNwBVyD4j
extra : rebase_source : 4bed5dffe66b71b7ad23f4c02531d84af25cd316
2015-09-30 09:31:53 +08:00
Carsten "Tomcat" Book 363e40e298 merge mozilla-inbound to mozilla-central a=merge 2015-09-28 14:13:24 +02:00
Carsten "Tomcat" Book fc4b2033ce merge fx-team to mozilla-central a=merge 2015-09-28 14:10:50 +02:00
Carsten "Tomcat" Book 2deb7b2220 merge b2g-inbound to mozilla-central a=merge 2015-09-28 14:08:18 +02:00
Nigel Babu 85f8d8c65e Backed out changeset ee27fc2f6a1d (bug 1208687) for W(4) bustage
ON A CLOSED TREE
2015-09-28 12:23:36 +05:30