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

[Timothy]

thatcher    05/11/30 14:39:56

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/xml Tag: Safari-1-3-branch dom_docimpl.cpp
  Log:
          Merged fix from TOT to Safari-1-3-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.335.2.37 +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.36
  retrieving revision 1.335.2.37
  diff -u -r1.335.2.36 -r1.335.2.37
  --- ChangeLog	30 Nov 2005 22:24:58 -0000	1.335.2.36
  +++ ChangeLog	30 Nov 2005 22:39:45 -0000	1.335.2.37
  @@ -2,6 +2,19 @@
   
           Merged fix from TOT to Safari-1-3-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-1-3-branch
  +
       2005-11-29  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Darin
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.211.4.14 +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.4.13
  retrieving revision 1.211.4.14
  diff -u -r1.211.4.13 -r1.211.4.14
  --- dom_docimpl.cpp	19 Nov 2005 02:47:11 -0000	1.211.4.13
  +++ dom_docimpl.cpp	30 Nov 2005 22:39:54 -0000	1.211.4.14
  @@ -2662,10 +2662,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());
  -                }
               }
           }
      }