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

[Adele]

adele       05/08/12 11:25:10

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml    Tag: Safari-2-0-branch khtmlview.cpp
  Log:
          Added missing nil check from acid2 merge.
  
          * khtml/khtmlview.cpp: (KHTMLView::layout):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.112 +6 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.111
  retrieving revision 1.4104.2.112
  diff -u -r1.4104.2.111 -r1.4104.2.112
  --- ChangeLog	12 Aug 2005 08:47:27 -0000	1.4104.2.111
  +++ ChangeLog	12 Aug 2005 18:25:02 -0000	1.4104.2.112
  @@ -1,5 +1,11 @@
   2005-08-12  Adele Peterson  <adele at apple.com>
   
  +        Added missing nil check from acid2 merge.
  +
  +        * khtml/khtmlview.cpp: (KHTMLView::layout):
  +
  +2005-08-12  Adele Peterson  <adele at apple.com>
  +
           Merged fixes from TOT to Safari-2-0-branch
           <rdar://problem/4213775> Several fixes in WebCore's bidi algorithm
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.128.8.4 +1 -1      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.128.8.3
  retrieving revision 1.128.8.4
  diff -u -r1.128.8.3 -r1.128.8.4
  --- khtmlview.cpp	9 Aug 2005 23:52:11 -0000	1.128.8.3
  +++ khtmlview.cpp	12 Aug 2005 18:25:09 -0000	1.128.8.4
  @@ -603,7 +603,7 @@
       ScrollBarMode hMode = d->hmode;
       ScrollBarMode vMode = d->vmode;
       
  -    RenderObject* rootRenderer = document->documentElement()->renderer();
  +    RenderObject* rootRenderer = document->documentElement() ? document->documentElement()->renderer() : 0;
       if (document->isHTMLDocument()) {
           NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
           if (body && body->renderer()) {