[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 3f05b75a120813de0da577f33d2cd8e5e4ee2f90
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 26 21:31:46 2002 +0000

    JavaScriptCore
            Remove debugging code.  Could be cause of performance regresssion.
            * kjs/nodes.cpp:
            (FunctionCallNode::evaluate):
    
            Restire attributes correctly.
            * kjs/property_map.cpp:
    
    WebKit        Only cache page if the load has completed.
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8efef0d..e8b6197 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-26  Richard Williamson   <rjw at apple.com>
+
+        Remove debugging code.  Could be cause of performance regresssion.
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+        Restire attributes correctly.
+        * kjs/property_map.cpp:
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Use delete[] (not delete) operator to delete array.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 8efef0d..e8b6197 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-26  Richard Williamson   <rjw at apple.com>
+
+        Remove debugging code.  Could be cause of performance regresssion.
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+        Restire attributes correctly.
+        * kjs/property_map.cpp:
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Use delete[] (not delete) operator to delete array.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 8efef0d..e8b6197 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-26  Richard Williamson   <rjw at apple.com>
+
+        Remove debugging code.  Could be cause of performance regresssion.
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+        Restire attributes correctly.
+        * kjs/property_map.cpp:
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Use delete[] (not delete) operator to delete array.
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 7d44324..e3fc7cc 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -738,10 +738,6 @@ Value FunctionCallNode::evaluate(ExecState *exec)
 
   Value v = ref.getValue(exec);
 
-    Object o = v.toObject(exec);
-    UString s = o.toString(exec);
-    //printf ("FunctionCallNode::evaluate  %s\n", s.ascii());
-    
   if (v.type() != ObjectType) {
 #ifndef NDEBUG
     printInfo(exec, "WARNING: Failed function call attempt on", v, line);
diff --git a/JavaScriptCore/kjs/property_map.cpp b/JavaScriptCore/kjs/property_map.cpp
index b0a426b..dcbda14 100644
--- a/JavaScriptCore/kjs/property_map.cpp
+++ b/JavaScriptCore/kjs/property_map.cpp
@@ -66,6 +66,7 @@ class SavedProperty {
 public:
     Identifier key;
     Value value;
+    int attributes;
 };
 
 SavedProperties::SavedProperties() : _count(0), _properties(0) { }
@@ -473,6 +474,7 @@ void PropertyMap::save(SavedProperties &p) const
             //if (_table->entries[i].key) {
                 prop->key = Identifier(_table->entries[i].key);
                 prop->value = Value(_table->entries[i].value);
+                prop->attributes = _table->entries[i].attributes;
                 ++prop;
             }
         }
@@ -482,7 +484,7 @@ void PropertyMap::save(SavedProperties &p) const
 void PropertyMap::restore(const SavedProperties &p)
 {
     for (int i = 0; i != p._count; ++i){
-        put(p._properties[i].key, p._properties[i].value.imp(), 0);
+        put(p._properties[i].key, p._properties[i].value.imp(), p._properties[i].attributes);
     }
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3834e92..15e2935 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-26  Richard Williamson   <rjw at apple.com>
+
+        Only cache page if the load has completed.
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
 2002-11-26  Chris Blumenberg  <cblu at apple.com>
 
 	Removed some logging.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3834e92..15e2935 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-11-26  Richard Williamson   <rjw at apple.com>
+
+        Only cache page if the load has completed.
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
 2002-11-26  Chris Blumenberg  <cblu at apple.com>
 
 	Removed some logging.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 30e7aaa..aa94477 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -588,7 +588,7 @@ static const char * const stateNames[] = {
         [[[self webView] frameScrollView] setDrawsBackground:NO];
 
         // Cache the page, if possible.
-        if ([self _canCachePage] && [_private->bridge canCachePage] && [_private currentItem]){
+        if ([self _canCachePage] && [_private->bridge canCachePage] && [_private currentItem] && ![[self dataSource] isLoading]){
             if (![[_private currentItem] pageCache]){
                 printf ("Saving page to back/forward cache, %s\n", [[[[self dataSource] URL] absoluteString] cString]);
                 [[_private currentItem] setHasPageCache: YES];

-- 
WebKit Debian packaging