Changeset 175493 in webkit


Ignore:
Timestamp:
Nov 3, 2014 3:02:27 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: Fix RWIProtocol 64-to-32 bit conversion warnings
​https://bugs.webkit.org/show_bug.cgi?id=138325

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-11-03
Reviewed by Timothy Hatcher.

  • inspector/InspectorValues.h:

Vector's length really is an unsigned, so a static_cast here is fine.

  • inspector/scripts/codegen/generate_objective_c.py:

(ObjCGenerator.objc_type_for_raw_name):
Use int instead of NSInteger for APIs that eventually map to
InspectorObject's setInteger, which takes an int.

  • inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
  • inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
  • inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
  • inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
  • inspector/scripts/tests/expected/type-declaration-object-type.json-result:
  • inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:

Rebaselined results with the type change.

Location:
trunk/Source/JavaScriptCore
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r175483 r175493  
     12014-11-03  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Fix RWIProtocol 64-to-32 bit conversion warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=138325
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        * inspector/InspectorValues.h:
     9        Vector's length really is an unsigned, so a static_cast here is fine.
     10
     11        * inspector/scripts/codegen/generate_objective_c.py:
     12        (ObjCGenerator.objc_type_for_raw_name):
     13        Use int instead of NSInteger for APIs that eventually map to
     14        InspectorObject's setInteger, which takes an int.
     15
     16        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
     17        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
     18        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
     19        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
     20        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
     21        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
     22        Rebaselined results with the type change.
     23
    1242014-11-03  Joseph Pecoraro  <pecoraro@apple.com>
    225

  • trunk/Source/JavaScriptCore/inspector/InspectorValues.h

    r174094 r175493  
    263263    typedef Vector<RefPtr<InspectorValue>>::const_iterator const_iterator;
    264264
    265     unsigned length() const { return m_data.size(); }
     265    unsigned length() const { return static_cast<unsigned>(m_data.size()); }
    266266
    267267protected:

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objective_c.py

    r175479 r175493  
    194194            return 'NSArray *'
    195195        if raw_name is 'integer':
    196             return 'NSInteger'
     196            return 'int'
    197197        if raw_name is 'number':
    198198            return 'double'

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result

    r175479 r175493  
    10641064    };
    10651065
    1066     id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
     1066    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
    10671067        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    10681068        THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
    … …  
    10921092    };
    10931093
    1094     NSInteger o_in_databaseId = in_databaseId;
     1094    int o_in_databaseId = in_databaseId;
    10951095    NSString *o_in_query = in_query;
    10961096
    … …  
    11041104    };
    11051105
    1106     id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
     1106    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
    11071107        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    11081108        THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
    … …  
    11321132    };
    11331133
    1134     NSInteger o_in_databaseId = in_databaseId;
     1134    int o_in_databaseId = in_databaseId;
    11351135    NSString *o_in_query = in_query;
    11361136
    … …  
    11441144    };
    11451145
    1146     id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
     1146    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
    11471147        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    11481148        THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
    … …  
    11631163    };
    11641164
    1165     NSInteger o_in_databaseId = in_databaseId;
     1165    int o_in_databaseId = in_databaseId;
    11661166    NSString *o_in_query = in_query;
    11671167
    … …  
    11751175    };
    11761176
    1177     id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
     1177    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
    11781178        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    11791179        THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
    … …  
    11941194    };
    11951195
    1196     NSInteger o_in_databaseId = in_databaseId;
     1196    int o_in_databaseId = in_databaseId;
    11971197    NSString *o_in_query = in_query;
    11981198
    … …  
    15091509
    15101510@interface RWIProtocolDatabaseError : RWIProtocolJSONObject
    1511 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1511- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    15121512/* required */ @property (nonatomic, copy) NSString *message;
    1513 /* required */ @property (nonatomic, assign) NSInteger code;
     1513/* required */ @property (nonatomic, assign) int code;
    15141514@end
    15151515
    15161516@protocol RWIProtocolDatabaseDomainHandler <NSObject>
    15171517@required
    1518 - (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(NSInteger)databaseId query:(NSString *)query;
    1519 - (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(NSInteger)databaseId query:(NSString *)query;
    1520 - (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(NSInteger)databaseId query:(NSString *)query;
    1521 - (void)executeSQLAsyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(NSInteger)databaseId query:(NSString *)query;
     1518- (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
     1519- (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
     1520- (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
     1521- (void)executeSQLAsyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
    15221522@end
    15231523
    … …  
    15711571@implementation RWIProtocolDatabaseError
    15721572
    1573 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1573- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    15741574{
    15751575    self = [super init];
    … …  
    15951595}
    15961596
    1597 - (void)setCode:(NSInteger)code
     1597- (void)setCode:(int)code
    15981598{
    15991599    [super setInteger:code forKey:@"code"];
    16001600}
    16011601
    1602 - (NSInteger)code
     1602- (int)code
    16031603{
    16041604    return [super integerForKey:@"code"];

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result

    r175479 r175493  
    953953    };
    954954
    955     id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
     955    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
    956956        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    957957        THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
    … …  
    996996    if (in_payload)
    997997        o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:*in_payload] autorelease];
    998     NSInteger o_in_databaseId;
     998    int o_in_databaseId;
    999999    if (in_databaseId)
    10001000        o_in_databaseId = *in_databaseId;
    … …  
    10181018    };
    10191019
    1020     id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
     1020    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
    10211021        RefPtr<InspectorObject> resultObject = InspectorObject::create();
    10221022        THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
    … …  
    10421042    RWIProtocolJSONObject *o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
    10431043    RWIProtocolJSONObject *o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
    1044     NSInteger o_in_databaseId = in_databaseId;
     1044    int o_in_databaseId = in_databaseId;
    10451045    RWIProtocolDatabaseError *o_in_sqlError = [[[RWIProtocolDatabaseError alloc] initWithInspectorObject:in_sqlError] autorelease];
    10461046    RWIProtocolDatabasePrimaryColors o_in_screenColor = fromProtocolString<RWIProtocolDatabasePrimaryColors>(in_screenColor);
    … …  
    13591359
    13601360@interface RWIProtocolDatabaseError : RWIProtocolJSONObject
    1361 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1361- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    13621362/* required */ @property (nonatomic, copy) NSString *message;
    1363 /* required */ @property (nonatomic, assign) NSInteger code;
     1363/* required */ @property (nonatomic, assign) int code;
    13641364@end
    13651365
    13661366@protocol RWIProtocolDatabaseDomainHandler <NSObject>
    13671367@required
    1368 - (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload databaseId:(NSInteger *)databaseId sqlError:(RWIProtocolDatabaseError **)sqlError screenColor:(RWIProtocolDatabasePrimaryColors *)screenColor printColor:(RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printColor;
    1369 - (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload databaseId:(NSInteger)databaseId sqlError:(RWIProtocolDatabaseError *)sqlError screenColor:(RWIProtocolDatabasePrimaryColors)screenColor printColor:(RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor;
     1368- (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload databaseId:(int *)databaseId sqlError:(RWIProtocolDatabaseError **)sqlError screenColor:(RWIProtocolDatabasePrimaryColors *)screenColor printColor:(RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printColor;
     1369- (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload databaseId:(int)databaseId sqlError:(RWIProtocolDatabaseError *)sqlError screenColor:(RWIProtocolDatabasePrimaryColors)screenColor printColor:(RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor;
    13701370@end
    13711371
    … …  
    14191419@implementation RWIProtocolDatabaseError
    14201420
    1421 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1421- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    14221422{
    14231423    self = [super init];
    … …  
    14431443}
    14441444
    1445 - (void)setCode:(NSInteger)code
     1445- (void)setCode:(int)code
    14461446{
    14471447    [super setInteger:code forKey:@"code"];
    14481448}
    14491449
    1450 - (NSInteger)code
     1450- (int)code
    14511451{
    14521452    return [super integerForKey:@"code"];

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result

    r175479 r175493  
    987987
    988988@interface RWIProtocolDatabaseError : RWIProtocolJSONObject
    989 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     989- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    990990/* required */ @property (nonatomic, copy) NSString *message;
    991 /* required */ @property (nonatomic, assign) NSInteger code;
     991/* required */ @property (nonatomic, assign) int code;
    992992@end
    993993
    … …  
    10461046@implementation RWIProtocolDatabaseError
    10471047
    1048 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1048- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    10491049{
    10501050    self = [super init];
    … …  
    10701070}
    10711071
    1072 - (void)setCode:(NSInteger)code
     1072- (void)setCode:(int)code
    10731073{
    10741074    [super setInteger:code forKey:@"code"];
    10751075}
    10761076
    1077 - (NSInteger)code
     1077- (int)code
    10781078{
    10791079    return [super integerForKey:@"code"];

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result

    r175479 r175493  
    10421042
    10431043@interface RWIProtocolNetwork2NetworkError : RWIProtocolJSONObject
    1044 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1044- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    10451045/* required */ @property (nonatomic, copy) NSString *message;
    1046 /* required */ @property (nonatomic, assign) NSInteger code;
     1046/* required */ @property (nonatomic, assign) int code;
    10471047@end
    10481048
    … …  
    11051105@implementation RWIProtocolNetwork2NetworkError
    11061106
    1107 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1107- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    11081108{
    11091109    self = [super init];
    … …  
    11291129}
    11301130
    1131 - (void)setCode:(NSInteger)code
     1131- (void)setCode:(int)code
    11321132{
    11331133    [super setInteger:code forKey:@"code"];
    11341134}
    11351135
    1136 - (NSInteger)code
     1136- (int)code
    11371137{
    11381138    return [super integerForKey:@"code"];

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result

    r175479 r175493  
    12351235
    12361236@interface RWIProtocolDatabaseError : RWIProtocolJSONObject
    1237 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1237- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    12381238/* required */ @property (nonatomic, copy) NSString *message;
    1239 /* required */ @property (nonatomic, assign) NSInteger code;
     1239/* required */ @property (nonatomic, assign) int code;
    12401240@end
    12411241
    … …  
    13321332@implementation RWIProtocolDatabaseError
    13331333
    1334 - (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
     1334- (instancetype)initWithMessage:(NSString *)message code:(int)code;
    13351335{
    13361336    self = [super init];
    … …  
    13561356}
    13571357
    1358 - (void)setCode:(NSInteger)code
     1358- (void)setCode:(int)code
    13591359{
    13601360    [super setInteger:code forKey:@"code"];
    13611361}
    13621362
    1363 - (NSInteger)code
     1363- (int)code
    13641364{
    13651365    return [super integerForKey:@"code"];

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result

    r175479 r175493  
    11931193
    11941194@interface RWIProtocolTestTypeNeedingCast : RWIProtocolJSONObject
    1195 - (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
     1195- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
    11961196/* required */ @property (nonatomic, copy) NSString *string;
    1197 /* required */ @property (nonatomic, assign) NSInteger number;
     1197/* required */ @property (nonatomic, assign) int number;
    11981198/* required */ @property (nonatomic, assign) RWIProtocolTestCastedAnimals animals;
    1199 /* required */ @property (nonatomic, assign) NSInteger identifier;
     1199/* required */ @property (nonatomic, assign) int identifier;
    12001200/* required */ @property (nonatomic, retain) RWIProtocolTestRecursiveObject1 *tree;
    12011201@end
    … …  
    12601260@implementation RWIProtocolTestTypeNeedingCast
    12611261
    1262 - (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
     1262- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
    12631263{
    12641264    self = [super init];
    … …  
    12881288}
    12891289
    1290 - (void)setNumber:(NSInteger)number
     1290- (void)setNumber:(int)number
    12911291{
    12921292    [super setInteger:number forKey:@"number"];
    12931293}
    12941294
    1295 - (NSInteger)number
     1295- (int)number
    12961296{
    12971297    return [super integerForKey:@"number"];
    … …  
    13081308}
    13091309
    1310 - (void)setIdentifier:(NSInteger)identifier
     1310- (void)setIdentifier:(int)identifier
    13111311{
    13121312    [super setInteger:identifier forKey:@"id"];
    13131313}
    13141314
    1315 - (NSInteger)identifier
     1315- (int)identifier
    13161316{
    13171317    return [super integerForKey:@"id"];
Note: See TracChangeset for help on using the changeset viewer.