Commit Graph

191 Commits

Author SHA1 Message Date
Jan-Ivar Bruaroey
d4bc9fa237 Bug 1173255 - Cleanup MediaManager e10s code in prep for deviceId constraint. r=jesup
--HG--
extra : amend_source : 057f17d55cd44a700abab5595c9f4fc95cfd2419
extra : transplant_source : %B7%5C%7D%FA%E9%3F%29%F9%EBM%9E%B5%1A%A6G%29%25%01%0E-
extra : histedit_source : a10d0d5106f5fffb3881604728c1933c90772622%2Cdf022706033cb19f87a8dd58376ab7800d9d2526
2015-06-18 11:46:36 -04:00
Eric Rahm
75c4bebb79 Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
  PR_LOG_ERROR   -> LogLevel::Error
  PR_LOG_WARNING -> LogLevel::Warning
  PR_LOG_WARN    -> LogLevel::Warning
  PR_LOG_INFO    -> LogLevel::Info
  PR_LOG_DEBUG   -> LogLevel::Debug
  PR_LOG_NOTICE  -> LogLevel::Debug
  PR_LOG_VERBOSE -> LogLevel::Verbose

Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.

Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00
Carsten "Tomcat" Book
5471309381 Backed out 14 changesets (bug 1165515) for linux x64 e10s m2 test failures
Backed out changeset d68dcf2ef372 (bug 1165515)
Backed out changeset 7c3b45a47811 (bug 1165515)
Backed out changeset b668b617bef2 (bug 1165515)
Backed out changeset d0916e1283a2 (bug 1165515)
Backed out changeset ac4dc7489942 (bug 1165515)
Backed out changeset e9632ce8bc65 (bug 1165515)
Backed out changeset c16d215cc7e4 (bug 1165515)
Backed out changeset e4d474f3c51a (bug 1165515)
Backed out changeset d87680bf9f7c (bug 1165515)
Backed out changeset b3c0a45ba99e (bug 1165515)
Backed out changeset 9370fa197674 (bug 1165515)
Backed out changeset 50970d668ca1 (bug 1165515)
Backed out changeset ffa4eb6d24b9 (bug 1165515)
Backed out changeset 5fcf1203cc1d (bug 1165515)

--HG--
extra : rebase_source : 6fb850d063cbabe738f97f0380302153e3eae97a
2015-06-02 13:05:56 +02:00
Eric Rahm
a9afd68cef Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
  PR_LOG_ERROR   -> LogLevel::Error
  PR_LOG_WARNING -> LogLevel::Warning
  PR_LOG_WARN    -> LogLevel::Warning
  PR_LOG_INFO    -> LogLevel::Info
  PR_LOG_DEBUG   -> LogLevel::Debug
  PR_LOG_NOTICE  -> LogLevel::Debug
  PR_LOG_VERBOSE -> LogLevel::Verbose

Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.

Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 22:17:33 -07:00
Wes Kocher
4e9f80ed2e Backed out 14 changesets (bug 1165515) for b2g mochitest-6 permafail CLOSED TREE
Backed out changeset 9b97e2aa2ed9 (bug 1165515)
Backed out changeset 150606c022a2 (bug 1165515)
Backed out changeset 4e875a488349 (bug 1165515)
Backed out changeset 467e7feeb546 (bug 1165515)
Backed out changeset d6b6cc373197 (bug 1165515)
Backed out changeset 0615265b593c (bug 1165515)
Backed out changeset fafd1dce9f08 (bug 1165515)
Backed out changeset d1df869245f9 (bug 1165515)
Backed out changeset 6876a7c63611 (bug 1165515)
Backed out changeset b7841c94a9a3 (bug 1165515)
Backed out changeset e5e3617f7c73 (bug 1165515)
Backed out changeset 39be3db95978 (bug 1165515)
Backed out changeset 0ec74176f8de (bug 1165515)
Backed out changeset 5b928dd10d71 (bug 1165515)
2015-06-01 17:57:58 -07:00
Eric Rahm
f82c0e7caf Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
  PR_LOG_ERROR   -> LogLevel::Error
  PR_LOG_WARNING -> LogLevel::Warning
  PR_LOG_WARN    -> LogLevel::Warning
  PR_LOG_INFO    -> LogLevel::Info
  PR_LOG_DEBUG   -> LogLevel::Debug
  PR_LOG_NOTICE  -> LogLevel::Debug
  PR_LOG_VERBOSE -> LogLevel::Verbose

Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.

Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 14:31:01 -07:00
Randell Jesup
92797f7344 Bug 1164463 - Clean up MediaManager shutdown to be reliable and avoid holding locks while Joining a thread. r=jib 2015-05-29 14:28:03 -04:00
Ryan VanderMeulen
41ad07d757 Backed out changeset 03abe252fc92 (bug 1164463) for WinXP debug 868504.html permacrash.
CLOSED TREE
2015-05-29 13:10:21 -04:00
Randell Jesup
c4233dd2c5 Bug 1164463: clean up MediaManager shutdown to be reliable and avoid holding locks while Joining a thread r=jib 2015-05-29 10:10:02 -04:00
Eric Rahm
3925a960aa Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj 2015-05-21 13:22:04 -07:00
Eric Rahm
4879ae86f4 Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj 2015-05-19 11:15:34 -07:00
Eric Rahm
34f99e4b4c Bug 1163201 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/. r=froydnj
PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
2015-05-14 10:13:23 -07:00
Andrea Marchesini
e666f02521 Bug 1156632 - Remove unused forward class declarations - patch 2 - dom/media, dom/indexedDB, dom/svg, r=ehsan 2015-04-22 08:29:17 +02:00
Jan-Ivar Bruaroey
c6676519f2 Bug 1046245 - enumerateDevices w/non-blocking e10s, nsICryptoHMAC, clear cookies, lambdas. r=keeler, florian, billm, jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
95f7adab84 Bug 1046245 - enumerateDevices origin-unique ids persisted to disk. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
8af3083f44 Bug 1046245 - enumerateDevices session-persisted hmac id. r=jesup 2015-02-23 11:50:48 -05:00
Jan-Ivar Bruaroey
7538e95524 Bug 1046245 - enumerateDevices returns label for pages w/active gUM or persistent permissions. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
b711b1abcf Bug 1046245 - enumerateDevices (harmless interface version) r=smaug, r=jesup 2015-03-03 09:51:05 -05:00
Randell Jesup
2b3486247c Backed out 6 changesets (bug 1046245) on a CLOSED TREE 2015-03-29 01:42:32 -04:00
Jan-Ivar Bruaroey
cdd0b089a5 Bug 1046245 - enumerateDevices w/non-blocking e10s, nsICryptoHMAC, clear cookies, lambdas. r=keeler, r=florian, r=billm, r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
c4161900da Bug 1046245 - enumerateDevices origin-unique ids persisted to disk. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
34c27979df Bug 1046245 - enumerateDevices session-persisted hmac id. r=jesup 2015-02-23 11:50:48 -05:00
Jan-Ivar Bruaroey
2c6d1d99bc Bug 1046245 - enumerateDevices returns label for pages w/active gUM or persistent permissions. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
a0143ecf52 Bug 1046245 - enumerateDevices (harmless interface version). r=smaug, r=jesup 2015-03-03 09:51:05 -05:00
Phil Ringnalda
24b4f38005 Back out 6 changesets (bug 1046245) for thinking that MSVC would have anything to do with a __PRETTY_FUNCTION__
CLOSED TREE

Backed out changeset 9e3ecca831d8 (bug 1046245)
Backed out changeset 87dc145f4da8 (bug 1046245)
Backed out changeset 01606cf19a77 (bug 1046245)
Backed out changeset 2ed2b15fe940 (bug 1046245)
Backed out changeset 2b99b193828a (bug 1046245)
Backed out changeset d1ac67faccbb (bug 1046245)
2015-03-28 19:57:17 -07:00
Jan-Ivar Bruaroey
222e93c87c Bug 1046245 - enumerateDevices w/non-blocking e10s, nsICryptoHMAC, clear cookies, lambdas. r=keeler, r=florian, r=billm, r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
1668e7a628 Bug 1046245 - enumerateDevices origin-unique ids persisted to disk. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
7d79ddc696 Bug 1046245 - enumerateDevices session-persisted hmac id. r=jesup 2015-02-23 11:50:48 -05:00
Jan-Ivar Bruaroey
6bea0d068b Bug 1046245 - enumerateDevices returns label for pages w/active gUM or persistent permissions. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
08e703b65e Bug 1046245 - enumerateDevices (harmless interface version). r=smaug, r=jesup 2015-03-03 09:51:05 -05:00
Ryan VanderMeulen
003e8f5278 Backed out 6 changesets (bug 1046245) for bustage on a CLOSED TREE.
Backed out changeset 222c2f9e3bc9 (bug 1046245)
Backed out changeset 4251eef464a2 (bug 1046245)
Backed out changeset 592f4cc23197 (bug 1046245)
Backed out changeset 5bfb9a1c0550 (bug 1046245)
Backed out changeset e966a5df87b6 (bug 1046245)
Backed out changeset 609f3ca64004 (bug 1046245)
2015-03-28 16:24:25 -04:00
Jan-Ivar Bruaroey
59e13faed0 Bug 1046245 - enumerateDevices w/non-blocking e10s, nsICryptoHMAC, clear cookies, lambdas. r=keeler, r=florian, r=billm, r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
6a70b84a54 Bug 1046245 - enumerateDevices origin-unique ids persisted to disk. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
600361d553 Bug 1046245 - enumerateDevices session-persisted hmac id. r=jesup 2015-02-23 11:50:48 -05:00
Jan-Ivar Bruaroey
4a058ae74a Bug 1046245 - enumerateDevices returns label for pages w/active gUM or persistent permissions. r=jesup 2015-03-03 09:51:05 -05:00
Jan-Ivar Bruaroey
f33f50277c Bug 1046245 - enumerateDevices (harmless interface version). r=smaug, r=jesup 2015-03-03 09:51:05 -05:00
Andrea Marchesini
e6f385fb3d Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
Ehsan Akhgari
883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Jan-Ivar Bruaroey
e9cc1b61ab Bug 1145403 - Don't open MediaManager on shutdown. r=jesup 2015-03-19 18:43:25 -04:00
Wes Kocher
42e0c8a496 Merge m-c to fx-team a=merge CLOSED TREE 2015-03-11 19:09:10 -07:00
Andrew Osmond
ce39ae083d Bug 1139027 - Permit running of camera mochitests on B2G desktop. r=mikeh 2015-03-10 19:39:49 -04:00
Mike de Boer
04f3c42e8e Bug 1139907: show WebRTC screen sharing notification icon in Hello conversation window and globally when tab sharing is active. r=jesup,florian 2015-03-11 16:34:31 +01:00
Andreas Pehrson
9b19093204 Bug 1129263 - Part 6. Remove DOMMediaStream::TrackTypeHints. r=roc,jesup 2015-02-09 15:23:34 +08:00
Jan-Ivar Bruaroey
8c1b9f1777 Bug 1119335 - support ideal/exact constraint syntax. r=mrbkap, r=mt 2015-02-20 17:06:26 -05:00
Randell Jesup
b155c873e1 Bug 1116925: queue track adds for getUserMedia and cleanup r=roc 2015-02-19 12:04:26 -05:00
Jan-Ivar Bruaroey
9ce1941985 Bug 1006707 - add microphone to mediaSource and remove redundant enum in c++. r=rjesup 2015-01-20 10:31:59 -05:00
Robert O'Callahan
f96b8494a1 Bug 1109644. Part 6: Remove aLastEndTime parameter from NotifyPull. r=jesup
--HG--
extra : rebase_source : 47c950d1b1d03a8de279f2ac361b8dcd4ab0f801
2014-12-30 14:54:03 +13:00
Robert O'Callahan
407c1d5331 Bug 1061046. Part 19: Eliminate TrackTicks in favour of StreamTime. r=karlt 2014-09-18 17:20:43 +12:00
Jan-Ivar Bruaroey
54d43d8dad Bug 1033885 - return MediaStreamError instead of error strings, to spec. r=bz, r=jesup 2014-10-27 15:42:56 -04:00
Jan-Ivar Bruaroey
d3aef91306 Bug 1033885 - rename error to onFailure in code before introducing an actual error object r=jesup 2014-10-17 20:47:46 -04:00