[webkit-changes] cvs commit: WebCore/khtml/xml dom_textimpl.cpp

[Eric]

eseidel     05/09/15 23:36:18

  Modified:    .        ChangeLog
               khtml/xml dom_textimpl.cpp
  Log:
  Bug #: 4907
  Submitted by: eseidel
  Reviewed by: mjs
          * khtml/xml/dom_textimpl.cpp:
          (TextImpl::rendererIsNeeded):
          One line change to prevent adding text objects as direct
          children to FrameSet objects in the render tree.
  
  Revision  Changes    Path
  1.127     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- ChangeLog	15 Sep 2005 23:50:14 -0000	1.126
  +++ ChangeLog	16 Sep 2005 06:36:17 -0000	1.127
  @@ -1,3 +1,15 @@
  +2005-09-15  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by mjs.
  +
  +        Test cases added:
  +        None, to-be-landed xhtml dom tests already cover this.
  +
  +        * khtml/xml/dom_textimpl.cpp:
  +        (TextImpl::rendererIsNeeded):
  +        One line change to prevent adding text objects as direct
  +        children to FrameSet objects in the render tree. 
  +
   2005-09-15  David Harrison  <harrison at apple.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  1.32      +1 -1      WebCore/khtml/xml/dom_textimpl.cpp
  
  Index: dom_textimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- dom_textimpl.cpp	14 Sep 2005 03:43:01 -0000	1.31
  +++ dom_textimpl.cpp	16 Sep 2005 06:36:18 -0000	1.32
  @@ -425,7 +425,7 @@
   
       RenderObject *par = parentNode()->renderer();
       
  -    if (par->isTable() || par->isTableRow() || par->isTableSection() || par->isTableCol())
  +    if (par->isTable() || par->isTableRow() || par->isTableSection() || par->isTableCol() || par->isFrameSet())
           return false;
       
       if (style->whiteSpace() == PRE)