admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[desktopCapture] remove reduntant check and fix comments error

Browse Source 
The title of Dock window on OSX10.12 is still 'Dock' with layer number 20.
So the removed codes here is reduntant.
Also fix a wrong comment.

Bug: webrtc:8460
Change-Id: I72d4c8f5741a1ccb00aa45897f11e85af8d24e05
Reviewed-on: https://webrtc-review.googlesource.com/33123
Commit-Queue: Brave Yao <braveyao@webrtc.org>
Reviewed-by: Zijie He <zijiehe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#21287}
This commit is contained in:
braveyao 2017-12-14 14:13:15 -08:00 committed by Commit Bot
parent 5cab6f1dc7
commit 70ae347896
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/desktop_capture/mac/window_list_utils.cc
View File

@ -130,12 +130,6 @@ bool GetWindowList(rtc::FunctionView<bool(CFDictionaryRef)> on_window,
continue;
}
// TODO(webrtc:8460): On 10.12, the name of the dock window is not "Dock"
// anymore. The following check should be removed soon or later.
if (CFStringCompare(window_title, CFSTR("Dock"), 0) == 0) {
continue;
}
CFNumberRef window_id = reinterpret_cast<CFNumberRef>(
CFDictionaryGetValue(window, kCGWindowNumber));
if (!window_id) {
@ -148,10 +142,7 @@ bool GetWindowList(rtc::FunctionView<bool(CFDictionaryRef)> on_window,
continue;
}
// Skip windows with layer=0 (menu, dock).
// TODO(zijiehe): The windows with layer != 0 are skipped, is this a bug in
// code (not likely) or a bug in comments? What's the meaning of window
// layer number in the first place.
// Skip windows with layer!=0 (menu, dock).
int layer;
if (!CFNumberGetValue(window_layer, kCFNumberIntType, &layer)) {
continue;