[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit a8f7e4d3ebbf7d932878a15c6bf8905842d262c7
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 23 22:11:50 2002 +0000

    2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
    
            More work to fix this bug:
    
            Radar 2883631 (need to implement support for META HTTP_EQUIV=REFRESH)
    
            There was yet two more cases where the refresh timers were getting clobbered.
            Fixed.
    
            * khtml/ecma/kjs_window.cpp:
            (WindowQObject::parentDestroyed)
            * khtml/khtmlview.cpp:
            (KHTMLView::clear)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8621453..9c06dc0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
+
+        More work to fix this bug:
+
+        Radar 2883631 (need to implement support for META HTTP_EQUIV=REFRESH)
+
+        There was yet two more cases where the refresh timers were getting clobbered.
+        Fixed.
+
+	* khtml/ecma/kjs_window.cpp:
+	(WindowQObject::parentDestroyed)
+	* khtml/khtmlview.cpp:
+	(KHTMLView::clear)
+
 2002-05-23  Richard J. Williamson  <rjw at apple.com>
 
     Fixed crasher 2935757.  I still need to investigate the root cause
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8621453..9c06dc0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
+
+        More work to fix this bug:
+
+        Radar 2883631 (need to implement support for META HTTP_EQUIV=REFRESH)
+
+        There was yet two more cases where the refresh timers were getting clobbered.
+        Fixed.
+
+	* khtml/ecma/kjs_window.cpp:
+	(WindowQObject::parentDestroyed)
+	* khtml/khtmlview.cpp:
+	(KHTMLView::clear)
+
 2002-05-23  Richard J. Williamson  <rjw at apple.com>
 
     Fixed crasher 2935757.  I still need to investigate the root cause
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8621453..9c06dc0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-05-23  Kenneth Kocienda  <kocienda at apple.com>
+
+        More work to fix this bug:
+
+        Radar 2883631 (need to implement support for META HTTP_EQUIV=REFRESH)
+
+        There was yet two more cases where the refresh timers were getting clobbered.
+        Fixed.
+
+	* khtml/ecma/kjs_window.cpp:
+	(WindowQObject::parentDestroyed)
+	* khtml/khtmlview.cpp:
+	(KHTMLView::clear)
+
 2002-05-23  Richard J. Williamson  <rjw at apple.com>
 
     Fixed crasher 2935757.  I still need to investigate the root cause
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ebd7b6d..4de52d9 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1344,7 +1344,14 @@ WindowQObject::~WindowQObject()
 void WindowQObject::parentDestroyed()
 {
   //kdDebug(6070) << "WindowQObject::parentDestroyed " << this << " we have " << scheduledActions.count() << " actions in the map" << endl;
+#ifdef APPLE_CHANGES
+  QMapIterator<int,ScheduledAction*> myit;
+  for (myit = scheduledActions.begin(); myit != scheduledActions.end(); ++myit) {
+    killTimer(myit.key());
+  }
+#else
   killTimers();
+#endif
   QMapIterator<int,ScheduledAction*> it;
   for (it = scheduledActions.begin(); it != scheduledActions.end(); ++it) {
     ScheduledAction *action = *it;
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 6f72acc..7f3a466 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -293,7 +293,14 @@ void KHTMLView::clear()
     setStaticBackground(true);
 
     d->reset();
+#ifdef APPLE_CHANGES
+        killTimer(d->timerId);
+        killTimer(d->repaintTimerId);
+        d->timerId = 0;
+        d->repaintTimerId = 0;
+#else
     killTimers();
+#endif
     emit cleared();
 
     QScrollView::setHScrollBarMode(d->hmode);

-- 
WebKit Debian packaging