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

[Adele]

adele       05/07/15 11:05:13

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml    Tag: Safari-1-3-branch khtml_part.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-07-15  Kevin Decker  <kdecker at apple.com>
  
          Reviewed by Adele
  
  	Fixed: http://bugzilla.opendarwin.org/show_bug.cgi?id=4009
          Test cases added: none, doesn't affect layout
  
          * khtml/khtml_part.cpp:
          (KHTMLPart::scheduleLocationChange): Corrected an earlier mistake of testing an always non-zero constant.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4108.4.46 +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4108.4.45
  retrieving revision 1.4108.4.46
  diff -u -r1.4108.4.45 -r1.4108.4.46
  --- ChangeLog	14 Jul 2005 19:51:13 -0000	1.4108.4.45
  +++ ChangeLog	15 Jul 2005 18:05:06 -0000	1.4108.4.46
  @@ -1,3 +1,17 @@
  +2005-07-15  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
  +    2005-07-15  Kevin Decker  <kdecker at apple.com>
  +
  +        Reviewed by Adele
  +
  +	Fixed: http://bugzilla.opendarwin.org/show_bug.cgi?id=4009
  +        Test cases added: none, doesn't affect layout
  +
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::scheduleLocationChange): Corrected an earlier mistake of testing an always non-zero constant. 
  +
   2005-07-14  Vicki Murley  <vicki at apple.com>
   
   	- merge this fix from HEAD
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.311.6.6 +1 -1      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.311.6.5
  retrieving revision 1.311.6.6
  diff -u -r1.311.6.5 -r1.311.6.6
  --- khtml_part.cpp	13 Jul 2005 01:08:36 -0000	1.311.6.5
  +++ khtml_part.cpp	15 Jul 2005 18:05:13 -0000	1.311.6.6
  @@ -2051,7 +2051,7 @@
       // If a redirect was scheduled during a load, then stop the current load.
       // Otherwise when the current load transitions from a provisional to a 
       // committed state, pending redirects may be cancelled. 
  -    if (locationChangeScheduledDuringLoad) {
  +    if (d->m_scheduledRedirection == locationChangeScheduledDuringLoad) {
           stopLoading(true);   
       }