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

[Adele]

adele       05/11/28 17:43:49

  Modified:    .        ChangeLog
               khtml/xml dom_docimpl.cpp
  Log:
          Reviewed by Justin.
  
          - <rdar://problem/4356593> Regression: Crash in scrollRectToVisible
  
          * khtml/xml/dom_docimpl.cpp: (DocumentImpl::setFocusNode):
          Make sure there's still a renderer after updating the layout.
  
  Revision  Changes    Path
  1.415     +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.414
  retrieving revision 1.415
  diff -u -r1.414 -r1.415
  --- ChangeLog	29 Nov 2005 01:35:06 -0000	1.414
  +++ ChangeLog	29 Nov 2005 01:43:44 -0000	1.415
  @@ -1,3 +1,12 @@
  +2005-11-28  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Justin.
  +
  +        - <rdar://problem/4356593> Regression: Crash in scrollRectToVisible
  +
  +        * khtml/xml/dom_docimpl.cpp: (DocumentImpl::setFocusNode): 
  +        Make sure there's still a renderer after updating the layout.
  +
   2005-11-28  Justin Garcia  <justin.garcia at apple.com>
   
           <http://bugzilla.opendarwin.org/show_bug.cgi?id=5354>
  
  
  
  1.279     +4 -3      WebCore/khtml/xml/dom_docimpl.cpp
  
  Index: dom_docimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
  retrieving revision 1.278
  retrieving revision 1.279
  diff -u -r1.278 -r1.279
  --- dom_docimpl.cpp	26 Nov 2005 22:35:44 -0000	1.278
  +++ dom_docimpl.cpp	29 Nov 2005 01:43:48 -0000	1.279
  @@ -2344,10 +2344,11 @@
                   focusWidget->setFocus();
               else {
                   view()->setFocus();
  -                if (m_focusNode->renderer()) {
  -                    updateLayout();
  +                // updateLayout in case this comes before a renderer is set up.
  +                updateLayout();
  +                // Check that there's still a renderer after updating the layout.
  +                if (m_focusNode->renderer())
                       m_focusNode->renderer()->enclosingLayer()->scrollRectToVisible(m_focusNode->getRect());
  -                }
               }
           }
      }