3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-26 23:01:05 +08:00
Code Issues Projects Releases Wiki Activity

Roll mini_chromium putting /base/apple files into base:🍎:

Browse Source 
Bug: chromium:1474628
Change-Id: Ief0efef22759b935045bf0216a313c2de8025403
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4799234
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
This commit is contained in:
Avi Drissman 2023-08-21 16:03:53 -04:00 committed by Crashpad LUCI CQ
parent 50ce1550a1
commit a736f7d070
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -47,7 +47,7 @@ deps = {
'9719c1e1e676814c456b55f5f070eabad6709d31', '9719c1e1e676814c456b55f5f070eabad6709d31',
'crashpad/third_party/mini_chromium/mini_chromium': 'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' + Var('chromium_git') + '/chromium/mini_chromium@' +
'e35fc73aa87bb27e10306900b15a18b0e9c7ca42', '0c540fd5462a266277e86fa32a230cad4a859037',
'crashpad/third_party/libfuzzer/src': 'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020', 'fda403cf93ecb8792cb1d061564d89a6553ca020',

2
util/mac/launchd.mm
View File

@ -130,7 +130,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
base::apple::CFCastStrict<CFDataRef>(property_cf)); base::apple::CFCastStrict<CFDataRef>(property_cf));
data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]); data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]);
} else { } else {
base::ScopedCFTypeRef<CFStringRef> type_name_cf( base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf(
CFCopyTypeIDDescription(type_id_cf)); CFCopyTypeIDDescription(type_id_cf));
DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
<< base::SysCFStringRefToUTF8(type_name_cf) << ")"; << base::SysCFStringRefToUTF8(type_name_cf) << ")";

4
util/mac/mac_util.cc
View File

@ -166,7 +166,7 @@ bool StringToVersionNumbers(const std::string& version,
std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry, std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
CFStringRef key) { CFStringRef key) {
base::ScopedCFTypeRef<CFTypeRef> property( base::apple::ScopedCFTypeRef<CFTypeRef> property(
IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0)); IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
CFDataRef data = base::apple::CFCast<CFDataRef>(property); CFDataRef data = base::apple::CFCast<CFDataRef>(property);
if (data && CFDataGetLength(data) > 0) { if (data && CFDataGetLength(data) > 0) {
@ -235,7 +235,7 @@ bool MacOSVersionComponents(int* major,
int* bugfix, int* bugfix,
std::string* build, std::string* build,
std::string* version_string) { std::string* version_string) {
base::ScopedCFTypeRef<CFDictionaryRef> dictionary( base::apple::ScopedCFTypeRef<CFDictionaryRef> dictionary(
TryCFCopySystemVersionDictionary()); TryCFCopySystemVersionDictionary());
if (!dictionary) { if (!dictionary) {
LOG(ERROR) << "_CFCopySystemVersionDictionary failed"; LOG(ERROR) << "_CFCopySystemVersionDictionary failed";