[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6a543c343b60317580720c0dd63f1dfa6151d2e8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 22 16:46:23 2003 +0000
Reviewed by John.
- fixed 3216039 -- calls to m_redirectionTimer.stop() do not always clear m_scheduledRedirection
* khtml/khtml_part.h: Added cancelRedirection().
* khtml/khtml_part.cpp:
(KHTMLPart::~KHTMLPart): Call cancelRedirection() instead of m_redirectionTimer.stop().
(KHTMLPart::restoreURL): Ditto.
(KHTMLPart::openURL): Ditto.
(KHTMLPart::closeURL): Ditto.
(KHTMLPart::cancelRedirection): Added. Sets m_scheduledRedirection to noRedirectionScheduled
and calls m_redirectionTimer.stop(), but is also safe to call after d is set to 0.
(KHTMLPart::restoreState): Call cancelRedirection() instead of m_redirectionTimer.stop().
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::openURLFromPageCache): Call cancelRedirection() instead of m_redirectionTimer.stop().
(KWQKHTMLPart::scrollToAnchor): Call cancelRedirection() instead of m_redirectionTimer.stop()
(and setting m_scheduledRedirection).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6da6788..b4b9566 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,24 @@
+2003-05-22 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3216039 -- calls to m_redirectionTimer.stop() do not always clear m_scheduledRedirection
+
+ * khtml/khtml_part.h: Added cancelRedirection().
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::~KHTMLPart): Call cancelRedirection() instead of m_redirectionTimer.stop().
+ (KHTMLPart::restoreURL): Ditto.
+ (KHTMLPart::openURL): Ditto.
+ (KHTMLPart::closeURL): Ditto.
+ (KHTMLPart::cancelRedirection): Added. Sets m_scheduledRedirection to noRedirectionScheduled
+ and calls m_redirectionTimer.stop(), but is also safe to call after d is set to 0.
+ (KHTMLPart::restoreState): Call cancelRedirection() instead of m_redirectionTimer.stop().
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::openURLFromPageCache): Call cancelRedirection() instead of m_redirectionTimer.stop().
+ (KWQKHTMLPart::scrollToAnchor): Call cancelRedirection() instead of m_redirectionTimer.stop()
+ (and setting m_scheduledRedirection).
+
2003-05-21 David Hyatt <hyatt at apple.com>
This patch deals with the main cause of regressions from
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6da6788..b4b9566 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2003-05-22 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3216039 -- calls to m_redirectionTimer.stop() do not always clear m_scheduledRedirection
+
+ * khtml/khtml_part.h: Added cancelRedirection().
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::~KHTMLPart): Call cancelRedirection() instead of m_redirectionTimer.stop().
+ (KHTMLPart::restoreURL): Ditto.
+ (KHTMLPart::openURL): Ditto.
+ (KHTMLPart::closeURL): Ditto.
+ (KHTMLPart::cancelRedirection): Added. Sets m_scheduledRedirection to noRedirectionScheduled
+ and calls m_redirectionTimer.stop(), but is also safe to call after d is set to 0.
+ (KHTMLPart::restoreState): Call cancelRedirection() instead of m_redirectionTimer.stop().
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::openURLFromPageCache): Call cancelRedirection() instead of m_redirectionTimer.stop().
+ (KWQKHTMLPart::scrollToAnchor): Call cancelRedirection() instead of m_redirectionTimer.stop()
+ (and setting m_scheduledRedirection).
+
2003-05-21 David Hyatt <hyatt at apple.com>
This patch deals with the main cause of regressions from
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 77b2e01..7e4f00e 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -287,7 +287,7 @@ KHTMLPart::~KHTMLPart()
#endif
stopAutoScroll();
- d->m_redirectionTimer.stop();
+ cancelRedirection();
if (!d->m_bComplete)
closeURL();
@@ -320,7 +320,7 @@ bool KHTMLPart::restoreURL( const KURL &url )
{
kdDebug( 6050 ) << "KHTMLPart::restoreURL " << url.url() << endl;
- d->m_redirectionTimer.stop();
+ cancelRedirection();
/*
* That's not a good idea as it will call closeURL() on all
@@ -367,7 +367,7 @@ bool KHTMLPart::openURL( const KURL &url )
{
kdDebug( 6050 ) << "KHTMLPart(" << this << ")::openURL " << url.url() << endl;
- d->m_redirectionTimer.stop();
+ cancelRedirection();
#if !APPLE_CHANGES
// check to see if this is an "error://" URL. This is caused when an error
@@ -574,8 +574,7 @@ bool KHTMLPart::closeURL()
d->m_bPendingChildRedirection = false;
// Stop any started redirections as well!! (DA)
- if ( d && d->m_redirectionTimer.isActive() )
- d->m_redirectionTimer.stop();
+ cancelRedirection();
// null node activated.
emit nodeActivated(Node());
@@ -1858,6 +1857,14 @@ void KHTMLPart::scheduleHistoryNavigation( int steps )
}
}
+void KHTMLPart::cancelRedirection()
+{
+ if (d) {
+ d->m_scheduledRedirection = noRedirectionScheduled;
+ d->m_redirectionTimer.stop();
+ }
+}
+
void KHTMLPart::slotRedirect()
{
if (d->m_scheduledRedirection == historyNavigationScheduled) {
@@ -3742,7 +3749,7 @@ void KHTMLPart::restoreState( QDataStream &stream )
if (d->m_cacheId == old_cacheId)
{
// Partial restore
- d->m_redirectionTimer.stop();
+ cancelRedirection();
FrameIt fIt = d->m_frames.begin();
FrameIt fEnd = d->m_frames.end();
@@ -5299,7 +5306,6 @@ int KHTMLPart::topLevelFrameCount()
return frameCount;
}
-
using namespace KParts;
#include "khtml_part.moc"
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 18d2efa..c89fd72 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1075,6 +1075,8 @@ private:
bool checkLinkSecurity(const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null);
QVariant executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script);
+
+ void cancelRedirection();
KJSProxy *jScript();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 24e6b3e..ba03b6a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -965,7 +965,7 @@ void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
SavedProperties *locationProperties = [state locationProperties];
QMap<int, ScheduledAction*> *actions = [state pausedActions];
- d->m_redirectionTimer.stop();
+ cancelRedirection();
// We still have to close the previous part page.
if (!d->m_restored){
@@ -1250,8 +1250,7 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
// that a higher level already checked that the URLs match and the scrolling is the right thing to do.
void KWQKHTMLPart::scrollToAnchor(const KURL &URL)
{
- d->m_redirectionTimer.stop();
- d->m_scheduledRedirection = noRedirectionScheduled;
+ cancelRedirection();
m_url = URL;
started(0);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list