[webkit-changes] [175493] trunk/Source/JavaScriptCore

Mon, 03 Nov 2014 15:03:13 -0800

Title: [175493] trunk/Source/_javascript_Core
Revision
175493
Author
[email protected]
Date
2014-11-03 15:02:27 -0800 (Mon, 03 Nov 2014)

Log Message

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

Patch by Joseph Pecoraro <[email protected]> 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.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (175492 => 175493)


--- trunk/Source/_javascript_Core/ChangeLog	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-11-03 23:02:27 UTC (rev 175493)
@@ -1,5 +1,28 @@
 2014-11-03  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Fix RWIProtocol 64-to-32 bit conversion warnings
+        https://bugs.webkit.org/show_bug.cgi?id=138325
+
+        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.
+
+2014-11-03  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: Show Selector's Specificity
         https://bugs.webkit.org/show_bug.cgi?id=138189

Modified: trunk/Source/_javascript_Core/inspector/InspectorValues.h (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/InspectorValues.h	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/InspectorValues.h	2014-11-03 23:02:27 UTC (rev 175493)
@@ -262,7 +262,7 @@
     typedef Vector<RefPtr<InspectorValue>>::iterator iterator;
     typedef Vector<RefPtr<InspectorValue>>::const_iterator const_iterator;
 
-    unsigned length() const { return m_data.size(); }
+    unsigned length() const { return static_cast<unsigned>(m_data.size()); }
 
 protected:
     virtual ~InspectorArrayBase();

Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objective_c.py (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objective_c.py	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objective_c.py	2014-11-03 23:02:27 UTC (rev 175493)
@@ -193,7 +193,7 @@
         if raw_name is 'array':
             return 'NSArray *'
         if raw_name is 'integer':
-            return 'NSInteger'
+            return 'int'
         if raw_name is 'number':
             return 'double'
         if raw_name is 'boolean':

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -1063,7 +1063,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -1091,7 +1091,7 @@
         backendDispatcher()->sendResponse(callId, resultObject.release(), String());
     };
 
-    NSInteger o_in_databaseId = in_databaseId;
+    int o_in_databaseId = in_databaseId;
     NSString *o_in_query = in_query;
 
     [m_delegate executeSQLSyncOptionalReturnValuesWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
@@ -1103,7 +1103,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -1131,7 +1131,7 @@
         backendDispatcher()->sendResponse(callId, resultObject.release(), String());
     };
 
-    NSInteger o_in_databaseId = in_databaseId;
+    int o_in_databaseId = in_databaseId;
     NSString *o_in_query = in_query;
 
     [m_delegate executeSQLAsyncOptionalReturnValuesWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
@@ -1143,7 +1143,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1162,7 +1162,7 @@
         backendDispatcher()->sendResponse(callId, resultObject.release(), String());
     };
 
-    NSInteger o_in_databaseId = in_databaseId;
+    int o_in_databaseId = in_databaseId;
     NSString *o_in_query = in_query;
 
     [m_delegate executeSQLSyncWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
@@ -1174,7 +1174,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1193,7 +1193,7 @@
         backendDispatcher()->sendResponse(callId, resultObject.release(), String());
     };
 
-    NSInteger o_in_databaseId = in_databaseId;
+    int o_in_databaseId = in_databaseId;
     NSString *o_in_query = in_query;
 
     [m_delegate executeSQLAsyncWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
@@ -1508,17 +1508,17 @@
 
 
 @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 /* required */ @property (nonatomic, copy) NSString *message;
-/* required */ @property (nonatomic, assign) NSInteger code;
+/* required */ @property (nonatomic, assign) int code;
 @end
 
 @protocol RWIProtocolDatabaseDomainHandler <NSObject>
 @required
-- (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;
-- (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;
-- (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;
-- (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;
+- (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;
+- (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;
+- (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;
+- (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;
 @end
 
 
@@ -1570,7 +1570,7 @@
 
 @implementation RWIProtocolDatabaseError
 
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 {
     self = [super init];
     if (!self)
@@ -1594,12 +1594,12 @@
     return [super stringForKey:@"message"];
 }
 
-- (void)setCode:(NSInteger)code
+- (void)setCode:(int)code
 {
     [super setInteger:code forKey:@"code"];
 }
 
-- (NSInteger)code
+- (int)code
 {
     return [super integerForKey:@"code"];
 }

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -952,7 +952,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -995,7 +995,7 @@
     RWIProtocolJSONObject *o_in_payload;
     if (in_payload)
         o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:*in_payload] autorelease];
-    NSInteger o_in_databaseId;
+    int o_in_databaseId;
     if (in_databaseId)
         o_in_databaseId = *in_databaseId;
     RWIProtocolDatabaseError *o_in_sqlError;
@@ -1017,7 +1017,7 @@
         backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
     };
 
-    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
+    id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
         RefPtr<InspectorObject> resultObject = InspectorObject::create();
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
         THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1041,7 +1041,7 @@
     double o_in_timestamp = in_timestamp;
     RWIProtocolJSONObject *o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
     RWIProtocolJSONObject *o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
-    NSInteger o_in_databaseId = in_databaseId;
+    int o_in_databaseId = in_databaseId;
     RWIProtocolDatabaseError *o_in_sqlError = [[[RWIProtocolDatabaseError alloc] initWithInspectorObject:in_sqlError] autorelease];
     RWIProtocolDatabasePrimaryColors o_in_screenColor = fromProtocolString<RWIProtocolDatabasePrimaryColors>(in_screenColor);
     RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor o_in_printColor = fromProtocolString<RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor>(in_printColor);
@@ -1358,15 +1358,15 @@
 
 
 @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 /* required */ @property (nonatomic, copy) NSString *message;
-/* required */ @property (nonatomic, assign) NSInteger code;
+/* required */ @property (nonatomic, assign) int code;
 @end
 
 @protocol RWIProtocolDatabaseDomainHandler <NSObject>
 @required
-- (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;
-- (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;
+- (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;
+- (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;
 @end
 
 
@@ -1418,7 +1418,7 @@
 
 @implementation RWIProtocolDatabaseError
 
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 {
     self = [super init];
     if (!self)
@@ -1442,12 +1442,12 @@
     return [super stringForKey:@"message"];
 }
 
-- (void)setCode:(NSInteger)code
+- (void)setCode:(int)code
 {
     [super setInteger:code forKey:@"code"];
 }
 
-- (NSInteger)code
+- (int)code
 {
     return [super integerForKey:@"code"];
 }

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -986,9 +986,9 @@
 
 
 @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 /* required */ @property (nonatomic, copy) NSString *message;
-/* required */ @property (nonatomic, assign) NSInteger code;
+/* required */ @property (nonatomic, assign) int code;
 @end
 
 
@@ -1045,7 +1045,7 @@
 
 @implementation RWIProtocolDatabaseError
 
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 {
     self = [super init];
     if (!self)
@@ -1069,12 +1069,12 @@
     return [super stringForKey:@"message"];
 }
 
-- (void)setCode:(NSInteger)code
+- (void)setCode:(int)code
 {
     [super setInteger:code forKey:@"code"];
 }
 
-- (NSInteger)code
+- (int)code
 {
     return [super integerForKey:@"code"];
 }

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -1041,9 +1041,9 @@
 
 
 @interface RWIProtocolNetwork2NetworkError : RWIProtocolJSONObject
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 /* required */ @property (nonatomic, copy) NSString *message;
-/* required */ @property (nonatomic, assign) NSInteger code;
+/* required */ @property (nonatomic, assign) int code;
 @end
 
 @protocol RWIProtocolNetwork1DomainHandler <NSObject>
@@ -1104,7 +1104,7 @@
 
 @implementation RWIProtocolNetwork2NetworkError
 
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 {
     self = [super init];
     if (!self)
@@ -1128,12 +1128,12 @@
     return [super stringForKey:@"message"];
 }
 
-- (void)setCode:(NSInteger)code
+- (void)setCode:(int)code
 {
     [super setInteger:code forKey:@"code"];
 }
 
-- (NSInteger)code
+- (int)code
 {
     return [super integerForKey:@"code"];
 }

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -1234,9 +1234,9 @@
 
 
 @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 /* required */ @property (nonatomic, copy) NSString *message;
-/* required */ @property (nonatomic, assign) NSInteger code;
+/* required */ @property (nonatomic, assign) int code;
 @end
 
 @interface RWIProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
@@ -1331,7 +1331,7 @@
 
 @implementation RWIProtocolDatabaseError
 
-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
 {
     self = [super init];
     if (!self)
@@ -1355,12 +1355,12 @@
     return [super stringForKey:@"message"];
 }
 
-- (void)setCode:(NSInteger)code
+- (void)setCode:(int)code
 {
     [super setInteger:code forKey:@"code"];
 }
 
-- (NSInteger)code
+- (int)code
 {
     return [super integerForKey:@"code"];
 }

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (175492 => 175493)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result	2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result	2014-11-03 23:02:27 UTC (rev 175493)
@@ -1192,11 +1192,11 @@
 
 
 @interface RWIProtocolTestTypeNeedingCast : RWIProtocolJSONObject
-- (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
+- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
 /* required */ @property (nonatomic, copy) NSString *string;
-/* required */ @property (nonatomic, assign) NSInteger number;
+/* required */ @property (nonatomic, assign) int number;
 /* required */ @property (nonatomic, assign) RWIProtocolTestCastedAnimals animals;
-/* required */ @property (nonatomic, assign) NSInteger identifier;
+/* required */ @property (nonatomic, assign) int identifier;
 /* required */ @property (nonatomic, retain) RWIProtocolTestRecursiveObject1 *tree;
 @end
 
@@ -1259,7 +1259,7 @@
 
 @implementation RWIProtocolTestTypeNeedingCast
 
-- (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
+- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
 {
     self = [super init];
     if (!self)
@@ -1287,12 +1287,12 @@
     return [super stringForKey:@"string"];
 }
 
-- (void)setNumber:(NSInteger)number
+- (void)setNumber:(int)number
 {
     [super setInteger:number forKey:@"number"];
 }
 
-- (NSInteger)number
+- (int)number
 {
     return [super integerForKey:@"number"];
 }
@@ -1307,12 +1307,12 @@
     return fromProtocolString<RWIProtocolTestCastedAnimals>([super stringForKey:@"animals"]);
 }
 
-- (void)setIdentifier:(NSInteger)identifier
+- (void)setIdentifier:(int)identifier
 {
     [super setInteger:identifier forKey:@"id"];
 }
 
-- (NSInteger)identifier
+- (int)identifier
 {
     return [super integerForKey:@"id"];
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to