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

[Maciej]

mjs         05/06/13 00:27:08

  Modified:    .        ChangeLog
               khtml    khtml_part.cpp
  Log:
  	Patch from Andrew Wellington <proton at wiretapped.net>
          Reviewed by me.
  
  	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3302
  	(Safari crashes when going to acid2 test page once it's in cache)
  
          No test cases addded since the repro steps require use of tabbed browsing.
  
          * khtml/khtml_part.cpp:
          (KHTMLPart::handleFallbackContent): check for nil
  
  Revision  Changes    Path
  1.4262    +14 -1     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4261
  retrieving revision 1.4262
  diff -u -r1.4261 -r1.4262
  --- ChangeLog	13 Jun 2005 00:55:35 -0000	1.4261
  +++ ChangeLog	13 Jun 2005 07:27:04 -0000	1.4262
  @@ -1,3 +1,16 @@
  +2005-06-13  Maciej Stachowiak  <mjs at apple.com>
  +
  +	Patch from Andrew Wellington <proton at wiretapped.net>
  +        Reviewed by me.
  +
  +	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3302
  +	(Safari crashes when going to acid2 test page once it's in cache)
  +	
  +        No test cases addded since the repro steps require use of tabbed browsing.
  +
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::handleFallbackContent): check for nil
  +
   2005-06-12  Darin Adler  <darin at apple.com>
   
           - added expected test results for new tests
  @@ -8,7 +21,7 @@
   
   2005-06-11  Maciej Stachowiak  <mjs at apple.com>
   
  -        Patch from Nicholas Shanks  <contact at nickshanks.com>, by me.
  +        Patch from Nicholas Shanks <contact at nickshanks.com>, reviewed by me.
   
   	- Distinguish between pseudo-elements and pseudo-classes in CSS parsing.
   	http://bugzilla.opendarwin.org/show_bug.cgi?id=3375
  
  
  
  1.323     +2 -0      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.322
  retrieving revision 1.323
  diff -u -r1.322 -r1.323
  --- khtml_part.cpp	1 Jun 2005 23:49:48 -0000	1.322
  +++ khtml_part.cpp	13 Jun 2005 07:27:07 -0000	1.323
  @@ -5942,6 +5942,8 @@
       if (!renderPart)
           return;
       HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
  +    if (!elt)
  +        return;
       elt->renderFallbackContent();
   }