Modified: trunk/Source/_javascript_Core/ChangeLog (273916 => 273917)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-04 21:43:33 UTC (rev 273916)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-04 22:05:53 UTC (rev 273917)
@@ -1,5 +1,18 @@
2021-03-04 Alex Christensen <achristen...@webkit.org>
+ Unreviewed, reverting r273906.
+
+ Broke internal build
+
+ Reverted changeset:
+
+ "[Cocoa] REGRESSION(r272752): fix some internal builds that
+ use WTFString::WTFString(NSString *)"
+ https://bugs.webkit.org/show_bug.cgi?id=222610
+ https://commits.webkit.org/r273906
+
+2021-03-04 Alex Christensen <achristen...@webkit.org>
+
[Cocoa] REGRESSION(r272752): fix some internal builds that use WTFString::WTFString(NSString *)
https://bugs.webkit.org/show_bug.cgi?id=222610
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (273916 => 273917)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-03-04 21:43:33 UTC (rev 273916)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-03-04 22:05:53 UTC (rev 273917)
@@ -390,13 +390,13 @@
def objc_protocol_import_expression_for_member(self, name, declaration, member):
if isinstance(member.type, EnumType):
if member.type.is_anonymous:
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), name)
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), name)
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), name)
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), name)
return self.objc_protocol_import_expression_for_variable(member.type, name)
def objc_protocol_import_expression_for_parameter(self, name, domain, event_or_command_name, parameter):
if isinstance(parameter.type, EnumType):
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_non_anonymous_enum(parameter.type), name)
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(parameter.type), name)
return self.objc_protocol_import_expression_for_variable(parameter.type, name)
def objc_protocol_import_expression_for_variable(self, var_type, var_name):
@@ -442,8 +442,8 @@
if category in [ObjCTypeCategory.Simple, ObjCTypeCategory.String]:
if isinstance(member.type, EnumType):
if member.type.is_anonymous:
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s).value()' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s).value()' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
+ return 'fromProtocolString<%s>(%s).value()' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
+ return 'fromProtocolString<%s>(%s).value()' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
return sub_expression
if category == ObjCTypeCategory.Object:
raise Exception("protocol_to_objc_expression_for_member does not support an Object type. See: protocol_to_objc_code_block_for_object_member")
@@ -487,9 +487,9 @@
if isinstance(member.type, EnumType):
sub_expression = 'payload[@"%s"]' % member.member_name
if member.type.is_anonymous:
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
else:
- return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
if isinstance(_type, ObjectType):
objc_class = self.objc_class_for_type(member.type)
return '[[%s alloc] initWithPayload:payload[@"%s"]]' % (objc_class, member.member_name)
