[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_html.cpp kjs_html.h

[Anders]

andersca    06/01/07 02:33:27

  Modified:    .        ChangeLog
               khtml/ecma kjs_html.cpp kjs_html.h
  Log:
  2006-01-07  Anders Carlsson  <andersca at mac.com>
  
          Reviewed by Maciej.
  
          - Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6373
          REGRESSION: JavaScript hang when comparing large array to null
  
          * khtml/ecma/kjs_html.cpp:
          Remove toPrimitive.
  
          * khtml/ecma/kjs_html.h:
          (KJS::HTMLAllCollection::isEqualToNull):
          Implement isEqualToNull and have it return true.
  
  Revision  Changes    Path
  1.97      +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- ChangeLog	7 Jan 2006 02:15:15 -0000	1.96
  +++ ChangeLog	7 Jan 2006 10:33:25 -0000	1.97
  @@ -1,3 +1,17 @@
  +2006-01-07  Anders Carlsson  <andersca at mac.com>
  +
  +        Reviewed by Maciej.
  +
  +        - Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6373
  +        REGRESSION: JavaScript hang when comparing large array to null
  +        
  +        * khtml/ecma/kjs_html.cpp:
  +        Remove toPrimitive.
  +        
  +        * khtml/ecma/kjs_html.h:
  +        (KJS::HTMLAllCollection::isEqualToNull):
  +        Implement isEqualToNull and have it return true.
  +
   2006-01-06  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by darin.
  
  
  
  1.165     +0 -10     WebCore/khtml/ecma/kjs_html.cpp
  
  Index: kjs_html.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- kjs_html.cpp	4 Jan 2006 21:05:23 -0000	1.164
  +++ kjs_html.cpp	7 Jan 2006 10:33:26 -0000	1.165
  @@ -3352,16 +3352,6 @@
   
   // -------------------------------------------------------------------------
   
  -JSValue *HTMLAllCollection::toPrimitive(ExecState *exec, Type preferredType) const
  -{
  -    if (preferredType == NullType)
  -        return jsNull();
  -    else
  -        return HTMLCollection::toPrimitive(exec, preferredType);
  -}
  -
  -// -------------------------------------------------------------------------
  -
   HTMLSelectCollection::HTMLSelectCollection(ExecState *exec, HTMLCollectionImpl *c, HTMLSelectElementImpl *e)
     : HTMLCollection(exec, c), m_element(e)
   {
  
  
  
  1.67      +1 -1      WebCore/khtml/ecma/kjs_html.h
  
  Index: kjs_html.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.h,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- kjs_html.h	29 Dec 2005 08:20:37 -0000	1.66
  +++ kjs_html.h	7 Jan 2006 10:33:26 -0000	1.67
  @@ -335,7 +335,7 @@
       HTMLAllCollection(ExecState *exec, DOM::HTMLCollectionImpl *c) :
         HTMLCollection(exec, c) { }
       virtual bool toBoolean(ExecState *) const { return false; }
  -    virtual JSValue *toPrimitive(ExecState *exec, Type preferredType) const;
  +    virtual bool isEqualToNull(ExecState *) const { return true; }
     };
     
     ////////////////////// Option Object ////////////////////////