[webkit-changes] cvs commit: WebCore/khtml khtml_part.cpp
Adele
adele at opensource.apple.com
Fri Jul 15 10:56:40 PDT 2005
adele 05/07/15 10:56:40
Modified: . Tag: Safari-2-0-branch ChangeLog
khtml Tag: Safari-2-0-branch khtml_part.cpp
Log:
Merged fix from TOT to Safari-2-0-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.4104.2.66 +14 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4104.2.65
retrieving revision 1.4104.2.66
diff -u -r1.4104.2.65 -r1.4104.2.66
--- ChangeLog 14 Jul 2005 21:48:31 -0000 1.4104.2.65
+++ ChangeLog 15 Jul 2005 17:56:31 -0000 1.4104.2.66
@@ -1,3 +1,17 @@
+2005-07-15 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-2-0-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 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-2-0-branch
No revision
No revision
1.311.8.9 +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.8.8
retrieving revision 1.311.8.9
diff -u -r1.311.8.8 -r1.311.8.9
--- khtml_part.cpp 13 Jul 2005 01:07:29 -0000 1.311.8.8
+++ khtml_part.cpp 15 Jul 2005 17:56:39 -0000 1.311.8.9
@@ -2055,7 +2055,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);
}
More information about the webkit-changes
mailing list