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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 9b72ff939adc8feac64e3ddf7974f79685d31e75
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 28 20:32:52 2003 +0000

            Reviewed by John.
    
    	- fixed 3157014 - Crash on disabling JavaScript and reloading livepage.apple.com
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::openURL): Move check of JavaScript setting and possible disabling from here...
            (KHTMLPart::begin): ... to here, to make sure it happens after clearing the interpreter.
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::resumeActions): Don't bother to restore timers if JavaScript is off.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9cb36ba..cb40c82 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3157014 - Crash on disabling JavaScript and reloading livepage.apple.com
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::openURL): Move check of JavaScript setting and possible disabling from here...
+        (KHTMLPart::begin): ... to here, to make sure it happens after clearing the interpreter.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::resumeActions): Don't bother to restore timers if JavaScript is off.
+
 2003-01-28  Trey Matteson  <trey at apple.com>
 
 	3158465 - REGRESSION: cursor turns into I-beam after clicking on most KWQ widgets
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9cb36ba..cb40c82 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3157014 - Crash on disabling JavaScript and reloading livepage.apple.com
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::openURL): Move check of JavaScript setting and possible disabling from here...
+        (KHTMLPart::begin): ... to here, to make sure it happens after clearing the interpreter.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::resumeActions): Don't bother to restore timers if JavaScript is off.
+
 2003-01-28  Trey Matteson  <trey at apple.com>
 
 	3158465 - REGRESSION: cursor turns into I-beam after clicking on most KWQ widgets
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index d76c970..ea6f287 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -463,7 +463,6 @@ bool KHTMLPart::openURL( const KURL &url )
   }
 
   // set the javascript flags according to the current url
-  d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
   d->m_bJScriptDebugEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled();
   d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host());
   d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
@@ -1316,6 +1315,11 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 #endif
 
   clear();
+
+  // Only do this after clearing the part, so that JavaScript can
+  // clean up properly if it was on for the last load.
+  d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
+
   d->m_bCleared = false;
   d->m_cacheId = 0;
   d->m_bComplete = false;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index aac79f6..5663f9e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -493,7 +493,7 @@ QMap<int, KJS::ScheduledAction*> *KWQKHTMLPart::pauseActions(const void *key)
 
 void KWQKHTMLPart::resumeActions(QMap<int, KJS::ScheduledAction*> *actions, const void *key)
 {
-    if (d->m_doc && d->m_jscript) {
+    if (d->m_doc && d->m_jscript && d->m_bJScriptEnabled) {
         KJS::Window *w = KJS::Window::retrieveWindow(this);
         w->resumeTimeouts(actions, key);
     }

-- 
WebKit Debian packaging