Changeset 273917 in webkit

Timestamp:

Mar 4, 2021 2:05:53 PM (3 years ago)

Author:

achristensen@apple.com

Message:

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

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/scripts/codegen/objc_generator.py (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-04  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
 

trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py

@@ -391 +391 @@
         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)
 
@@ -443 +443 @@
             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:
@@ -488 +488 @@
             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)