Changeset 18715 in webkit


Ignore:
Timestamp:
Jan 9, 2007, 9:38:46 AM (19 years ago)
Author:
ap
Message:

2007-01-09 Mitz Pettel <​[email protected]>

Reviewed by Darin.

JavaScriptCore:

  • JavaScriptCore.exp:
  • kjs/value.cpp: (KJS::JSValue::toInt32): Folded toInt32Inline into this method, which was its only caller. (KJS::JSValue::toUInt32): Added a variant that reports if the conversion has succeeded.
  • kjs/value.h:

WebCore:

  • bindings/js/kjs_html.cpp: (KJS::JSHTMLCollectionProtoFunc::callAsFunction): Changed item() to fall back to namedItem() if its argument does not convert to a number.

LayoutTests:

  • fast/dom/collection-namedItem-via-item-expected.txt: Added.
  • fast/dom/collection-namedItem-via-item.html: Added.
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r18712 r18715  
     12007-01-09  Mitz Pettel  <[email protected]>
     2
     3        Reviewed by Darin.
     4
     5        - changes for http://bugs.webkit.org/show_bug.cgi?id=11078
     6          Forms Don't Submit (ASP Pages)
     7
     8        * JavaScriptCore.exp:
     9        * kjs/value.cpp:
     10        (KJS::JSValue::toInt32): Folded toInt32Inline into this method, which was its
     11        only caller.
     12        (KJS::JSValue::toUInt32): Added a variant that reports if the conversion has
     13        succeeded.
     14        * kjs/value.h:
     15
    1162007-01-09  Darin Adler  <[email protected]>
    217

  • trunk/JavaScriptCore/JavaScriptCore.exp

    r18481 r18715  
    248248__ZNK3KJS7JSValue7toInt32EPNS_9ExecStateERb
    249249__ZNK3KJS7JSValue8toUInt32EPNS_9ExecStateE
     250__ZNK3KJS7JSValue8toUInt32EPNS_9ExecStateERb
    250251__ZNK3KJS7JSValue9toIntegerEPNS_9ExecStateE
    251252__ZNK3KJS7UString10UTF8StringEv

  • trunk/JavaScriptCore/kjs/value.cpp

    r17372 r18715  
    5656}
    5757
    58 inline int32_t JSValue::toInt32Inline(ExecState* exec, bool& ok) const
     58int32_t JSValue::toInt32(ExecState* exec) const
     59{
     60    bool ok;
     61    return toInt32(exec, ok);
     62}
     63
     64int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
    5965{
    6066    ok = true;
    … …  
    7985}
    8086
    81 int32_t JSValue::toInt32(ExecState* exec) const
     87uint32_t JSValue::toUInt32(ExecState* exec) const
    8288{
    8389    bool ok;
    84     return toInt32(exec, ok);
     90    return toUInt32(exec, ok);
    8591}
    8692
    87 int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
     93uint32_t JSValue::toUInt32(ExecState* exec, bool& ok) const
    8894{
    89     return toInt32Inline(exec, ok);
    90 }
     95    ok = true;
    9196
    92 uint32_t JSValue::toUInt32(ExecState *exec) const
    93 {
    9497    uint32_t i;
    9598    if (getUInt32(i))
    … …  
    97100
    98101    double d = roundValue(exec, const_cast<JSValue*>(this));
    99     if (isNaN(d) || isInf(d))
     102    if (isNaN(d) || isInf(d)) {
     103        ok = false;
    100104        return 0;
     105    }
    101106    double d32 = fmod(d, D32);
    102107

  • trunk/JavaScriptCore/kjs/value.h

    r17372 r18715  
    9595
    9696    // Integer conversions.
    97     double toInteger(ExecState *exec) const;
     97    double toInteger(ExecState*) const;
    9898    int32_t toInt32(ExecState*) const;
    9999    int32_t toInt32(ExecState*, bool& ok) const;
    100     uint32_t toUInt32(ExecState *exec) const;
    101     uint16_t toUInt16(ExecState *exec) const;
     100    uint32_t toUInt32(ExecState*) const;
     101    uint32_t toUInt32(ExecState*, bool& ok) const;
     102    uint16_t toUInt16(ExecState*) const;
    102103
    103104    // Garbage collection.
    … …  
    109110    JSCell *downcast();
    110111    const JSCell *downcast() const;
    111     inline int32_t toInt32Inline(ExecState*, bool& ok) const;
    112112
    113113    // Give a compile time error if we try to copy one of these.

  • trunk/LayoutTests/ChangeLog

    r18707 r18715  
     12007-01-09  Mitz Pettel  <[email protected]>
     2
     3        Reviewed by Darin.
     4
     5        - test for http://bugs.webkit.org/show_bug.cgi?id=11078
     6          Forms Don't Submit (ASP Pages)
     7
     8        * fast/dom/collection-namedItem-via-item-expected.txt: Added.
     9        * fast/dom/collection-namedItem-via-item.html: Added.
     10
    1112007-01-09  Darin Adler  <[email protected]>
    212

  • trunk/WebCore/ChangeLog

    r18712 r18715  
     12007-01-09  Mitz Pettel  <[email protected]>
     2
     3        Reviewed by Darin.
     4
     5        - fix http://bugs.webkit.org/show_bug.cgi?id=11078
     6          Forms Don't Submit (ASP Pages)
     7
     8        Test: fast/dom/collection-namedItem-via-item.html
     9
     10        * bindings/js/kjs_html.cpp:
     11        (KJS::JSHTMLCollectionProtoFunc::callAsFunction): Changed item() to fall back
     12        to namedItem() if its argument does not convert to a number.
     13
    1142007-01-09  Darin Adler  <[email protected]>
    215

  • trunk/WebCore/bindings/js/kjs_html.cpp

    r18674 r18715  
    16781678
    16791679  switch (id) {
    1680   case JSHTMLCollection::Item:
    1681     return toJS(exec,coll.item(args[0]->toUInt32(exec)));
    16821680  case JSHTMLCollection::Tags:
    16831681    return toJS(exec, coll.base()->getElementsByTagName(args[0]->toString(exec)).get());
     1682  case JSHTMLCollection::Item:
     1683    {
     1684        bool ok;
     1685        uint32_t index = args[0]->toUInt32(exec, ok);
     1686        if (ok)
     1687            return toJS(exec, coll.item(index));
     1688    }
     1689    // Fall through
    16841690  case JSHTMLCollection::NamedItem:
    16851691    return static_cast<JSHTMLCollection*>(thisObj)->getNamedItems(exec, Identifier(args[0]->toString(exec)));
Note: See TracChangeset for help on using the changeset viewer.