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

[Kevin]

kdecker     05/07/12 14:52:16

  Modified:    .        ChangeLog
               khtml    khtml_part.cpp
  Log:
           Reviewed by cblu.
  
  	Fixed:
  	  http://bugzilla.opendarwin.org/show_bug.cgi?id=3968
  	 <rdar://problem/4172645> REGRESSION: top frame only loads at banking site - http://www.skandiabanken.no
  
          Test cases added: None; This fixes a race condition that is not reproducible locally.
  
          * khtml/khtml_part.cpp:
          (KHTMLPart::scheduleLocationChange): 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.
  
  Revision  Changes    Path
  1.4415    +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4414
  retrieving revision 1.4415
  diff -u -r1.4414 -r1.4415
  --- ChangeLog	12 Jul 2005 20:26:37 -0000	1.4414
  +++ ChangeLog	12 Jul 2005 21:52:10 -0000	1.4415
  @@ -1,3 +1,16 @@
  +2005-07-12  Kevin Decker  <kdecker at apple.com>
  +
  +         Reviewed by cblu.
  +
  +	Fixed: 
  +	  http://bugzilla.opendarwin.org/show_bug.cgi?id=3968
  +	 <rdar://problem/4172645> REGRESSION: top frame only loads at banking site - http://www.skandiabanken.no
  +
  +        Test cases added: None; This fixes a race condition that is not reproducible locally.
  +
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::scheduleLocationChange): 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. 
  +
   2005-07-12  Beth Dakin  <bdakin at apple.com>
   
   	Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=3942 and marquee problems in Radar bug 
  
  
  
  1.327     +8 -0      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.326
  retrieving revision 1.327
  diff -u -r1.326 -r1.327
  --- khtml_part.cpp	9 Jul 2005 20:18:59 -0000	1.326
  +++ khtml_part.cpp	12 Jul 2005 21:52:15 -0000	1.327
  @@ -2069,6 +2069,14 @@
       // Handle a location change of a page with no document as a special case.
       // This may happen when a frame changes the location of another frame.
       d->m_scheduledRedirection = d->m_doc ? locationChangeScheduled : locationChangeScheduledDuringLoad;
  +    
  +    // 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) {
  +        stopLoading(true);   
  +    }
  +    
       d->m_delayRedirect = 0;
       d->m_redirectURL = url;
       d->m_redirectReferrer = referrer;