Changeset 52434 in webkit

Timestamp:

Dec 20, 2009 10:20:29 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2009-12-20 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

A test for Date binding.
​https://bugs.webkit.org/show_bug.cgi?id=32698

• fast/forms/input-valueasdate-expected.txt: Added.
• fast/forms/input-valueasdate.html: Added.
• fast/forms/script-tests/input-valueasdate.js: Added.

2009-12-20 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Add support for JavaScriptCore Date binding.
​https://bugs.webkit.org/show_bug.cgi?id=32698

This is needed for HTMLInputElement::valueAsDate and
HTMLTimeElement::valueAsDate.

A Date instance is mapped to a double value in C++.

• If null or undefined is set to a JavaScript property, C++ setter function receives NaN.
• If a getter C++ function returns NaN or infinity, a JavaScript property returns null.

Test: fast/forms/input-valueasdate.html

• bindings/js/JSDOMBinding.cpp: (WebCore::jsDateOrNull): Implement the above. (WebCore::valueToDate): ditto.
• bindings/js/JSDOMBinding.h: Declare them.
• bindings/scripts/CodeGeneratorJS.pm: Produce jsDateOrNull() or valueToDate() for Date type.
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::valueAsDate): Temporal implementation. (WebCore::HTMLInputElement::setValueAsDate): ditto.
• html/HTMLInputElement.h:
• html/HTMLInputElement.idl: Declare valueAsDate.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-valueasdate-expected.txt (added)
• LayoutTests/fast/forms/input-valueasdate.html (added)
• LayoutTests/fast/forms/script-tests/input-valueasdate.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMBinding.cpp (modified) (2 diffs)
• WebCore/bindings/js/JSDOMBinding.h (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• WebCore/html/HTMLInputElement.h (modified) (1 diff)
• WebCore/html/HTMLInputElement.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-20  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        A test for Date binding.
+        https://bugs.webkit.org/show_bug.cgi?id=32698
+
+        * fast/forms/input-valueasdate-expected.txt: Added.
+        * fast/forms/input-valueasdate.html: Added.
+        * fast/forms/script-tests/input-valueasdate.js: Added.
+
 2009-12-20  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-20  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add support for JavaScriptCore Date binding.
+        https://bugs.webkit.org/show_bug.cgi?id=32698
+
+        This is needed for HTMLInputElement::valueAsDate and
+        HTMLTimeElement::valueAsDate.
+
+        A Date instance is mapped to a double value in C++.
+        - If null or undefined is set to a JavaScript property, C++ setter
+          function receives NaN.
+        - If a getter C++ function returns NaN or infinity, a JavaScript
+          property returns null.
+
+        Test: fast/forms/input-valueasdate.html
+
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::jsDateOrNull): Implement the above.
+        (WebCore::valueToDate): ditto.
+        * bindings/js/JSDOMBinding.h: Declare them.
+        * bindings/scripts/CodeGeneratorJS.pm: Produce jsDateOrNull() or
+          valueToDate() for Date type.
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::valueAsDate): Temporal implementation.
+        (WebCore::HTMLInputElement::setValueAsDate): ditto.
+        * html/HTMLInputElement.h:
+        * html/HTMLInputElement.idl: Declare valueAsDate.
+
 2009-12-20  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/bindings/js/JSDOMBinding.cpp

@@ -50 +50 @@
 #include "Settings.h"
 #include "XMLHttpRequestException.h"
+#include <runtime/DateInstance.h>
 #include <runtime/Error.h>
 #include <runtime/JSFunction.h>
 #include <runtime/PrototypeFunction.h>
+#include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 
@@ -597 +599 @@
 }
 
+JSValue jsDateOrNull(ExecState* exec, double value)
+{
+    if (!isfinite(value))
+        return jsNull();
+    return new (exec) DateInstance(exec, value);
+}
+
+double valueToDate(ExecState* exec, JSValue value)
+{
+    if (value.isNumber())
+        return value.uncheckedGetNumber();
+    if (!value.inherits(&DateInstance::info))
+        return std::numeric_limits<double>::quiet_NaN();
+    return static_cast<DateInstance*>(value.toObject(exec))->internalNumber();
+}
+
 void reportException(ExecState* exec, JSValue exception)
 {

trunk/WebCore/bindings/js/JSDOMBinding.h

@@ -357 +357 @@
     JSC::UString valueToStringWithUndefinedOrNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null or undefined
 
+    // Returns a Date instance for the specified value, or null if the value is NaN or infinity.
+    JSC::JSValue jsDateOrNull(JSC::ExecState*, double);
+    // NaN if the value can't be converted to a date.
+    double valueToDate(JSC::ExecState*, JSC::JSValue);
+
     // FIXME: These are a stop-gap until all toJS calls can be converted to pass a globalObject
     template <typename T>

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -188 +188 @@
     if ($codeGenerator->IsPrimitiveType($type) or AvoidInclusionOfType($type)
         or $type eq "DOMString" or $type eq "DOMObject" or $type eq "Array") {
+    } elsif ($type eq "Date") {
+        $implIncludes{"<runtime/DateInstance.h>"} = 1;
     } elsif ($type =~ /SVGPathSeg/) {
         $joinedName = $type;
@@ -1864 +1866 @@
     return "$value.toInt32(exec)" if $type eq "unsigned long" or $type eq "long" or $type eq "unsigned short";
 
+    return "valueToDate(exec, $value)" if $type eq "Date";
     return "static_cast<Range::CompareHow>($value.toInt32(exec))" if $type eq "CompareHow";
     return "static_cast<SVGPaint::SVGPaintType>($value.toInt32(exec))" if $type eq "SVGPaintType";
@@ -1988 +1991 @@
         $implIncludes{"$type.h"} = 1;
         return "$value->deserialize(exec)";
+    } elsif ($type eq "Date") {
+        $implIncludes{"<runtime/DateInstance.h>"} = 1;
+        return "jsDateOrNull(exec, $value)";
     } else {
         # Default, include header with same name.

trunk/WebCore/html/HTMLInputElement.cpp

@@ -1373 +1373 @@
     InputElement::notifyFormStateChanged(this);
     updateValidity();
+}
+
+double HTMLInputElement::valueAsDate() const
+{
+    // FIXME: This is a temporary implementation to check Date binding.
+    if (inputType() == MONTH)
+        return 0.0;
+    return std::numeric_limits<double>::quiet_NaN();
+}
+
+void HTMLInputElement::setValueAsDate(double value, ExceptionCode& ec)
+{
+    // FIXME: This is a temporary implementation to check Date binding.
+    if (!isnan(value) && !isinf(value) && inputType() == MONTH) {
+        setValue(String("1970-01"));
+        return;
+    }
+    ec = INVALID_STATE_ERR;
 }
 

trunk/WebCore/html/HTMLInputElement.h

@@ -145 +145 @@
     virtual void setValueForUser(const String&);
 
+    double valueAsDate() const;
+    void setValueAsDate(double, ExceptionCode&);
+
     virtual String placeholder() const;
     virtual void setPlaceholder(const String&);

trunk/WebCore/html/HTMLInputElement.idl

@@ -68 +68 @@
                  attribute [ConvertNullToNullString] DOMString useMap;
                  attribute [ConvertNullToNullString] DOMString value;
+#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT && !(defined(V8_BINDING) && V8_BINDING)
+                 // FIXME: Add Date support for V8, Objective-C, and COM.
+                 attribute Date            valueAsDate setter raises(DOMException);
+#endif
 #if defined(ENABLE_DATALIST) && ENABLE_DATALIST
         readonly attribute HTMLOptionElement selectedOption;