Changeset 2871 in webkit for trunk/JavaScriptCore/kjs/property_map.cpp

Timestamp:

Nov 25, 2002, 6:49:38 PM (23 years ago)

Author:

rjw

Message:

i Added a debug menu to turn back/forward cache on and off.

Off by default. Use with discretion. Still leaks like
a sieve. Useful to provide a sense of potential speed up.

• Debug/DebugUtilities.m: (-[DebugUtilities createDebugMenu]): (-[BrowserDocument validate_showDOMTree:]): (-[BrowserDocument toggleBackForwardEnabled:]):

Changes fro back/forward cache.

• History.subproj/WebHistoryItem.h:
• History.subproj/WebHistoryItem.m: (+[WebHistoryItem setUsePageCache:]): (+[WebHistoryItem usePageCache]):
• WebCoreSupport.subproj/WebBridge.m: (-[WebBridge saveDocumentToPageCache:]):
• WebView.subproj/WebFramePrivate.h:
• WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]): (-[WebFrame _canCachePage]): (-[WebFrame _setState:]):

Tweaked some debugging info.

• khtml/xml/dom_docimpl.cpp: (DocumentImpl::~DocumentImpl): (DocumentImpl::detach):

Added debugging info. Fixed property map save function.

• kjs/nodes.cpp: (FunctionCallNode::evaluate):
• kjs/property_map.cpp:

File:

• trunk/JavaScriptCore/kjs/property_map.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -186 +186 @@
 }
 
+#ifdef DEBUG_PROPERTIES
+static void printAttributes(int attributes)
+{
+    if (attributes == 0)
+        printf ("None ");
+    if (attributes & ReadOnly)
+        printf ("ReadOnly ");
+    if (attributes & DontEnum)
+        printf ("DontEnum ");
+    if (attributes & DontDelete)
+        printf ("DontDelete ");
+    if (attributes & Internal)
+        printf ("Internal ");
+    if (attributes & Function)
+        printf ("Function ");
+}
+#endif
+
 void PropertyMap::put(const Identifier &name, ValueImp *value, int attributes)
 {
@@ -191 +209 @@
 
     UString::Rep *rep = name._ustring.rep;
+    
+#ifdef DEBUG_PROPERTIES
+    printf ("adding property %s, attributes = 0x%08x (", name.ascii(), attributes);
+    printAttributes(attributes);
+    printf (")\n");
+#endif
     
 #if USE_SINGLE_ENTRY
@@ -419 +443 @@
     } else {
         for (int i = 0; i != _table->size; ++i)
-            if (_table->entries[i].key && _table->entries[i].attributes == 0)
+            if (_table->entries[i].key && (_table->entries[i].attributes == 0 || _table->entries[i].attributes == (DontDelete | Internal)))
+            //if (_table->entries[i].key)
                 ++count;
     }
@@ -428 +453 @@
         return;
     }
+    
     p._properties = new SavedProperty [count];
+    p._count = count;
     
     SavedProperty *prop = p._properties;
@@ -442 +469 @@
     } else {
         for (int i = 0; i != _table->size; ++i) {
-            if (_table->entries[i].key && _table->entries[i].attributes == 0) {
+            if (_table->entries[i].key && (_table->entries[i].attributes == 0 || _table->entries[i].attributes == (DontDelete | Internal))) {
+            //if (_table->entries[i].key) {
                 prop->key = Identifier(_table->entries[i].key);
                 prop->value = Value(_table->entries[i].value);
+                ++prop;
             }
         }
@@ -452 +481 @@
 void PropertyMap::restore(const SavedProperties &p)
 {
-    for (int i = 0; i != p._count; ++i)
+    for (int i = 0; i != p._count; ++i){
         put(p._properties[i].key, p._properties[i].value.imp(), 0);
+    }
 }