<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175493] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175493">175493</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-03 15:02:27 -0800 (Mon, 03 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Fix RWIProtocol 64-to-32 bit conversion warnings
https://bugs.webkit.org/show_bug.cgi?id=138325
Patch by Joseph Pecoraro <pecoraro@apple.com> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuesh">trunk/Source/JavaScriptCore/inspector/InspectorValues.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objective_cpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objective_c.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-11-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ 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 <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Show Selector's Specificity
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138189
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.h (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> typedef Vector<RefPtr<InspectorValue>>::iterator iterator;
</span><span class="cx"> typedef Vector<RefPtr<InspectorValue>>::const_iterator const_iterator;
</span><span class="cx">
</span><del>- unsigned length() const { return m_data.size(); }
</del><ins>+ unsigned length() const { return static_cast<unsigned>(m_data.size()); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorArrayBase();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objective_cpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objective_c.py (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objective_c.py 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objective_c.py 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> if raw_name is 'array':
</span><span class="cx"> return 'NSArray *'
</span><span class="cx"> if raw_name is 'integer':
</span><del>- return 'NSInteger'
</del><ins>+ return 'int'
</ins><span class="cx"> if raw_name is 'number':
</span><span class="cx"> return 'double'
</span><span class="cx"> if raw_name is 'boolean':
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -1063,7 +1063,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1091,7 +1091,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, resultObject.release(), String());
</span><span class="cx"> };
</span><span class="cx">
</span><del>- NSInteger o_in_databaseId = in_databaseId;
</del><ins>+ int o_in_databaseId = in_databaseId;
</ins><span class="cx"> NSString *o_in_query = in_query;
</span><span class="cx">
</span><span class="cx"> [m_delegate executeSQLSyncOptionalReturnValuesWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, resultObject.release(), String());
</span><span class="cx"> };
</span><span class="cx">
</span><del>- NSInteger o_in_databaseId = in_databaseId;
</del><ins>+ int o_in_databaseId = in_databaseId;
</ins><span class="cx"> NSString *o_in_query = in_query;
</span><span class="cx">
</span><span class="cx"> [m_delegate executeSQLAsyncOptionalReturnValuesWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
</span><span class="lines">@@ -1143,7 +1143,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, resultObject.release(), String());
</span><span class="cx"> };
</span><span class="cx">
</span><del>- NSInteger o_in_databaseId = in_databaseId;
</del><ins>+ int o_in_databaseId = in_databaseId;
</ins><span class="cx"> NSString *o_in_query = in_query;
</span><span class="cx">
</span><span class="cx"> [m_delegate executeSQLSyncWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1193,7 +1193,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, resultObject.release(), String());
</span><span class="cx"> };
</span><span class="cx">
</span><del>- NSInteger o_in_databaseId = in_databaseId;
</del><ins>+ int o_in_databaseId = in_databaseId;
</ins><span class="cx"> NSString *o_in_query = in_query;
</span><span class="cx">
</span><span class="cx"> [m_delegate executeSQLAsyncWithErrorCallback:errorCallback successCallback:successCallback databaseId:o_in_databaseId query:o_in_query];
</span><span class="lines">@@ -1508,17 +1508,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger code;
</del><ins>+/* required */ @property (nonatomic, assign) int code;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol RWIProtocolDatabaseDomainHandler <NSObject>
</span><span class="cx"> @required
</span><del>-- (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;
</del><ins>+- (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;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1570,7 +1570,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolDatabaseError
</span><span class="cx">
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1594,12 +1594,12 @@
</span><span class="cx"> return [super stringForKey:@"message"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setCode:(NSInteger)code
</del><ins>+- (void)setCode:(int)code
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:code forKey:@"code"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)code
</del><ins>+- (int)code
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"code"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -952,7 +952,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, NSInteger *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx"> RWIProtocolJSONObject *o_in_payload;
</span><span class="cx"> if (in_payload)
</span><span class="cx"> o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:*in_payload] autorelease];
</span><del>- NSInteger o_in_databaseId;
</del><ins>+ int o_in_databaseId;
</ins><span class="cx"> if (in_databaseId)
</span><span class="cx"> o_in_databaseId = *in_databaseId;
</span><span class="cx"> RWIProtocolDatabaseError *o_in_sqlError;
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, NSInteger databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
</ins><span class="cx"> RefPtr<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1041,7 +1041,7 @@
</span><span class="cx"> double o_in_timestamp = in_timestamp;
</span><span class="cx"> RWIProtocolJSONObject *o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
</span><span class="cx"> RWIProtocolJSONObject *o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
</span><del>- NSInteger o_in_databaseId = in_databaseId;
</del><ins>+ int o_in_databaseId = in_databaseId;
</ins><span class="cx"> RWIProtocolDatabaseError *o_in_sqlError = [[[RWIProtocolDatabaseError alloc] initWithInspectorObject:in_sqlError] autorelease];
</span><span class="cx"> RWIProtocolDatabasePrimaryColors o_in_screenColor = fromProtocolString<RWIProtocolDatabasePrimaryColors>(in_screenColor);
</span><span class="cx"> RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor o_in_printColor = fromProtocolString<RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor>(in_printColor);
</span><span class="lines">@@ -1358,15 +1358,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger code;
</del><ins>+/* required */ @property (nonatomic, assign) int code;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol RWIProtocolDatabaseDomainHandler <NSObject>
</span><span class="cx"> @required
</span><del>-- (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;
</del><ins>+- (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;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1418,7 +1418,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolDatabaseError
</span><span class="cx">
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1442,12 +1442,12 @@
</span><span class="cx"> return [super stringForKey:@"message"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setCode:(NSInteger)code
</del><ins>+- (void)setCode:(int)code
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:code forKey:@"code"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)code
</del><ins>+- (int)code
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"code"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -986,9 +986,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger code;
</del><ins>+/* required */ @property (nonatomic, assign) int code;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolDatabaseError
</span><span class="cx">
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1069,12 +1069,12 @@
</span><span class="cx"> return [super stringForKey:@"message"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setCode:(NSInteger)code
</del><ins>+- (void)setCode:(int)code
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:code forKey:@"code"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)code
</del><ins>+- (int)code
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"code"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -1041,9 +1041,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolNetwork2NetworkError : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger code;
</del><ins>+/* required */ @property (nonatomic, assign) int code;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol RWIProtocolNetwork1DomainHandler <NSObject>
</span><span class="lines">@@ -1104,7 +1104,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolNetwork2NetworkError
</span><span class="cx">
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1128,12 +1128,12 @@
</span><span class="cx"> return [super stringForKey:@"message"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setCode:(NSInteger)code
</del><ins>+- (void)setCode:(int)code
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:code forKey:@"code"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)code
</del><ins>+- (int)code
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"code"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -1234,9 +1234,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolDatabaseError : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger code;
</del><ins>+/* required */ @property (nonatomic, assign) int code;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
</span><span class="lines">@@ -1331,7 +1331,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolDatabaseError
</span><span class="cx">
</span><del>-- (instancetype)initWithMessage:(NSString *)message code:(NSInteger)code;
</del><ins>+- (instancetype)initWithMessage:(NSString *)message code:(int)code;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1355,12 +1355,12 @@
</span><span class="cx"> return [super stringForKey:@"message"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setCode:(NSInteger)code
</del><ins>+- (void)setCode:(int)code
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:code forKey:@"code"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)code
</del><ins>+- (int)code
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"code"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (175492 => 175493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-11-03 22:54:36 UTC (rev 175492)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-11-03 23:02:27 UTC (rev 175493)
</span><span class="lines">@@ -1192,11 +1192,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface RWIProtocolTestTypeNeedingCast : RWIProtocolJSONObject
</span><del>-- (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
</del><ins>+- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSString *string;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger number;
</del><ins>+/* required */ @property (nonatomic, assign) int number;
</ins><span class="cx"> /* required */ @property (nonatomic, assign) RWIProtocolTestCastedAnimals animals;
</span><del>-/* required */ @property (nonatomic, assign) NSInteger identifier;
</del><ins>+/* required */ @property (nonatomic, assign) int identifier;
</ins><span class="cx"> /* required */ @property (nonatomic, retain) RWIProtocolTestRecursiveObject1 *tree;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation RWIProtocolTestTypeNeedingCast
</span><span class="cx">
</span><del>-- (instancetype)initWithString:(NSString *)string number:(NSInteger)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(NSInteger)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
</del><ins>+- (instancetype)initWithString:(NSString *)string number:(int)number animals:(RWIProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(RWIProtocolTestRecursiveObject1 *)tree;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1287,12 +1287,12 @@
</span><span class="cx"> return [super stringForKey:@"string"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setNumber:(NSInteger)number
</del><ins>+- (void)setNumber:(int)number
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:number forKey:@"number"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)number
</del><ins>+- (int)number
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"number"];
</span><span class="cx"> }
</span><span class="lines">@@ -1307,12 +1307,12 @@
</span><span class="cx"> return fromProtocolString<RWIProtocolTestCastedAnimals>([super stringForKey:@"animals"]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setIdentifier:(NSInteger)identifier
</del><ins>+- (void)setIdentifier:(int)identifier
</ins><span class="cx"> {
</span><span class="cx"> [super setInteger:identifier forKey:@"id"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSInteger)identifier
</del><ins>+- (int)identifier
</ins><span class="cx"> {
</span><span class="cx"> return [super integerForKey:@"id"];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>