Changeset 4612 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

Jul 10, 2003, 2:18:25 PM (22 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• fixed 3302021 - v74 and v85 hang with ​http://e-www.motorola.com/

The crux of this was saving and restoring the prototype objects
for all the standard types when saving and restoring for the page
cache.

• kjs/internal.cpp: (InterpreterImp::saveBuiltins): (InterpreterImp::restoreBuiltins):
• kjs/internal.h:
• kjs/interpreter.cpp: (Interpreter::saveBuiltins): (Interpreter::restoreBuiltins): (SavedBuiltins::SavedBuiltins): (SavedBuiltins::~SavedBuiltins):
• kjs/interpreter.h:
• kjs/property_map.cpp:

WebCore:

Reviewed by Darin.

• fixed 3302021 - v74 and v85 hang with ​http://e-www.motorola.com/
• fixed a bug with saving and restoring location object properties

• kwq/KWQKHTMLPart.h:
• kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::saveLocationProperties): Save the location object's properties, not the window's (!) (KWQKHTMLPart::saveInterpreterBuiltins): New function to save builtin properties of the interpeter. (KWQKHTMLPart::restoreInterpreterBuiltins): Similarly to restore them. (KWQKHTMLPart::openURLFromPageCache): Restore interpreter builtins too.
• kwq/KWQPageState.h:
• kwq/KWQPageState.mm: (-[KWQPageState initWithDocument:URL:windowProperties:locationProperties:interpreterBuiltins:]): Handle interpreter builtins. (-[KWQPageState invalidate]): Likewise. (-[KWQPageState dealloc]): Likewise. (-[KWQPageState interpreterBuiltins]): New method.
• kwq/WebCoreBridge.mm: (-[WebCoreBridge saveDocumentToPageCache]): Handle interpeter builtins.

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -212 +212 @@
   };
 
+  class SavedBuiltinsInternal {
+    friend class InterpreterImp;
+  private:
+    Object b_Object;
+    Object b_Function;
+    Object b_Array;
+    Object b_Boolean;
+    Object b_String;
+    Object b_Number;
+    Object b_Date;
+    Object b_RegExp;
+    Object b_Error;
+
+    Object b_ObjectPrototype;
+    Object b_FunctionPrototype;
+    Object b_ArrayPrototype;
+    Object b_BooleanPrototype;
+    Object b_StringPrototype;
+    Object b_NumberPrototype;
+    Object b_DatePrototype;
+    Object b_RegExpPrototype;
+    Object b_ErrorPrototype;
+
+    Object b_evalError;
+    Object b_rangeError;
+    Object b_referenceError;
+    Object b_syntaxError;
+    Object b_typeError;
+    Object b_uriError;
+
+    Object b_evalErrorPrototype;
+    Object b_rangeErrorPrototype;
+    Object b_referenceErrorPrototype;
+    Object b_syntaxErrorPrototype;
+    Object b_typeErrorPrototype;
+    Object b_uriErrorPrototype;
+  };
+
   class InterpreterImp {
     friend class Collector;
@@ -281 +319 @@
     void setContext(ContextImp *c) { _context = c; }
 
+    void saveBuiltins (SavedBuiltins &builtins) const;
+    void restoreBuiltins (const SavedBuiltins &builtins);
+
   private:
     void clear();