diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/bindings/scripts/CodeGeneratorJS.pm | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/bindings/scripts/CodeGeneratorJS.pm')
| -rw-r--r-- | WebCore/bindings/scripts/CodeGeneratorJS.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm index d992d89..05f532c 100644 --- a/WebCore/bindings/scripts/CodeGeneratorJS.pm +++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm @@ -1977,7 +1977,11 @@ sub GenerateImplementation # FIXME: this casts into int to match our previous behavior which turned 0xFFFFFFFF in -1 for NodeFilter.SHOW_ALL push(@implContent, "JSValue ${getter}(ExecState* exec, JSValue, const Identifier&)\n"); push(@implContent, "{\n"); - push(@implContent, " return jsNumber(exec, static_cast<int>(" . $constant->value . "));\n"); + if ($constant->type eq "DOMString") { + push(@implContent, " return jsStringOrNull(exec, String(" . $constant->value . "));\n"); + } else { + push(@implContent, " return jsNumber(exec, static_cast<int>(" . $constant->value . "));\n"); + } push(@implContent, "}\n\n"); } } |