From e21f3f574b59cf0517414cd8c655f7629ab80607 Mon Sep 17 00:00:00 2001 From: Niels Moller Date: Tue, 20 Aug 2019 09:58:21 +0000 Subject: [PATCH] Revert "Delete mac_utils.h and mac_utils.cc" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ada8e17125d2124f5bcdc1558182ce95d6311d93. Reason for revert: Breaks chromium, due to undeclared dependency on SystemConfiguration.framework Original change's description: > Delete mac_utils.h and mac_utils.cc > > They defined two functions: ToUtf16 and ToUtf8. The former was unused, > and the latter is moved to > modules/desktop_capture/mac/window_list_utils.cc, the only user. > > Tbr: sergeyu@chromium.org > Bug: None > Change-Id: Ib8a513da42e43ba8d41a2de4c1645b3f48448dc9 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148531 > Commit-Queue: Niels Moller > Reviewed-by: Kári Helgason > Reviewed-by: Sergey Ulanov > Cr-Commit-Position: refs/heads/master@{#28913} TBR=zijiehe@chromium.org,nisse@webrtc.org,kthelgason@webrtc.org,sergeyu@google.com,sergeyu@chromium.org Change-Id: I9d6a2f63b3acde0eefab92d034529b800d6adcab No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149811 Reviewed-by: Niels Moller Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#28915} --- .../mac/full_screen_chrome_window_detector.cc | 1 + .../desktop_capture/mac/window_list_utils.cc | 18 ++----- .../mouse_cursor_monitor_mac.mm | 1 + .../desktop_capture/window_capturer_mac.mm | 1 + rtc_base/BUILD.gn | 13 +++++ rtc_base/mac_utils.cc | 48 +++++++++++++++++++ rtc_base/mac_utils.h | 23 +++++++++ 7 files changed, 90 insertions(+), 15 deletions(-) create mode 100644 rtc_base/mac_utils.cc create mode 100644 rtc_base/mac_utils.h diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc index f2c8fd47ab..afa44731e7 100644 --- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc +++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc @@ -16,6 +16,7 @@ #include "modules/desktop_capture/mac/window_list_utils.h" #include "rtc_base/logging.h" +#include "rtc_base/mac_utils.h" #include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc index 3f0a9b0940..5899530bb4 100644 --- a/modules/desktop_capture/mac/window_list_utils.cc +++ b/modules/desktop_capture/mac/window_list_utils.cc @@ -19,6 +19,7 @@ #include #include "rtc_base/checks.h" +#include "rtc_base/mac_utils.h" static_assert(static_cast(kCGNullWindowID) == webrtc::kNullWindowId, @@ -28,19 +29,6 @@ namespace webrtc { namespace { -bool ToUtf8(const CFStringRef str16, std::string* str8) { - size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16), - kCFStringEncodingUTF8) + - 1; - std::unique_ptr buffer(new char[maxlen]); - if (!buffer || - !CFStringGetCString(str16, buffer.get(), maxlen, kCFStringEncodingUTF8)) { - return false; - } - str8->assign(buffer.get()); - return true; -} - // Get CFDictionaryRef from |id| and call |on_window| against it. This function // returns false if native APIs fail, typically it indicates that the |id| does // not represent a window. |on_window| will not be called if false is returned @@ -259,7 +247,7 @@ std::string GetWindowTitle(CFDictionaryRef window) { CFStringRef title = reinterpret_cast( CFDictionaryGetValue(window, kCGWindowName)); std::string result; - if (title && ToUtf8(title, &result)) { + if (title && rtc::ToUtf8(title, &result)) { return result; } @@ -280,7 +268,7 @@ std::string GetWindowOwnerName(CFDictionaryRef window) { CFStringRef owner_name = reinterpret_cast( CFDictionaryGetValue(window, kCGWindowOwnerName)); std::string result; - if (owner_name && ToUtf8(owner_name, &result)) { + if (owner_name && rtc::ToUtf8(owner_name, &result)) { return result; } return std::string(); diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm index afc4497cf7..35ef39463b 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm +++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm @@ -27,6 +27,7 @@ #include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include "modules/desktop_capture/mac/window_list_utils.h" #include "modules/desktop_capture/mouse_cursor.h" +#include "rtc_base/mac_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm index 828122b982..fae3f9854b 100644 --- a/modules/desktop_capture/window_capturer_mac.mm +++ b/modules/desktop_capture/window_capturer_mac.mm @@ -27,6 +27,7 @@ #include "modules/desktop_capture/window_finder_mac.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" +#include "rtc_base/mac_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 7b0108d45d..b937714c2a 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -926,6 +926,19 @@ rtc_static_library("rtc_base") { ] } + if (is_mac) { + sources += [ + "mac_utils.cc", + "mac_utils.h", + ] + libs += [ + "Cocoa.framework", + "Foundation.framework", + "IOKit.framework", + "Security.framework", + "SystemConfiguration.framework", + ] + } if (is_ios) { libs += [ "CFNetwork.framework", diff --git a/rtc_base/mac_utils.cc b/rtc_base/mac_utils.cc new file mode 100644 index 0000000000..d2428b4e0c --- /dev/null +++ b/rtc_base/mac_utils.cc @@ -0,0 +1,48 @@ +/* + * Copyright 2007 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "rtc_base/mac_utils.h" + +#include + +#include +#include + +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" + +namespace rtc { + +bool ToUtf8(const CFStringRef str16, std::string* str8) { + if ((nullptr == str16) || (nullptr == str8)) { + return false; + } + size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16), + kCFStringEncodingUTF8) + + 1; + std::unique_ptr buffer(new char[maxlen]); + if (!buffer || + !CFStringGetCString(str16, buffer.get(), maxlen, kCFStringEncodingUTF8)) { + return false; + } + str8->assign(buffer.get()); + return true; +} + +bool ToUtf16(const std::string& str8, CFStringRef* str16) { + if (nullptr == str16) { + return false; + } + *str16 = CFStringCreateWithBytes(kCFAllocatorDefault, + reinterpret_cast(str8.data()), + str8.length(), kCFStringEncodingUTF8, false); + return nullptr != *str16; +} +} // namespace rtc diff --git a/rtc_base/mac_utils.h b/rtc_base/mac_utils.h new file mode 100644 index 0000000000..5f5b8364a4 --- /dev/null +++ b/rtc_base/mac_utils.h @@ -0,0 +1,23 @@ +/* + * Copyright 2007 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef RTC_BASE_MAC_UTILS_H_ +#define RTC_BASE_MAC_UTILS_H_ + +#include + +#include + +namespace rtc { +bool ToUtf8(const CFStringRef str16, std::string* str8); +bool ToUtf16(const std::string& str8, CFStringRef* str16); +} // namespace rtc + +#endif // RTC_BASE_MAC_UTILS_H_