Changeset 175995 in webkit

Timestamp:

Nov 11, 2014, 5:20:30 PM (12 years ago)

Author:

ddkilzer@apple.com

Message:

Modernize $buildingForIPhone in CodeGeneratorObjC.pm
<​http://webkit.org/b/138640>

Reviewed by Daniel Bates.

Mac OS X is the only platform that supports NSColor, so rename
$buildingForIPhone to $shouldUseCGColor (which is actually what
the variable represents) and define it in terms of the "macosx"
platform name.

• bindings/scripts/CodeGeneratorObjC.pm:

($buildingForIPhone): Rename to $shouldUseCGColor.
($shouldUseCGColor): False if PLATFORM_NAME is not defined,
which is the case on older Xcodes when building for Mac OS X, or
if PLATFORM_NAME is equal to "macosx". True otherwise.
(GetClassName): Switch to use new variable name.
(AddIncludesForType): Ditto.
(GenerateHeader): Remove dead code. The
$buildingForTigerOrEarlier variable was accidentally
re-introduced in r161638, but was originally removed in r127032!
(GenerateImplementation): Switch to use new variable name.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorObjC.pm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-11  David Kilzer  <ddkilzer@apple.com>
+
+        Modernize $buildingForIPhone in CodeGeneratorObjC.pm
+        <http://webkit.org/b/138640>
+
+        Reviewed by Daniel Bates.
+
+        Mac OS X is the only platform that supports NSColor, so rename
+        $buildingForIPhone to $shouldUseCGColor (which is actually what
+        the variable represents) and define it in terms of the "macosx"
+        platform name.
+
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        ($buildingForIPhone): Rename to $shouldUseCGColor.
+        ($shouldUseCGColor): False if PLATFORM_NAME is not defined,
+        which is the case on older Xcodes when building for Mac OS X, or
+        if PLATFORM_NAME is equal to "macosx".  True otherwise.
+        (GetClassName): Switch to use new variable name.
+        (AddIncludesForType): Ditto.
+        (GenerateHeader): Remove dead code.  The
+        $buildingForTigerOrEarlier variable was accidentally
+        re-introduced in r161638, but was originally removed in r127032!
+        (GenerateImplementation): Switch to use new variable name.
+
 2014-11-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -105 +105 @@
 
 # Constants
-my $buildingForIPhone = defined $ENV{PLATFORM_NAME} && ($ENV{PLATFORM_NAME} eq "iphoneos" or $ENV{PLATFORM_NAME} eq "iphonesimulator");
+my $shouldUseCGColor = defined $ENV{PLATFORM_NAME} && $ENV{PLATFORM_NAME} ne "macosx";
 my $nullableInit = "bool isNull = false;";
 my $exceptionInit = "WebCore::ExceptionCode ec = 0;";
@@ -393 +393 @@
     # special cases
     return "NSString" if $codeGenerator->IsStringType($name) or $name eq "SerializedScriptValue";
-    return "CGColorRef" if $name eq "Color" and $buildingForIPhone;
+    return "CGColorRef" if $name eq "Color" and $shouldUseCGColor;
     return "NS$name" if IsNativeObjCType($name);
     return "BOOL" if $name eq "boolean";
@@ -660 +660 @@
     if (IsNativeObjCType($type)) {
         if ($type eq "Color") {
-            if ($buildingForIPhone) {
+            if ($shouldUseCGColor) {
                 $implIncludes{"ColorSpace.h"} = 1;
             } else {
@@ -864 +864 @@
 
             # FIXME: This only works for the getter, but not the setter.  Need to refactor this code.
-            if ($buildingForTigerOrEarlier && !$buildingForIPhone || IsCoreFoundationType($attributeType)) {
+            if (IsCoreFoundationType($attributeType)) {
                 $publicInterfaceKey = "- (" . $attributeType . ")" . $attributeName . ";";
             }
@@ -1330 +1330 @@
                 $getterContentTail .= ")";
             } elsif ($idlType eq "Color") {
-                if ($buildingForIPhone) {
+                if ($shouldUseCGColor) {
                     $getterContentHead = "WebCore::cachedCGColor($getterContentHead";
                     $getterContentTail .= ", WebCore::ColorSpaceDeviceRGB)";