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

[Timothy]

thatcher    05/11/30 14:40:26

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/xml Tag: Safari-2-0-branch dom_docimpl.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      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.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.80  +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.79
  retrieving revision 1.1.2.80
  diff -u -r1.1.2.79 -r1.1.2.80
  --- ChangeLog	30 Nov 2005 22:24:09 -0000	1.1.2.79
  +++ ChangeLog	30 Nov 2005 22:40:15 -0000	1.1.2.80
  @@ -2,6 +2,19 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    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-29  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-11-29  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Darin
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.211.6.16 +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.211.6.15
  retrieving revision 1.211.6.16
  diff -u -r1.211.6.15 -r1.211.6.16
  --- dom_docimpl.cpp	19 Nov 2005 02:46:45 -0000	1.211.6.15
  +++ dom_docimpl.cpp	30 Nov 2005 22:40:23 -0000	1.211.6.16
  @@ -2666,10 +2666,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());
  -                }
               }
           }
      }