[webkit-changes] cvs commit: WebCore/khtml khtml_part.cpp
Adele
adele at opensource.apple.com
Tue Jul 12 18:08:37 PDT 2005
adele 05/07/12 18:08:36
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
<rdar://problem/4178198>
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.
Revision Changes Path
No revision
No revision
1.4108.4.37 +18 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4108.4.36
retrieving revision 1.4108.4.37
diff -u -r1.4108.4.36 -r1.4108.4.37
--- ChangeLog 13 Jul 2005 01:01:18 -0000 1.4108.4.36
+++ ChangeLog 13 Jul 2005 01:08:30 -0000 1.4108.4.37
@@ -1,6 +1,24 @@
2005-07-12 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-1-3-branch
+ <rdar://problem/4178198>
+
+ 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 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
<rdar://problem/4176180>
2005-07-07 Adele Peterson <adele at apple.com>
No revision
No revision
1.311.6.5 +8 -0 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.311.6.4
retrieving revision 1.311.6.5
diff -u -r1.311.6.4 -r1.311.6.5
--- khtml_part.cpp 13 Jul 2005 00:56:57 -0000 1.311.6.4
+++ khtml_part.cpp 13 Jul 2005 01:08:36 -0000 1.311.6.5
@@ -2047,6 +2047,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;
More information about the webkit-changes
mailing list