da0df79d86
Bug 1426291 - Use DataMutex<T> to synchronize CDMCaps. r=jwwang
...
MozReview-Commit-ID: NLnoItNZKP
--HG--
extra : rebase_source : 39dd374343989350897aa3ab22b46fb554be17a9
2017-12-20 16:16:50 +13:00
8107c910bc
Bug 1422669 - Part4 - Kill string16 and replace with our SHA1 implementation. r=gerald
...
The reason explained in patch Part1 of Bug 1214018 and I just copy the reason below.
GetRawMachineId was returning its generated data through a 'string16', which on
Windows was conveniently equivalent to a std::wstring.
However on Mac, wstring uses 32-bit characters, so in order to comply with the
string16 interface, a lot of non-trivial code would have to be imported and
vetted.
Also, in the end GMPLoader::Load passes this string16 to SHA256_Update() as a
sequence of bytes, the actual type of the data is lost!
So to simplify this work, GetRawMachineId will now return its data through a
vector of bytes, and the platform-dependent implementations may use whatever
data type they want internally.
The Windows GetRawMachineId actually returns the same data in this vector, so
it stays compatible with the previous code.
MozReview-Commit-ID: 7xYgjndXWDX
--HG--
extra : rebase_source : 6a46bd7f06d6e4bc10bb98b600e7e5bc14c136ce
2017-12-06 16:52:31 +08:00
d9be66f8f8
Bug 1422669 - Part3 - Introduce rlz_lib::GetMachineId and its related helper functions. r=cpearce
...
Chromium uses rlz_lib::GetMachineId as a factor when calculating storage id.
MozReview-Commit-ID: AJbcnRXzi3m
--HG--
extra : rebase_source : 4e6a0eebaeec01fc7a78caeb8406d1e2ed09f1d4
2017-12-06 14:41:38 +08:00
8e31e4ddf5
Bug 1422669 - Part2 - Fix compiling error [-Werror,-Wcomma] by Part1 on OSX. r=gerald
...
--HG--
extra : rebase_source : 13c1151aefc9dfcfdd41bd44eafcb11828853528
2017-12-06 06:33:02 +00:00
92826eb75f
Bug 1422669 - Part1 - Restore librlz from Bug 1332530. r=cpearce
...
Sync with the upstream(Chromium src/rlz/) and try to revert the functionality of Bug 1332530.
rlz is linked into xul.
MozReview-Commit-ID: HsjnBRPnifh
--HG--
extra : rebase_source : 2867fe353d0c8c67535d29943f3536ef59d1d75e
2017-12-06 06:33:02 +00:00
4591d82b23
Bug 1394734 - Replace CONFIG['CLANG*'] by CONFIG['CC_TYPE'] r=glandium
...
MozReview-Commit-ID: HbF5oT5HW6f
--HG--
extra : rebase_source : eca479b6ae4bff7f600d1cdb39e11ac2057e4e79
2017-12-07 22:09:38 +01:00
9bfe27d903
Bug 1394734 - Replace CONFIG['GNU_C*'] by CONFIG['CC_TYPE'] r=glandium
...
MozReview-Commit-ID: 7duJk2gSd4m
--HG--
extra : rebase_source : 7312fe276e561e8c034a5f6749774ae812727f9c
2017-12-07 22:09:15 +01:00
07c97a5afe
Bug 1423773 - Part 1: Remove usage of nsStringGlue.h. r=glandium
...
This removes an unnecessary level of indirection by replacing all
nsStringGlue.h instances with just nsString.h.
--HG--
extra : rebase_source : 340989240af4018f3ebfd92826ae11b0cb46d019
2017-12-06 16:52:51 -08:00
fb6b360527
Bug 1422856 - Stop using GetNativePath in GMPServiceParent. r=cpearce
...
MozReview-Commit-ID: 2zr2RfZOPYs
--HG--
extra : rebase_source : e1ba72e9676833fea37267aae862f0dc3d3aaa6e
2017-12-05 01:05:36 +09:00
112525df79
Bug 1329385 - Fix leak in GMPServiceParent::GetContentParent - r=JamesCheng
...
Using a single-function MozPromise::Then, and capturing a UniquePtr (using
C++14 initialized lambda captures), the PromiseHolder cannot leak anymore.
Also using C++ initialized lambda captures for other variables, to avoid
unnecessary constructions and copies.
MozReview-Commit-ID: DVxyuJNa8YX
--HG--
extra : rebase_source : a7169d616da36597854bf37616228eb72636f2b7
2017-01-18 08:55:57 +11:00
a6426a74c0
Bug 1416686 - Reduce the uses of IPC_FAIL_NO_REASON in GMPChild.cpp. r=cpearce,dmajor
...
Originally, we use IPC_FAIL_NO_REASON to make IPC call return error and then it invokes MOZ_CRASH to kill the process itself.
By using IPC_FAIL, we can pass a descriptive reason to GMPChild::ProcessingError and Bug 1416667 will use MOZ_CRASH_UNSAFE_PRINTF
to print the reason to the crash report. In addition, we use CrashReporter::AnnotateCrashReport to record the lib path without exposing the data publicly.
MozReview-Commit-ID: 15n1PItLgAp
--HG--
extra : rebase_source : 011f02155b290f95fcde807264f3e1ffb9a09e80
2017-11-13 09:35:03 +00:00
c3103719c2
Bug 1416667 - Use MOZ_CRASH_UNSAFE_PRINTF in GMPChild::ProcessingError r=cpearce
...
We passed the crash reason to GMPChild::ProcessingError but we didn't use it anymore.
We can simply use MOZ_CRASH_UNSAFE_PRINTF instead of MOZ_CRASH to make the crash more descriptive.
MozReview-Commit-ID: D7mU3Dsg9V9
--HG--
extra : rebase_source : 467974fbcc81792850b6c4b1a6faa3e90cfabb41
2017-11-13 08:24:00 +00:00
0750d2d41a
Bug 1402519 - Remove MOZ_CRASHREPORTER directives from dom; r=peterv
...
MozReview-Commit-ID: 4G2C9y6csvc
--HG--
extra : rebase_source : f0259c59c263b677a3a44751219dcb54378d72bc
2017-10-10 12:43:09 +02:00
fb855aa7ba
Backed out 16 changesets (bug 1402519) for conflicts during merge r=backout on a CLOSED TREE
...
Backed out changeset 07fcf163241a (bug 1402519)
Backed out changeset c6d2ad45d8e2 (bug 1402519)
Backed out changeset 8a3caca61294 (bug 1402519)
Backed out changeset 01425eae2c48 (bug 1402519)
Backed out changeset cf298d3815de (bug 1402519)
Backed out changeset e1964f4389cd (bug 1402519)
Backed out changeset f405337f3569 (bug 1402519)
Backed out changeset a76356fd3359 (bug 1402519)
Backed out changeset d3bb350d1c34 (bug 1402519)
Backed out changeset 9d3bfd9f932c (bug 1402519)
Backed out changeset e3dd6e5b073f (bug 1402519)
Backed out changeset e801b0c00134 (bug 1402519)
Backed out changeset 8a4139fa5dca (bug 1402519)
Backed out changeset 8d01c14ac1ca (bug 1402519)
Backed out changeset 24e0dcd01898 (bug 1402519)
Backed out changeset f8fdf450613f (bug 1402519)
2017-11-23 00:11:44 +02:00
13bba6b3c4
Bug 1402519 - Remove MOZ_CRASHREPORTER directives from dom; r=peterv
...
MozReview-Commit-ID: 4G2C9y6csvc
--HG--
extra : rebase_source : 989a11eaed6641a17ab27ae10b7fea6277cec534
2017-10-10 12:43:09 +02:00
1691dbc3fd
Bug 1417795 - remove mp4_demuxer namespace part6. r=kinetik
...
MozReview-Commit-ID: FI139lJTTX9
--HG--
extra : rebase_source : 5871e418b7cad1c95976e46535d94d7374629156
2017-11-17 11:57:44 +08:00
187142dbec
Bug 1417794 - move Adts.h, AnnexB.h and H264.h to dom/media/platform/agnostic/bytestreams. r=kinetik
...
MozReview-Commit-ID: LUqvIdCD2XD
--HG--
rename : dom/media/platforms/agnostic/mp4_demuxer/Adts.cpp => dom/media/platforms/agnostic/bytestreams/Adts.cpp
rename : dom/media/platforms/agnostic/mp4_demuxer/Adts.h => dom/media/platforms/agnostic/bytestreams/Adts.h
rename : dom/media/platforms/agnostic/mp4_demuxer/AnnexB.cpp => dom/media/platforms/agnostic/bytestreams/AnnexB.cpp
rename : dom/media/platforms/agnostic/mp4_demuxer/AnnexB.h => dom/media/platforms/agnostic/bytestreams/AnnexB.h
rename : dom/media/platforms/agnostic/mp4_demuxer/H264.cpp => dom/media/platforms/agnostic/bytestreams/H264.cpp
rename : dom/media/platforms/agnostic/mp4_demuxer/H264.h => dom/media/platforms/agnostic/bytestreams/H264.h
rename : dom/media/platforms/agnostic/mp4_demuxer/moz.build => dom/media/platforms/agnostic/bytestreams/moz.build
extra : rebase_source : 45b73271e0bbd3da897a5c218c35343fd28071a1
2017-11-16 15:05:17 +08:00
76c71cd4dd
Bug 1415466 - Part2 - Fix compile error due to the interface change. r=cpearce
...
MozReview-Commit-ID: FOIrboj029C
--HG--
extra : rebase_source : eeb9d0c1b905cd38e2df8ad362c83138127bf441
2017-11-15 10:57:22 +08:00
cc08a7b5c3
Bug 1415466 - Part1 - Update content_decryption_module.h, there are no changes in the rest of headers. r=cpearce
...
MozReview-Commit-ID: HQUpqokQ3Eu
--HG--
extra : rebase_source : 80a0ac7adcd5a9d14fe8d9fe9f64e33eb5d286e1
2017-11-15 10:33:28 +08:00
464a5841ed
Bug 1417332 - Convert CDM Error to CDM Exception when we got OnLegacySessionError from CDM. r=cpearce
...
MozReview-Commit-ID: FQRZAhNfOcV
--HG--
extra : rebase_source : 3255554058fb450710e8086a65e24eb6545e2b71
2017-11-15 15:55:39 +08:00
f733aff224
Bug 1404230 - Part4 - Add GetStatusForPolicy method in ipdl and implement it by calling CDM. r=cpearce
...
MozReview-Commit-ID: 8L0qKgnKMES
--HG--
extra : rebase_source : 05b6fe33a9c0cbe5ca52f245decc167889bbe6d9
2017-10-24 10:55:03 +08:00
c48a2cbcfa
Bug 1404230 - Part3 - Add GetStatusForPolicy method in CDMProxy and its derived classes. r=cpearce
...
MozReview-Commit-ID: myrPzVi0rl
--HG--
extra : rebase_source : e576823470e9ac97c3c519bb286150d895953c8e
2017-10-05 15:37:25 +08:00
28fae71ddc
Bug 1415401 - Part4 - Have GMPServiceParent::RecvLaunchGMP fill in the error description. r=cpearce
...
MozReview-Commit-ID: GQoV7g1uQeC
--HG--
extra : rebase_source : 21bae673ebb3284fd298e69a8c701bc79b9f4e63
2017-11-10 12:03:00 +08:00
9774850bfe
Bug 1415401 - Part3 - Add an out parameter to LaunchGMP interface in ipdl to better know the error detail when failure. r=cpearce
...
MozReview-Commit-ID: BmiTYeQGIrm
--HG--
extra : rebase_source : 11070597467394a8764d8be4369226844b50c637
2017-11-10 11:28:45 +08:00
416a6083b2
Bug 1415401 - Part2 - Make GetServiceChildPromise rejection function accept MediaResult and propagate the error result to GetContentParent rejection function. r=cpearce
...
MozReview-Commit-ID: 4IjV9KGcsvd
--HG--
extra : rebase_source : 4177b93bc2af2908e701ecbf6ea1d439d24ea095
2017-11-09 18:01:01 +08:00
f8dcd36ce5
Bug 1415401 - Part1 - Make GetGMPContentParentPromise rejection function accept MediaResult. r=cpearce
...
MozReview-Commit-ID: CdDFgkDSomW
--HG--
extra : rebase_source : 1dec10d8b96ad31c0246427549d337cd8ba28c84
2017-11-09 17:21:59 +08:00
66e09cf477
Bug 1413480 - Check mCDM in ChromiumCDMChild::RecvXXX before dereferencing it. r=cpearce,kikuo
...
MozReview-Commit-ID: Dp4FOtZ8Yok
--HG--
extra : rebase_source : d22a854a9b883d008357ba6bbe5337f8eaf9fe8b
2017-11-08 15:44:34 +08:00
9406b5b8a2
Bug 1410689 - Early return before creating ChromiumCDM8BackwardsCompat to avoid leak. r=gerald
...
MozReview-Commit-ID: JQtJxBgzSFC
--HG--
extra : rebase_source : 3fb457062d773f1b44d3bc3bb7051a494e12a787
2017-10-23 11:29:58 +08:00
70736cfb1b
Bug 1401790 - Remove ProcessArchitecture from IPC. r=billm,jimm
...
This was used to support cross-architecture NPAPI plugins on OS X, but
we stopped supporting that in 54 (bug 1339182).
MozReview-Commit-ID: 2BcWYD6mguY
--HG--
extra : rebase_source : 6e509a3cc1f356ccd24f1459c43bc8fb66d7b0f4
2017-10-04 20:31:12 -06:00
279b3dd5ce
Bug 1409747 - fixed compilation on macOS with the sandbox disabled; r=haik
...
MozReview-Commit-ID: F9lNO8OPKS4
--HG--
extra : rebase_source : dbf7e1858f712182bab5c85fbd70b5b4293c5db5
2017-10-18 10:27:34 -04:00
32f7c8fec3
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: 1h3kZyrtqSt
2017-10-17 11:45:16 +02:00
60d080b412
Bug 1404198: Part 2i - Switch to NS_NewTimer* in dom. r=njn
...
MozReview-Commit-ID: 8Oei6TuXNbu
--HG--
extra : rebase_source : 31c583c699790cbcf302064146d313ee8126ef0c
2017-10-15 23:15:40 -07:00
019e9610a0
Bug 1407523 - Add more detailed message when GetCDM failed. r=cpearce
...
MozReview-Commit-ID: qEpvjyc6bY
--HG--
extra : rebase_source : 09e0579a76362d409749daf9b53e6a21da3818e3
2017-10-11 14:04:16 +08:00
a18e6f1765
Bug 1406080 - Part1 - Make ChromiumCDMAdapter and ChromiumCDMChild compatible with CDM version 8 and 9. r=cpearce
...
MozReview-Commit-ID: HXT2hcCX2jT
--HG--
extra : rebase_source : 7300b1d571defaab18638e4a7e60075c19821f1c
2017-10-11 23:39:47 +08:00
64ae68efce
Bug 1403830 - [Part2] Remove unnecessary code and include header using gmp-platform.h. r=cpearce
...
MozReview-Commit-ID: huebQ9Ihs8
--HG--
extra : rebase_source : ff8cd329bf19f4158ac435f644c4c9dae44d890c
2017-09-28 16:18:16 +08:00
8f80fefaf0
Bug 1403830 - [Part1] Remove gmp-decryption.h and its related code. r=cpearce
...
MozReview-Commit-ID: G8RHADhfd3c
--HG--
extra : rebase_source : 125098fb689e5d031f042c9b3976a8163f41ff51
2017-09-28 15:50:28 +08:00
ec87af6c06
Bug 1403804 - P2 - Remove remaining GMPCDMProxy term. r=cpearce
...
MozReview-Commit-ID: IlcqZWYlFPv
--HG--
extra : rebase_source : 7bc9bc7ef3573f491be833003e52aa8c4ccddf3e
2017-09-28 11:58:35 +08:00
bd88dbe2fe
Bug 1403804 - P1 - Remove PGMPDecryptor.ipdl and its related code from code base. r=cpearce
...
MozReview-Commit-ID: 4mxdcvnRl3W
--HG--
extra : rebase_source : 4c047fa94448bdde302f4b325f786f1d1b904388
2017-09-28 11:40:30 +08:00
06ead99170
Bug 1396493 - Part1 - Convert gmp-fake to use Chromium ContentDecryptionModule8 interface. r=cpearce
...
MozReview-Commit-ID: JAGAnVuEGSE
--HG--
extra : rebase_source : bc5e1e721478fc708affaa077ff73388fd312478
2017-09-25 17:40:22 +08:00
45aa2a8e8e
Bug 870698 - Part 2: Replace Append("") with AppendLiteral(""). r=erahm
...
MozReview-Commit-ID: CrkIP4iHP1U
--HG--
extra : rebase_source : 5dc4e91a3f1860773c199f1abf3f66479218834a
extra : intermediate-source : ba51cc79847f2b43ba616f4a5d2bbc6958ca9f6d
extra : source : 1fda2fa990cc918c748ffa14fcc5dbe13fe3bdc3
2017-09-03 22:14:11 -07:00
59439b26b7
Bug 1401114 - Replace 'if (NS_FAILED(' with 'if (NS_WARN_IF(NS_FAILED(' under dom/media/gmp. r=gerald
...
MozReview-Commit-ID: 8ThoMrmlHNx
--HG--
extra : rebase_source : ae5095a7f756576cd9f7951651f060c67bc5e2a3
2017-09-19 16:14:49 +08:00
7789212fcf
Bug 1399754 - [Part2] Fix wrong format string. r=cpearce
...
MozReview-Commit-ID: 5oXE0UvGeFt
--HG--
extra : rebase_source : 92ecf466b49f4062a85f058b802c37887cabf23a
2017-09-14 17:18:00 +08:00
1d71cf11e9
Bug 1399754 - [Part1] Replace CDM_LOG with GMP_LOG. r=cpearce
...
MozReview-Commit-ID: IG3qsRGW42E
--HG--
extra : rebase_source : 0b0cd4a394a5c15ed8fa8b631c149c962297e55e
2017-09-14 16:00:58 +08:00
be5b995e78
Bug 1397123 - [Part2] Decouple ChromiumCDMProxy from ChromiumCDMParent. r=cpearce
...
1. Pass ChromiumCDMCallback interface to ChromiumCDMParent instead of ChromiumCDMProxy directly.
2. Wrap dispatching to main thread function to clean up the redundant code.
MozReview-Commit-ID: 5HxS9Fc1yr
--HG--
extra : rebase_source : 3ac4c4b260f3196bd862e97aaf12c2422d43ad11
2017-09-11 12:17:36 +08:00
e3b97ecea3
Bug 1397123 - [Part1] Make aMessage of CDMProxy::OnSessionMessage const. r=cpearce
...
MozReview-Commit-ID: Bsw6s2HE02
--HG--
extra : rebase_source : 40a0bd4d5cc20210322daed0eba04dec2273fbd7
2017-09-11 12:16:18 +08:00
2387b87164
Backed out 2 changesets (bug 1397123) for Android build bustage
...
Backed out changeset 803c2d6f4be4 (bug 1397123)
Backed out changeset 2d41a6eb4df4 (bug 1397123)
MozReview-Commit-ID: A45nVCrhbQA
2017-09-11 20:23:22 -07:00
48f1756606
Bug 1397123 - [Part2] Decouple ChromiumCDMProxy from ChromiumCDMParent. r=cpearce
...
1. Pass ChromiumCDMCallback interface to ChromiumCDMParent instead of ChromiumCDMProxy directly.
2. Wrap dispatching to main thread function to clean up the redundant code.
MozReview-Commit-ID: 5HxS9Fc1yr
--HG--
extra : rebase_source : ff3227b01003398d0410bdde5f43621f44d9e477
2017-09-11 12:17:36 +08:00
7cfecdecc8
Bug 1397123 - [Part1] Make aMessage of CDMProxy::OnSessionMessage const. r=cpearce
...
MozReview-Commit-ID: Bsw6s2HE02
--HG--
extra : rebase_source : e165dd24b22a06f5a7a9ebe2797136b4109a203f
2017-09-11 12:16:18 +08:00
daea8f027c
Bug 1395468 - [Part3] Remove WidevineAdapter and its related classes. r=cpearce
...
We now only use the Chromium CDM interface, so there is no need to check isWidevine.
We don't use WidevineAdapter anymore so remove the related check and unused classes.
MozReview-Commit-ID: 3y1lH3OMhwL
--HG--
extra : rebase_source : 955395f3bbbd523236e9ac2480ef21093a281084
2017-08-29 17:42:25 +08:00
b01615f4a0
Bug 1395468 - [Part2] Remove the EMEVideoDecoder and GMPCDMProxy related files. r=cpearce
...
We remove the instantiation of EMEVideoDecoder and GMPCDMProxy in Part1. Just delete it and its h/cpp from moz.build
MozReview-Commit-ID: 8kGQK967pR0
--HG--
extra : rebase_source : 77750e6a92e6b649c41e7a8f769fa14c810e8e18
2017-08-29 16:52:09 +08:00
Chris Pearce
James Cheng
Sylvestre Ledru
Eric Rahm
Masatoshi Kimura
Gerald Squelart
Gabriele Svelto
shindli
Alfredo.Yang
Jed Davis
Alex Gaynor
Sebastian Hengst
Kris Maglione
Chris Peterson
Phil Ringnalda