webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 18 deletions

diff --git a/Source/WebCore/bindings/scripts/StaticString.pm b/Source/WebCore/bindings/scripts/StaticString.pm
index b8feaa57e..9ba0c70a8 100644
--- a/Source/WebCore/bindings/scripts/StaticString.pm
+++ b/Source/WebCore/bindings/scripts/StaticString.pm
@@ -33,27 +33,26 @@ sub GenerateStrings($)
 
     my @result = ();
 
-    while ( my ($name, $value) = each %strings ) {
-        push(@result, "static const LChar ${name}String8[] = \"${value}\";\n");
-    }
-
-    push(@result, "\n");
+    push(@result, <<END);
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4307)
+#endif
 
-    while ( my ($name, $value) = each %strings ) {
-        my $length = length($value);
-        my $hash = Hasher::GenerateHashValue($value);
-        push(@result, <<END);
-static StringImpl::StaticASCIILiteral ${name}Data = {
-    StringImpl::StaticASCIILiteral::s_initialRefCount,
-    $length,
-    ${name}String8,
-    0,
-    StringImpl::StaticASCIILiteral::s_initialFlags | (${hash} << StringImpl::StaticASCIILiteral::s_hashShift)
-};
 END
+
+    for my $name (sort keys %strings) {
+        my $value = $strings{$name};
+        push(@result, "static StringImpl::StaticStringImpl ${name}Data(\"${value}\");\n");
     }
 
-    push(@result, "\n");
+    push(@result, <<END);
+
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
+
+END
 
     return join "", @result;
 }
@@ -67,7 +66,7 @@ sub GenerateStringAsserts($)
 
     push(@result, "#ifndef NDEBUG\n");
 
-    while ( my ($name, $value) = each %strings ) {
+    for my $name (sort keys %strings) {
         push(@result, "    reinterpret_cast<StringImpl*>(&${name}Data)->assertHashIsCorrect();\n");
     }