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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e66bd1cc255f03498d72f622a3a7e2593bdf275d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 15 02:06:12 2003 +0000

            Fixed 3197162.  The regression was introduced with the change
            to preferences.  The old settings API was used to 'reset' the jscript
            other properties of the part.  This effectively always disabled
            javascript and prevented properties from being restored to the js
            property maps.
    
            Reviewed by trey.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::saveWindowProperties):
            (KWQKHTMLPart::saveLocationProperties):
            (KWQKHTMLPart::restoreWindowProperties):
            (KWQKHTMLPart::restoreLocationProperties):
            (KWQKHTMLPart::openURLFromPageCache):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b8cbf9b..9b4d65c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-03-14  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3197162.  The regression was introduced with the change
+        to preferences.  The old settings API was used to 'reset' the jscript
+        other properties of the part.  This effectively always disabled 
+        javascript and prevented properties from being restored to the js
+        property maps.
+        
+        Reviewed by trey.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveWindowProperties):
+        (KWQKHTMLPart::saveLocationProperties):
+        (KWQKHTMLPart::restoreWindowProperties):
+        (KWQKHTMLPart::restoreLocationProperties):
+        (KWQKHTMLPart::openURLFromPageCache):
+
 2003-03-14  David Hyatt  <hyatt at apple.com>
 
 	Make :target match the root element if no #fragment is specified in
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b8cbf9b..9b4d65c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-03-14  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3197162.  The regression was introduced with the change
+        to preferences.  The old settings API was used to 'reset' the jscript
+        other properties of the part.  This effectively always disabled 
+        javascript and prevented properties from being restored to the js
+        property maps.
+        
+        Reviewed by trey.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::saveWindowProperties):
+        (KWQKHTMLPart::saveLocationProperties):
+        (KWQKHTMLPart::restoreWindowProperties):
+        (KWQKHTMLPart::restoreLocationProperties):
+        (KWQKHTMLPart::openURLFromPageCache):
+
 2003-03-14  David Hyatt  <hyatt at apple.com>
 
 	Make :target match the root element if no #fragment is specified in
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1fff3bb..593d51e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -759,6 +759,8 @@ void KWQKHTMLPart::saveWindowProperties(SavedProperties *windowProperties)
 {
     KJS::Window *window;
     window = Window::retrieveWindow(this);
+    
+    ASSERT(window);
     if (window)
         window->saveProperties(*windowProperties);
 }
@@ -767,6 +769,7 @@ void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
 {
     KJS::Window *window;
     window = Window::retrieveWindow(this);
+    ASSERT(window);
     if (window)
         window->saveProperties(*locationProperties);
 }
@@ -775,6 +778,7 @@ void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
 {
     KJS::Window *window;
     window = Window::retrieveWindow(this);
+    ASSERT(window);
     if (window)
         window->restoreProperties(*windowProperties);
 }
@@ -785,6 +789,8 @@ void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties
     window = Window::retrieveWindow(this);
     if (window)
         window->location()->restoreProperties(*locationProperties);
+    else
+        printf ("KWQKHTMLPart::restoreLocationProperties  unable to find window\n");
 }
 
 void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
@@ -819,12 +825,6 @@ void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
     
     m_url = *url;
     
-    // set the javascript flags according to the current url
-    d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(m_url.host());
-    d->m_bJScriptDebugEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled();
-    d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(m_url.host());
-    d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(m_url.host());
-    
     // initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
     // data arrives) (Simon)
     if(m_url.protocol().startsWith( "http" ) && !m_url.host().isEmpty() && m_url.path().isEmpty()) {

-- 
WebKit Debian packaging