IDL compiler: treat DOMString and DOMTimeStamp as primitive types

Source/bindings/scripts/code_generator_v8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 134 matching lines @@
 #   Conditional           ... #if FEATURE ... #endif  (to be removed soon)
 #     Includes
 #     NameSpaceWebCore
 #     NameSpaceInternal   ... namespace ${implClassName}V8Internal in case of non-callback
 my %implementation;
 
 # Promise is not yet in the Web IDL spec but is going to be speced
 # as primitive types in the future.
 # Since V8 dosn't provide Promise primitive object currently,
 # primitiveTypeHash doesn't contain Promise.
-my %primitiveTypeHash = ("boolean" => 1,
+my %primitiveTypeHash = ("Date" => 1,
+                         "DOMString" => 1,
+                         "DOMTimeStamp" => 1,  # typedef unsigned long long
+                         "boolean" => 1,
                          "void" => 1,
-                         "Date" => 1,
                          "byte" => 1,
                          "octet" => 1,
                          "short" => 1,
                          "long" => 1,
                          "long long" => 1,
                          "unsigned short" => 1,
                          "unsigned long" => 1,
                          "unsigned long long" => 1,
                          "float" => 1,
                          "double" => 1,
@@ skipping 239 matching lines @@
     }
 }
 
 sub SkipIncludeHeader
 {
     my $type = shift;
 
     return 1 if IsPrimitiveType($type);
     return 1 if IsEnumType($type);
     return 1 if IsCallbackFunctionType($type);
-    return 1 if $type eq "DOMString";
     return 0;
 }
 
 sub AddIncludesForType
 {
     my $type = shift;
 
     return if SkipIncludeHeader($type);
 
     # Default includes
@@ skipping 5027 matching lines @@
 }
 
 sub IsWrapperType
 {
     my $type = shift;
     return 0 if GetArrayType($type);
     return 0 if GetSequenceType($type);
     return 0 if IsCallbackFunctionType($type);
     return 0 if IsEnumType($type);
     return 0 if IsPrimitiveType($type);
-    return 0 if $type eq "DOMString";
     return 0 if $type eq "Promise";
     return !$nonWrapperTypes{$type};
 }
 
 sub IsCallbackInterface
 {
     my $type = shift;
     return 0 unless IsWrapperType($type);
     return 0 if IsTypedArrayType($type);
 
@@ skipping 124 matching lines @@
         return "${indent}v8SetReturnValue(${getCallbackInfo}, v8DateOrNull($nativeValue, $getIsolate));" if $isReturnValue;
         return "$indent$receiver v8DateOrNull($nativeValue, $getIsolate);"
     }
 
     # long long and unsigned long long are not representable in ECMAScript.
     if ($type eq "long long" or $type eq "unsigned long long" or $type eq "DOMTimeStamp") {
         return "${indent}v8SetReturnValue(${getCallbackInfo}, static_cast<double>($nativeValue));" if $isReturnValue;
         return "$indent$receiver v8::Number::New($getIsolate, static_cast<double>($nativeValue));";
     }
 
-    if (IsPrimitiveType($type)) {
-        die "unexpected type $type" if not ($type eq "float" or $type eq "double");
-        return "${indent}v8SetReturnValue(${getCallbackInfo}, ${nativeValue});" if $isReturnValue;
-        return "$indent$receiver v8::Number::New($getIsolate, $nativeValue);";
-    }
-
-    if ($nativeType eq "ScriptValue" or $nativeType eq "ScriptPromise") {
-        return "${indent}v8SetReturnValue(${getCallbackInfo}, ${nativeValue}.v8Value());" if $isReturnValue;
-        return "$indent$receiver $nativeValue.v8Value();";
-    }
-
     my $conv = $extendedAttributes->{"TreatReturnedNullStringAs"};
     if (($type eq "DOMString" || IsEnumType($type)) && $isReturnValue) {
         my $functionSuffix = "";
         if (defined $conv) {
             if ($conv eq "Null") {
                 $functionSuffix = "OrNull";
             } elsif ($conv eq "Undefined") {
                 $functionSuffix = "OrUndefined";
             } else {
                 die "Unknown value for TreatReturnedNullStringAs extended attribute";
@@ skipping 11 matching lines @@
                 $returnValue = "v8StringOrUndefined($nativeValue, $getIsolate)";
             } else {
                 die "Unknown value for TreatReturnedNullStringAs extended attribute";
             }
         } else {
             $returnValue = "v8String($nativeValue, $getIsolate)";
         }
         return "$indent$receiver $returnValue;";
     }
 
+    if (IsPrimitiveType($type)) {
+        die "unexpected type $type" if not ($type eq "float" or $type eq "double");
+        return "${indent}v8SetReturnValue(${getCallbackInfo}, ${nativeValue});" if $isReturnValue;
+        return "$indent$receiver v8::Number::New($getIsolate, $nativeValue);";
+    }
+
+    if ($nativeType eq "ScriptValue" or $nativeType eq "ScriptPromise") {
+        return "${indent}v8SetReturnValue(${getCallbackInfo}, ${nativeValue}.v8Value());" if $isReturnValue;
+        return "$indent$receiver $nativeValue.v8Value();";
+    }
+
     my $arrayOrSequenceType = GetArrayOrSequenceType($type);
 
     if ($arrayOrSequenceType) {
         if (IsRefPtrType($arrayOrSequenceType)) {
             AddIncludesForType($arrayOrSequenceType);
         }
         return "${indent}v8SetReturnValue(${getCallbackInfo}, v8Array($nativeValue, $getIsolate));" if $isReturnValue;
         return "$indent$receiver v8Array($nativeValue, $getIsolate);";
     }
 
@@ skipping 213 matching lines @@
 }
 
 sub IsRefPtrType
 {
     my $type = shift;
 
     return 0 if $type eq "any";
     return 0 if IsPrimitiveType($type);
     return 0 if GetArrayType($type);
     return 0 if GetSequenceType($type);
-    return 0 if $type eq "DOMString";
     return 0 if $type eq "Promise";
     return 0 if IsCallbackFunctionType($type);
     return 0 if IsEnumType($type);
     return 0 if IsUnionType($type);
 
     return 1;
 }
 
 sub GetSVGTypeNeedingTearOff
 {
@@ skipping 309 matching lines @@
     my $interface = shift;
 
     return 1 if $interface->extendedAttributes->{"CustomToV8"};
     return 1 if $interface->extendedAttributes->{"SpecialWrapFor"};
     return 1 if InheritsInterface($interface, "Document");
 
     return 0;
 }
 
 1;