Mac/clang: Possibly contentious changes.

chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6
 
 #include "chrome/browser/geolocation/wifi_data_provider_mac.h"
 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
@@ skipping 11 matching lines @@
 
 @interface CWInterface : NSObject
 + (CWInterface*)interface;
 + (CWInterface*)interfaceWithName:(NSString*)name;
 + (NSArray*)supportedInterfaces;
 - (NSArray*)scanForNetworksWithParameters:(NSDictionary*)parameters
                                     error:(NSError**)error;
 @end
 
 @interface CWNetwork : NSObject <NSCopying, NSCoding>
-@property(readonly) NSString* ssid;
-@property(readonly) NSString* bssid;
-@property(readonly) NSData* bssidData;
-@property(readonly) NSNumber* securityMode;
-@property(readonly) NSNumber* phyMode;
-@property(readonly) NSNumber* channel;
-@property(readonly) NSNumber* rssi;
-@property(readonly) NSNumber* noise;
-@property(readonly) NSData* ieData;
-@property(readonly) BOOL isIBSS;
+@property (nonatomic, readonly) NSString* ssid;
+@property (nonatomic, readonly) NSString* bssid;
+@property (nonatomic, readonly) NSData* bssidData;
+@property (nonatomic, readonly) NSNumber* securityMode;
+@property (nonatomic, readonly) NSNumber* phyMode;
+@property (nonatomic, readonly) NSNumber* channel;
+@property (nonatomic, readonly) NSNumber* rssi;
+@property (nonatomic, readonly) NSNumber* noise;
+@property (nonatomic, readonly) NSData* ieData;
+@property (nonatomic, readonly) BOOL isIBSS;

[joth, 2010/06/15 18:44:25]

quick sanity check - as mentioned in the comment this section is based on the
interface declared in
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/CoreWLAN.framework/Versions/A/Headers/CWNetwork.h

1/ will adding nonatomic impact compatibility with that interface?
2/ will the fact that interface lacks nonatomic cause problems when we switch to
used the 10.6 SDK headers directly (as oer the above TODO)?

[Mark Mentovai, 2010/06/15 19:30:04]

joth wrote:
We should remove nonatomic from these, but to answer your questions:
 
No.
Not directly. What will cause problems is a duplicate definition of the
@interface, but we face that problem regardless of whether the properties are
specified as atomic or not.

Clearly, we are not #importing (directly or indirectly) <CoreWLAN/CWNetwork.h>
anywhere relevant to this file with the 10.6 SDK now, or the 10.6 SDK build
would already be broken. (Some developers, myself included, routinely build and
test this configuration.)

 - (BOOL)isEqualToNetwork:(CWNetwork*)network;
 @end
 
 class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
  public:
   CoreWlanApi() {}
 
   // Must be called before any other interface method. Will return false if the
   // CoreWLAN framework cannot be initialized (e.g. running on pre-10.6 OSX),
   // in which case no other method may be called.
@@ skipping 101 matching lines @@
          [supported_interfaces count] > interface_error_count;
 }
 
 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() {
   scoped_ptr<CoreWlanApi> self(new CoreWlanApi);
   if (self->Init())
     return self.release();
 
   return NULL;
 }