diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 10:22:59 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 12:17:14 +0000 |
commit | 69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (patch) | |
tree | c8b7f735583d0b4e0c0b61a014a7f4b3b26e85ab /chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc | |
parent | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (diff) | |
download | qtwebengine-chromium-69b8f9169ffd66fdeca1ac60a4bc06b91d106186.tar.gz |
BASELINE: Update Chromium to 63.0.3239.87
Change-Id: Iac27464730121b4fac76869d87d622504642e016
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc')
-rw-r--r-- | chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc b/chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc index 3572d85be0e..005b1c64b2c 100644 --- a/chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc +++ b/chromium/third_party/webrtc/modules/desktop_capture/mac/window_list_utils.cc @@ -96,6 +96,12 @@ 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) { @@ -210,7 +216,10 @@ WindowId GetWindowId(CFDictionaryRef window) { return kNullWindowId; } - WindowId id; + // Note: WindowId is 64-bit on 64-bit system, but CGWindowID is always 32-bit. + // CFNumberGetValue() fills only top 32 bits, so we should use CGWindowID to + // receive the window id. + CGWindowID id; if (!CFNumberGetValue(window_id, kCFNumberIntType, &id)) { return kNullWindowId; } |