3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-10 06:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll mini_chromium, adjust to more files in base/apple

Browse Source 
This rolls mini_chromium to the version that has more files in
base/apple, and adjusts the code to match.

Bug: chromium:1444927
Change-Id: I9642698c8c16151bd0aaca7b46745a59d6e5e6d3
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4791121
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
This commit is contained in:
Avi Drissman 2023-08-17 11:10:53 -04:00 committed by Crashpad LUCI CQ
parent 6a9e2e6003
commit 13e3accfe8
5 changed files with 24 additions and 22 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@' +
'f5370228f40bbb8c453e17f6af6c6742858c45d1', 'e35fc73aa87bb27e10306900b15a18b0e9c7ca42',
'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',

17
util/mac/launchd.mm
View File

@ -17,8 +17,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "base/apple/bridging.h" #include "base/apple/bridging.h"
#include "base/mac/foundation_util.h" #include "base/apple/foundation_util.h"
#include "base/mac/scoped_cftyperef.h" #include "base/apple/scoped_cftyperef.h"
#include "base/mac/scoped_launch_data.h" #include "base/mac/scoped_launch_data.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "util/misc/implicit_cast.h" #include "util/misc/implicit_cast.h"
@ -36,7 +36,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
if (type_id_cf == CFDictionaryGetTypeID()) { if (type_id_cf == CFDictionaryGetTypeID()) {
NSDictionary* dictionary_ns = base::apple::CFToNSPtrCast( NSDictionary* dictionary_ns = base::apple::CFToNSPtrCast(
base::mac::CFCastStrict<CFDictionaryRef>(property_cf)); base::apple::CFCastStrict<CFDictionaryRef>(property_cf));
base::mac::ScopedLaunchData dictionary_launch( base::mac::ScopedLaunchData dictionary_launch(
LaunchDataAlloc(LAUNCH_DATA_DICTIONARY)); LaunchDataAlloc(LAUNCH_DATA_DICTIONARY));
@ -60,7 +60,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
} else if (type_id_cf == CFArrayGetTypeID()) { } else if (type_id_cf == CFArrayGetTypeID()) {
NSArray* array_ns = base::apple::CFToNSPtrCast( NSArray* array_ns = base::apple::CFToNSPtrCast(
base::mac::CFCastStrict<CFArrayRef>(property_cf)); base::apple::CFCastStrict<CFArrayRef>(property_cf));
base::mac::ScopedLaunchData array_launch( base::mac::ScopedLaunchData array_launch(
LaunchDataAlloc(LAUNCH_DATA_ARRAY)); LaunchDataAlloc(LAUNCH_DATA_ARRAY));
size_t index = 0; size_t index = 0;
@ -78,7 +78,8 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
data_launch = array_launch.release(); data_launch = array_launch.release();
} else if (type_id_cf == CFNumberGetTypeID()) { } else if (type_id_cf == CFNumberGetTypeID()) {
CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf); CFNumberRef number_cf =
base::apple::CFCastStrict<CFNumberRef>(property_cf);
NSNumber* number_ns = base::apple::CFToNSPtrCast(number_cf); NSNumber* number_ns = base::apple::CFToNSPtrCast(number_cf);
switch (CFNumberGetType(number_cf)) { switch (CFNumberGetType(number_cf)) {
case kCFNumberSInt8Type: case kCFNumberSInt8Type:
@ -109,12 +110,12 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
} else if (type_id_cf == CFBooleanGetTypeID()) { } else if (type_id_cf == CFBooleanGetTypeID()) {
CFBooleanRef boolean_cf = CFBooleanRef boolean_cf =
base::mac::CFCastStrict<CFBooleanRef>(property_cf); base::apple::CFCastStrict<CFBooleanRef>(property_cf);
data_launch = LaunchDataNewBool(CFBooleanGetValue(boolean_cf)); data_launch = LaunchDataNewBool(CFBooleanGetValue(boolean_cf));
} else if (type_id_cf == CFStringGetTypeID()) { } else if (type_id_cf == CFStringGetTypeID()) {
NSString* string_ns = base::apple::CFToNSPtrCast( NSString* string_ns = base::apple::CFToNSPtrCast(
base::mac::CFCastStrict<CFStringRef>(property_cf)); base::apple::CFCastStrict<CFStringRef>(property_cf));
// -fileSystemRepresentation might be more correct than -UTF8String, // -fileSystemRepresentation might be more correct than -UTF8String,
// because these strings can hold paths. The analogous function in // because these strings can hold paths. The analogous function in
@ -126,7 +127,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
} else if (type_id_cf == CFDataGetTypeID()) { } else if (type_id_cf == CFDataGetTypeID()) {
NSData* data_ns = base::apple::CFToNSPtrCast( NSData* data_ns = base::apple::CFToNSPtrCast(
base::mac::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::ScopedCFTypeRef<CFStringRef> type_name_cf(

15
util/mac/mac_util.cc
View File

@ -21,10 +21,10 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include "base/apple/foundation_util.h"
#include "base/apple/scoped_cftyperef.h"
#include "base/check_op.h" #include "base/check_op.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_ioobject.h" #include "base/mac/scoped_ioobject.h"
#include "base/notreached.h" #include "base/notreached.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
@ -168,7 +168,7 @@ std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
CFStringRef key) { CFStringRef key) {
base::ScopedCFTypeRef<CFTypeRef> property( base::ScopedCFTypeRef<CFTypeRef> property(
IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0)); IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
CFDataRef data = base::mac::CFCast<CFDataRef>(property); CFDataRef data = base::apple::CFCast<CFDataRef>(property);
if (data && CFDataGetLength(data) > 0) { if (data && CFDataGetLength(data) > 0) {
return reinterpret_cast<const char*>(CFDataGetBytePtr(data)); return reinterpret_cast<const char*>(CFDataGetBytePtr(data));
} }
@ -244,7 +244,7 @@ bool MacOSVersionComponents(int* major,
bool success = true; bool success = true;
CFStringRef version_cf = base::mac::CFCast<CFStringRef>( CFStringRef version_cf = base::apple::CFCast<CFStringRef>(
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey)); TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey));
std::string version; std::string version;
if (!version_cf) { if (!version_cf) {
@ -264,7 +264,7 @@ bool MacOSVersionComponents(int* major,
} }
} }
CFStringRef build_cf = base::mac::CFCast<CFStringRef>( CFStringRef build_cf = base::apple::CFCast<CFStringRef>(
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey)); TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey));
if (!build_cf) { if (!build_cf) {
LOG(ERROR) << "build_cf not found"; LOG(ERROR) << "build_cf not found";
@ -273,7 +273,7 @@ bool MacOSVersionComponents(int* major,
build->assign(base::SysCFStringRefToUTF8(build_cf)); build->assign(base::SysCFStringRefToUTF8(build_cf));
} }
CFStringRef product_cf = base::mac::CFCast<CFStringRef>( CFStringRef product_cf = base::apple::CFCast<CFStringRef>(
TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey)); TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey));
std::string product; std::string product;
if (!product_cf) { if (!product_cf) {
@ -284,7 +284,8 @@ bool MacOSVersionComponents(int* major,
} }
// This key is not required, and in fact is normally not present. // This key is not required, and in fact is normally not present.
CFStringRef extra_cf = base::mac::CFCast<CFStringRef>(TryCFDictionaryGetValue( CFStringRef extra_cf =
base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
dictionary, _kCFSystemVersionProductVersionExtraKey)); dictionary, _kCFSystemVersionProductVersionExtraKey));
std::string extra; std::string extra;
if (extra_cf) { if (extra_cf) {

2
util/mac/service_management_test.mm
View File

@ -21,7 +21,7 @@
#include <vector> #include <vector>
#include "base/apple/bridging.h" #include "base/apple/bridging.h"
#include "base/mac/scoped_cftyperef.h" #include "base/apple/scoped_cftyperef.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"

8
util/net/http_transport_mac.mm
View File

@ -18,7 +18,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include "base/apple/bridging.h" #include "base/apple/bridging.h"
#include "base/mac/foundation_util.h" #include "base/apple/foundation_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "build/build_config.h" #include "build/build_config.h"
@ -153,12 +153,12 @@ NSString* UserAgentString() {
// Expected to be CFNetwork. // Expected to be CFNetwork.
NSBundle* nsurl_bundle = [NSBundle bundleForClass:[NSURLRequest class]]; NSBundle* nsurl_bundle = [NSBundle bundleForClass:[NSURLRequest class]];
NSString* bundle_name = base::mac::ObjCCast<NSString>([nsurl_bundle NSString* bundle_name = base::apple::ObjCCast<NSString>([nsurl_bundle
objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(kCFBundleNameKey)]); objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(kCFBundleNameKey)]);
if (bundle_name) { if (bundle_name) {
user_agent = AppendEscapedFormat(user_agent, @" %@", bundle_name); user_agent = AppendEscapedFormat(user_agent, @" %@", bundle_name);
NSString* bundle_version = base::mac::ObjCCast<NSString>( NSString* bundle_version = base::apple::ObjCCast<NSString>(
[nsurl_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast( [nsurl_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(
kCFBundleVersionKey)]); kCFBundleVersionKey)]);
if (bundle_version) { if (bundle_version) {
@ -268,7 +268,7 @@ bool HTTPTransportMac::ExecuteSynchronously(std::string* response_body) {
return false; return false;
} }
NSHTTPURLResponse* http_response = NSHTTPURLResponse* http_response =
base::mac::ObjCCast<NSHTTPURLResponse>(response); base::apple::ObjCCast<NSHTTPURLResponse>(response);
if (!http_response) { if (!http_response) {
LOG(ERROR) << "no http_response"; LOG(ERROR) << "no http_response";
return false; return false;