corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 572c610328c6 (bug 1036653)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-08-27 09:20:40 +02:00
parent aa83692823
commit b394fe6bee
6 changed files with 78 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dom/media/MediaManager.cpp
View File

@@ -2062,8 +2062,7 @@ WindowsHashToArrayFunc (const uint64_t& aId,
nsRefPtr<GetUserMediaCallbackMediaStreamListener> listener =
aData->ElementAt(i);
if (listener->CapturingVideo() || listener->CapturingAudio() ||
listener->CapturingScreen() || listener->CapturingWindow() ||
listener->CapturingApplication()) {
listener->CapturingScreen() || listener->CapturingWindow()) {
capturing = true;
break;
}
@@ -2148,8 +2147,7 @@ MediaManager::MediaCaptureWindowStateInternal(nsIDOMWindow* aWindow, bool* aVide
if (listener->CapturingScreen()) {
*aScreenShare = true;
}
if (listener->CapturingWindow() || listener->CapturingApplication()) {
// treat window and application as the same
if (listener->CapturingWindow()) {
*aWindowShare = true;
}
}