
Reason for revert: Build issues have now _really_ been fixed Original issue's description: > Revert of move all reference to carbon api (patchset #2 id:300001 of https://codereview.webrtc.org/2321493002/ ) > > Reason for revert: > Still breaks Chromium mac compile: > [4542/22193] CXX obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > FAILED: obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/webrtc/base/rtc_base/unixfilesystem.o.d -DLOGGING=1 -DV8_DEPRECATION_WARNINGS -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PDF=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DDCHECK_ALWAYS_ON=1 -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DUSE_PROPRIETARY_CODECS -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=280106-1 -DCR_XCODE_VERSION=0511 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBRTC_RESTRICT_LOGGING -DEXPAT_RELATIVE_PATH -DENABLE_EXTERNAL_AUTH -DHAVE_OPENSSL_SSL_H -DHAVE_SCTP -DHAVE_SRTP -DHAVE_WEBRTC_VIDEO -DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DSRTP_RELATIVE_PATH -DSSL_USE_OPENSSL -DUSE_WEBRTC_DEV_BRANCH -DSSL_USE_OPENSSL -DHAVE_OPENSSL_SSL_H -DFEATURE_ENABLE_SSL -DLOGGING=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_MAC -DNO_MAIN_THREAD_WRAPPING -I../../third_party/webrtc_overrides -I../../third_party/boringssl/src/include -I../.. -Igen -I../../third_party/jsoncpp/overrides/include -I../../third_party/jsoncpp/source/include -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -Wno-uninitialized -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -arch x86_64 -O2 -g1 -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Werror -Wall -Wno-unused-variable -Wpartial-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -fno-threadsafe-statics -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -c ../../third_party/webrtc/base/unixfilesystem.cc -o obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > ../../third_party/webrtc/base/unixfilesystem.cc:375:11: error: variable has incomplete type 'FSRef' > FSRef fr; > ^ > /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFURL.h:467:8: note: forward declaration of 'FSRef' > struct FSRef; > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:27: error: use of undeclared identifier 'kUserDomain' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:40: error: use of undeclared identifier 'kApplicationSupportFolderType' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:377:27: error: use of undeclared identifier 'kCreateFolder'; did you mean 'CreateFolder'? > kCreateFolder, &fr)) > ^~~~~~~~~~~~~ > CreateFolder > ../../third_party/webrtc/base/unixfilesystem.cc:92:22: note: 'CreateFolder' declared here > bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) { > > Original issue's description: > > Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2316563002/ ) > > > > Reason for revert: > > Chromium build issues have been resolved. > > > > Original issue's description: > > > Revert of Remove all reference to carbon api (patchset #2 id:20001 of https://codereview.webrtc.org/2299633002/ ) > > > > > > Reason for revert: > > > Breaks chromium build > > > > > > Original issue's description: > > > > Remove all reference to carbon api > > > > > > > > BUG=webrtc:6282 > > > > > > > > Committed: https://crrev.com/dbd8b6bec4143c940b2f2ca8cd85c25d17327964 > > > > Cr-Commit-Position: refs/heads/master@{#14080} > > > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:6282 > > > > > > Committed: https://crrev.com/b096aa7fd375a980daab3a986596548ca5de2a1c > > > Cr-Commit-Position: refs/heads/master@{#14081} > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:6282 > > > > Committed: https://crrev.com/a90879b64fd8db57c0274169311d6b51dd59f1a0 > > Cr-Commit-Position: refs/heads/master@{#14125} > > TBR=mflodman@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6282 > > Committed: https://crrev.com/4e0581f543b026cbc31c3b24cf65c7f51dcd6124 > Cr-Commit-Position: refs/heads/master@{#14133} TBR=mflodman@webrtc.org,magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6282 Review-Url: https://codereview.webrtc.org/2327573002 Cr-Commit-Position: refs/heads/master@{#14155}
190 lines
6.4 KiB
C++
190 lines
6.4 KiB
C++
/*
|
|
* Copyright 2010 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 "webrtc/base/macwindowpicker.h"
|
|
|
|
#include <ApplicationServices/ApplicationServices.h>
|
|
#include <CoreFoundation/CoreFoundation.h>
|
|
#include <dlfcn.h>
|
|
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/base/macutils.h"
|
|
|
|
namespace rtc {
|
|
|
|
static const char* kCoreGraphicsName =
|
|
"/System/Library/Frameworks/ApplicationServices.framework/Frameworks/"
|
|
"CoreGraphics.framework/CoreGraphics";
|
|
|
|
static const char* kWindowListCopyWindowInfo = "CGWindowListCopyWindowInfo";
|
|
static const char* kWindowListCreateDescriptionFromArray =
|
|
"CGWindowListCreateDescriptionFromArray";
|
|
|
|
// Function pointer for holding the CGWindowListCopyWindowInfo function.
|
|
typedef CFArrayRef(*CGWindowListCopyWindowInfoProc)(CGWindowListOption,
|
|
CGWindowID);
|
|
|
|
// Function pointer for holding the CGWindowListCreateDescriptionFromArray
|
|
// function.
|
|
typedef CFArrayRef(*CGWindowListCreateDescriptionFromArrayProc)(CFArrayRef);
|
|
|
|
MacWindowPicker::MacWindowPicker() : lib_handle_(NULL), get_window_list_(NULL),
|
|
get_window_list_desc_(NULL) {
|
|
}
|
|
|
|
MacWindowPicker::~MacWindowPicker() {
|
|
if (lib_handle_ != NULL) {
|
|
dlclose(lib_handle_);
|
|
}
|
|
}
|
|
|
|
bool MacWindowPicker::Init() {
|
|
// TODO: If this class grows to use more dynamically functions
|
|
// from the CoreGraphics framework, consider using
|
|
// webrtc/base/latebindingsymboltable.h.
|
|
lib_handle_ = dlopen(kCoreGraphicsName, RTLD_NOW);
|
|
if (lib_handle_ == NULL) {
|
|
LOG(LS_ERROR) << "Could not load CoreGraphics";
|
|
return false;
|
|
}
|
|
|
|
get_window_list_ = dlsym(lib_handle_, kWindowListCopyWindowInfo);
|
|
get_window_list_desc_ =
|
|
dlsym(lib_handle_, kWindowListCreateDescriptionFromArray);
|
|
if (get_window_list_ == NULL || get_window_list_desc_ == NULL) {
|
|
// The CGWindowListCopyWindowInfo and the
|
|
// CGWindowListCreateDescriptionFromArray functions was introduced
|
|
// in Leopard(10.5) so this is a normal failure on Tiger.
|
|
LOG(LS_INFO) << "Failed to load Core Graphics symbols";
|
|
dlclose(lib_handle_);
|
|
lib_handle_ = NULL;
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool MacWindowPicker::IsVisible(const WindowId& id) {
|
|
// Init if we're not already inited.
|
|
if (get_window_list_desc_ == NULL && !Init()) {
|
|
return false;
|
|
}
|
|
CGWindowID ids[1];
|
|
ids[0] = id.id();
|
|
CFArrayRef window_id_array =
|
|
CFArrayCreate(NULL, reinterpret_cast<const void **>(&ids), 1, NULL);
|
|
|
|
CFArrayRef window_array =
|
|
reinterpret_cast<CGWindowListCreateDescriptionFromArrayProc>(
|
|
get_window_list_desc_)(window_id_array);
|
|
if (window_array == NULL || 0 == CFArrayGetCount(window_array)) {
|
|
// Could not find the window. It might have been closed.
|
|
LOG(LS_INFO) << "Window not found";
|
|
CFRelease(window_id_array);
|
|
return false;
|
|
}
|
|
|
|
CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>(
|
|
CFArrayGetValueAtIndex(window_array, 0));
|
|
CFBooleanRef is_visible = reinterpret_cast<CFBooleanRef>(
|
|
CFDictionaryGetValue(window, kCGWindowIsOnscreen));
|
|
|
|
// Check that the window is visible. If not we might crash.
|
|
bool visible = false;
|
|
if (is_visible != NULL) {
|
|
visible = CFBooleanGetValue(is_visible);
|
|
}
|
|
CFRelease(window_id_array);
|
|
CFRelease(window_array);
|
|
return visible;
|
|
}
|
|
|
|
bool MacWindowPicker::MoveToFront(const WindowId& id) {
|
|
return false;
|
|
}
|
|
|
|
bool MacWindowPicker::GetDesktopList(DesktopDescriptionList* descriptions) {
|
|
const uint32_t kMaxDisplays = 128;
|
|
CGDirectDisplayID active_displays[kMaxDisplays];
|
|
uint32_t display_count = 0;
|
|
|
|
CGError err = CGGetActiveDisplayList(kMaxDisplays,
|
|
active_displays,
|
|
&display_count);
|
|
if (err != kCGErrorSuccess) {
|
|
LOG_E(LS_ERROR, OS, err) << "Failed to enumerate the active displays.";
|
|
return false;
|
|
}
|
|
for (uint32_t i = 0; i < display_count; ++i) {
|
|
DesktopId id(active_displays[i], static_cast<int>(i));
|
|
// TODO: Figure out an appropriate desktop title.
|
|
DesktopDescription desc(id, "");
|
|
desc.set_primary(CGDisplayIsMain(id.id()));
|
|
descriptions->push_back(desc);
|
|
}
|
|
return display_count > 0;
|
|
}
|
|
|
|
bool MacWindowPicker::GetDesktopDimensions(const DesktopId& id,
|
|
int* width,
|
|
int* height) {
|
|
*width = CGDisplayPixelsWide(id.id());
|
|
*height = CGDisplayPixelsHigh(id.id());
|
|
return true;
|
|
}
|
|
|
|
bool MacWindowPicker::GetWindowList(WindowDescriptionList* descriptions) {
|
|
// Init if we're not already inited.
|
|
if (get_window_list_ == NULL && !Init()) {
|
|
return false;
|
|
}
|
|
|
|
// Only get onscreen, non-desktop windows.
|
|
CFArrayRef window_array =
|
|
reinterpret_cast<CGWindowListCopyWindowInfoProc>(get_window_list_)(
|
|
kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements,
|
|
kCGNullWindowID);
|
|
if (window_array == NULL) {
|
|
return false;
|
|
}
|
|
|
|
// Check windows to make sure they have an id, title, and use window layer 0.
|
|
CFIndex i;
|
|
CFIndex count = CFArrayGetCount(window_array);
|
|
for (i = 0; i < count; ++i) {
|
|
CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>(
|
|
CFArrayGetValueAtIndex(window_array, i));
|
|
CFStringRef window_title = reinterpret_cast<CFStringRef>(
|
|
CFDictionaryGetValue(window, kCGWindowName));
|
|
CFNumberRef window_id = reinterpret_cast<CFNumberRef>(
|
|
CFDictionaryGetValue(window, kCGWindowNumber));
|
|
CFNumberRef window_layer = reinterpret_cast<CFNumberRef>(
|
|
CFDictionaryGetValue(window, kCGWindowLayer));
|
|
if (window_title != NULL && window_id != NULL && window_layer != NULL) {
|
|
std::string title_str;
|
|
int id_val, layer_val;
|
|
ToUtf8(window_title, &title_str);
|
|
CFNumberGetValue(window_id, kCFNumberIntType, &id_val);
|
|
CFNumberGetValue(window_layer, kCFNumberIntType, &layer_val);
|
|
|
|
// Discard windows without a title.
|
|
if (layer_val == 0 && title_str.length() > 0) {
|
|
WindowId id(static_cast<CGWindowID>(id_val));
|
|
WindowDescription desc(id, title_str);
|
|
descriptions->push_back(desc);
|
|
}
|
|
}
|
|
}
|
|
|
|
CFRelease(window_array);
|
|
return true;
|
|
}
|
|
|
|
} // namespace rtc
|