[webkit-changes] cvs commit: WebCore/khtml/html html_formimpl.cpp

[Darin]

darin       05/06/18 23:03:42

  Modified:    .        ChangeLog
               khtml/html html_formimpl.cpp
  Log:
          - undid a last minute change I made that broke a patch I landed
            (layout tests caught the mistake, all should work again now)
  
          * khtml/html/html_formimpl.cpp:
          (DOM::HTMLLabelElementImpl::formElement): Don't include this when iterating.
          (DOM::HTMLLegendElementImpl::formElement): Ditto.
  
  Revision  Changes    Path
  1.4283    +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4282
  retrieving revision 1.4283
  diff -u -r1.4282 -r1.4283
  --- ChangeLog	19 Jun 2005 05:50:19 -0000	1.4282
  +++ ChangeLog	19 Jun 2005 06:03:38 -0000	1.4283
  @@ -1,5 +1,14 @@
   2005-06-18  Darin Adler  <darin at apple.com>
   
  +        - undid a last minute change I made that broke a patch I landed
  +          (layout tests caught the mistake, all should work again now)
  +
  +        * khtml/html/html_formimpl.cpp:
  +        (DOM::HTMLLabelElementImpl::formElement): Don't include this when iterating.
  +        (DOM::HTMLLegendElementImpl::formElement): Ditto.
  +
  +2005-06-18  Darin Adler  <darin at apple.com>
  +
           - disabling the applet tests, since they are causing other tests to fail
   
           * layout-tests/fast/replaced/applet-hspace-expected.txt: Removed.
  
  
  
  1.165     +4 -2      WebCore/khtml/html/html_formimpl.cpp
  
  Index: html_formimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- html_formimpl.cpp	19 Jun 2005 05:31:59 -0000	1.164
  +++ html_formimpl.cpp	19 Jun 2005 06:03:41 -0000	1.165
  @@ -2377,7 +2377,8 @@
       DOMString formElementId = getAttribute(ATTR_FOR);
       if (formElementId.isNull()) {
           // Search children of the label element for a form element.
  -        for (NodeImpl *node = this; node; node = node->traverseNextNode(this)) {
  +        NodeImpl *node = this;
  +        while ((node = node->traverseNextNode(this))) {
               if (node->isHTMLElement()) {
                   HTMLElementImpl *element = static_cast<HTMLElementImpl *>(node);
                   if (element->isGenericFormElement())
  @@ -2494,7 +2495,8 @@
   
       // Find first form element inside the fieldset.
       // FIXME: Should we care about tabindex?
  -    for (NodeImpl *node = fieldset; node; node = node->traverseNextNode(fieldset)) {
  +    NodeImpl *node = fieldset;
  +    while ((node = node->traverseNextNode(fieldset))) {
           if (node->isHTMLElement()) {
               HTMLElementImpl *element = static_cast<HTMLElementImpl *>(node);
               if (element->id() != ID_LEGEND && element->isGenericFormElement())