[webkit-changes] cvs commit: WebCore/layout-tests/dom/html/level2/core hc_nodedocumentfragmentnormalize2-expected.txt

[Darin]

darin       05/08/14 01:18:51

  Modified:    .        ChangeLog
               khtml/xml dom_nodeimpl.cpp
               layout-tests/dom/html/level2/core
                        hc_nodedocumentfragmentnormalize2-expected.txt
  Log:
          Reviewed and landed by Darin.
  
          Test cases added:
          * layout-tests/dom/html/level2/core/hc_nodedocumentfragmentnormalize2-expected.txt:
  	This passes now.
  
          * khtml/xml/dom_nodeimpl.cpp:
          (DOM::NodeImpl::normalize):
  	If there's a single empty text child, remove it.
  
  Revision  Changes    Path
  1.4567    +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4566
  retrieving revision 1.4567
  diff -u -r1.4566 -r1.4567
  --- ChangeLog	14 Aug 2005 08:07:18 -0000	1.4566
  +++ ChangeLog	14 Aug 2005 08:18:46 -0000	1.4567
  @@ -2,6 +2,18 @@
   
           Reviewed and landed by Darin.
   
  +        Test cases added: 
  +        * layout-tests/dom/html/level2/core/hc_nodedocumentfragmentnormalize2-expected.txt:
  +	This passes now.
  +	
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (DOM::NodeImpl::normalize):
  +	If there's a single empty text child, remove it.
  +	
  +2005-08-14  Anders Carlsson  <andersca at mac.com>
  +
  +        Reviewed and landed by Darin.
  +
           Test cases added:
           * layout-tests/dom/html/level2/html/HTMLSelectElement20-expected.txt:
   	This passes now.
  
  
  
  1.173     +8 -0      WebCore/khtml/xml/dom_nodeimpl.cpp
  
  Index: dom_nodeimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
  retrieving revision 1.172
  retrieving revision 1.173
  diff -u -r1.172 -r1.173
  --- dom_nodeimpl.cpp	9 Aug 2005 21:29:42 -0000	1.172
  +++ dom_nodeimpl.cpp	14 Aug 2005 08:18:50 -0000	1.173
  @@ -260,6 +260,14 @@
               child = nextChild;
           }
       }
  +    
  +    // Check if we have a single empty text node left and remove it if so
  +    child = firstChild();
  +    if (child && !child->nextSibling() && child->isTextNode()) {
  +        TextImpl *text = static_cast<TextImpl*>(child);
  +        if (text->data().isEmpty())
  +            removeChild(child, exceptioncode);
  +    }
   }
   
   const AtomicString& NodeImpl::prefix() const
  
  
  
  1.2       +2 -3      WebCore/layout-tests/dom/html/level2/core/hc_nodedocumentfragmentnormalize2-expected.txt
  
  Index: hc_nodedocumentfragmentnormalize2-expected.txt
  ===================================================================
  RCS file: /cvs/root/WebCore/layout-tests/dom/html/level2/core/hc_nodedocumentfragmentnormalize2-expected.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hc_nodedocumentfragmentnormalize2-expected.txt	26 Jul 2005 08:35:07 -0000	1.1
  +++ hc_nodedocumentfragmentnormalize2-expected.txt	14 Aug 2005 08:18:51 -0000	1.2
  @@ -1,3 +1,2 @@
  -Test:	http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize2	
  -Status:	failure
  -Detail:	noChild: assertNull failed, actual [object Text]
  +Test:	http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize2
  +Status:	Success