Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1252)

Side by Side Diff: util/mac/launchd.mm

Issue 1336413003: In the .mm files use the crashpad::implicit_cast .. explicitly. (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | util/net/http_transport_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "util/mac/launchd.h" 15 #include "util/mac/launchd.h"
16 16
17 #import <Foundation/Foundation.h> 17 #import <Foundation/Foundation.h>
18 18
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
Mark Mentovai 2015/09/14 22:10:01 This #include isn’t needed anymore.
20 #include "base/mac/foundation_util.h" 20 #include "base/mac/foundation_util.h"
21 #include "base/mac/scoped_launch_data.h" 21 #include "base/mac/scoped_launch_data.h"
22 #include "base/mac/scoped_cftyperef.h" 22 #include "base/mac/scoped_cftyperef.h"
23 #include "base/strings/sys_string_conversions.h" 23 #include "base/strings/sys_string_conversions.h"
24 #include "util/misc/implicit_cast.h" 24 #include "util/misc/implicit_cast.h"
25 25
26 namespace crashpad { 26 namespace crashpad {
27 27
28 launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) { 28 launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
29 @autoreleasepool { 29 @autoreleasepool {
30 // This function mixes Foundation and Core Foundation access to property 30 // This function mixes Foundation and Core Foundation access to property
31 // list elements according to which is more convenient and correct for any 31 // list elements according to which is more convenient and correct for any
32 // specific task. 32 // specific task.
33 33
34 launch_data_t data_launch = nullptr; 34 launch_data_t data_launch = nullptr;
35 CFTypeID type_id_cf = CFGetTypeID(property_cf); 35 CFTypeID type_id_cf = CFGetTypeID(property_cf);
36 36
37 if (type_id_cf == CFDictionaryGetTypeID()) { 37 if (type_id_cf == CFDictionaryGetTypeID()) {
38 NSDictionary* dictionary_ns = base::mac::CFToNSCast( 38 NSDictionary* dictionary_ns = base::mac::CFToNSCast(
39 base::mac::CFCastStrict<CFDictionaryRef>(property_cf)); 39 base::mac::CFCastStrict<CFDictionaryRef>(property_cf));
40 base::mac::ScopedLaunchData dictionary_launch( 40 base::mac::ScopedLaunchData dictionary_launch(
41 LaunchDataAlloc(LAUNCH_DATA_DICTIONARY)); 41 LaunchDataAlloc(LAUNCH_DATA_DICTIONARY));
42 42
43 for (NSString* key in dictionary_ns) { 43 for (NSString* key in dictionary_ns) {
44 if (![key isKindOfClass:[NSString class]]) { 44 if (![key isKindOfClass:[NSString class]]) {
45 return nullptr; 45 return nullptr;
46 } 46 }
47 47
48 CFPropertyListRef value_cf = 48 CFPropertyListRef value_cf =
49 implicit_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]); 49 crashpad::implicit_cast<CFPropertyListRef>([dictionary_ns objectForK ey:key]);
50 launch_data_t value_launch = CFPropertyToLaunchData(value_cf); 50 launch_data_t value_launch = CFPropertyToLaunchData(value_cf);
51 if (!value_launch) { 51 if (!value_launch) {
52 return nullptr; 52 return nullptr;
53 } 53 }
54 54
55 LaunchDataDictInsert(dictionary_launch, value_launch, [key UTF8String]); 55 LaunchDataDictInsert(dictionary_launch, value_launch, [key UTF8String]);
56 } 56 }
57 57
58 data_launch = dictionary_launch.release(); 58 data_launch = dictionary_launch.release();
59 59
60 } else if (type_id_cf == CFArrayGetTypeID()) { 60 } else if (type_id_cf == CFArrayGetTypeID()) {
61 NSArray* array_ns = base::mac::CFToNSCast( 61 NSArray* array_ns = base::mac::CFToNSCast(
62 base::mac::CFCastStrict<CFArrayRef>(property_cf)); 62 base::mac::CFCastStrict<CFArrayRef>(property_cf));
63 base::mac::ScopedLaunchData array_launch( 63 base::mac::ScopedLaunchData array_launch(
64 LaunchDataAlloc(LAUNCH_DATA_ARRAY)); 64 LaunchDataAlloc(LAUNCH_DATA_ARRAY));
65 size_t index = 0; 65 size_t index = 0;
66 66
67 for (id element_ns in array_ns) { 67 for (id element_ns in array_ns) {
68 CFPropertyListRef element_cf = 68 CFPropertyListRef element_cf =
69 implicit_cast<CFPropertyListRef>(element_ns); 69 crashpad::implicit_cast<CFPropertyListRef>(element_ns);
70 launch_data_t element_launch = CFPropertyToLaunchData(element_cf); 70 launch_data_t element_launch = CFPropertyToLaunchData(element_cf);
71 if (!element_launch) { 71 if (!element_launch) {
72 return nullptr; 72 return nullptr;
73 } 73 }
74 74
75 LaunchDataArraySetIndex(array_launch, element_launch, index++); 75 LaunchDataArraySetIndex(array_launch, element_launch, index++);
76 } 76 }
77 77
78 data_launch = array_launch.release(); 78 data_launch = array_launch.release();
79 79
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 CFCopyTypeIDDescription(type_id_cf)); 133 CFCopyTypeIDDescription(type_id_cf));
134 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" 134 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
135 << base::SysCFStringRefToUTF8(type_name_cf) << ")"; 135 << base::SysCFStringRefToUTF8(type_name_cf) << ")";
136 } 136 }
137 137
138 return data_launch; 138 return data_launch;
139 } 139 }
140 } 140 }
141 141
142 } // namespace crashpad 142 } // namespace crashpad
OLDNEW
« no previous file with comments | « no previous file | util/net/http_transport_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698