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

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.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -547 +547 @@
 }
 
-void InterpreterImp::initGlobalObject()
+ void InterpreterImp::initGlobalObject()
 {
   Identifier::init();
@@ -821 +821 @@
     d->detach(m_interpreter);
   dbg = d;
+}
+
+void InterpreterImp::saveBuiltins (SavedBuiltins &builtins) const
+{
+  if (!builtins._internal) {
+    builtins._internal = new SavedBuiltinsInternal;
+  }
+
+  builtins._internal->b_Object = b_Object;
+  builtins._internal->b_Function = b_Function;
+  builtins._internal->b_Array = b_Array;
+  builtins._internal->b_Boolean = b_Boolean;
+  builtins._internal->b_String = b_String;
+  builtins._internal->b_Number = b_Number;
+  builtins._internal->b_Date = b_Date;
+  builtins._internal->b_RegExp = b_RegExp;
+  builtins._internal->b_Error = b_Error;
+  
+  builtins._internal->b_ObjectPrototype = b_ObjectPrototype;
+  builtins._internal->b_FunctionPrototype = b_FunctionPrototype;
+  builtins._internal->b_ArrayPrototype = b_ArrayPrototype;
+  builtins._internal->b_BooleanPrototype = b_BooleanPrototype;
+  builtins._internal->b_StringPrototype = b_StringPrototype;
+  builtins._internal->b_NumberPrototype = b_NumberPrototype;
+  builtins._internal->b_DatePrototype = b_DatePrototype;
+  builtins._internal->b_RegExpPrototype = b_RegExpPrototype;
+  builtins._internal->b_ErrorPrototype = b_ErrorPrototype;
+  
+  builtins._internal->b_evalError = b_evalError;
+  builtins._internal->b_rangeError = b_rangeError;
+  builtins._internal->b_referenceError = b_referenceError;
+  builtins._internal->b_syntaxError = b_syntaxError;
+  builtins._internal->b_typeError = b_typeError;
+  builtins._internal->b_uriError = b_uriError;
+  
+  builtins._internal->b_evalErrorPrototype = b_evalErrorPrototype;
+  builtins._internal->b_rangeErrorPrototype = b_rangeErrorPrototype;
+  builtins._internal->b_referenceErrorPrototype = b_referenceErrorPrototype;
+  builtins._internal->b_syntaxErrorPrototype = b_syntaxErrorPrototype;
+  builtins._internal->b_typeErrorPrototype = b_typeErrorPrototype;
+  builtins._internal->b_uriErrorPrototype = b_uriErrorPrototype;
+}
+
+void InterpreterImp::restoreBuiltins (const SavedBuiltins &builtins)
+{
+  if (!builtins._internal) {
+    return;
+  }
+
+  b_Object = builtins._internal->b_Object;
+  b_Function = builtins._internal->b_Function;
+  b_Array = builtins._internal->b_Array;
+  b_Boolean = builtins._internal->b_Boolean;
+  b_String = builtins._internal->b_String;
+  b_Number = builtins._internal->b_Number;
+  b_Date = builtins._internal->b_Date;
+  b_RegExp = builtins._internal->b_RegExp;
+  b_Error = builtins._internal->b_Error;
+  
+  b_ObjectPrototype = builtins._internal->b_ObjectPrototype;
+  b_FunctionPrototype = builtins._internal->b_FunctionPrototype;
+  b_ArrayPrototype = builtins._internal->b_ArrayPrototype;
+  b_BooleanPrototype = builtins._internal->b_BooleanPrototype;
+  b_StringPrototype = builtins._internal->b_StringPrototype;
+  b_NumberPrototype = builtins._internal->b_NumberPrototype;
+  b_DatePrototype = builtins._internal->b_DatePrototype;
+  b_RegExpPrototype = builtins._internal->b_RegExpPrototype;
+  b_ErrorPrototype = builtins._internal->b_ErrorPrototype;
+  
+  b_evalError = builtins._internal->b_evalError;
+  b_rangeError = builtins._internal->b_rangeError;
+  b_referenceError = builtins._internal->b_referenceError;
+  b_syntaxError = builtins._internal->b_syntaxError;
+  b_typeError = builtins._internal->b_typeError;
+  b_uriError = builtins._internal->b_uriError;
+  
+  b_evalErrorPrototype = builtins._internal->b_evalErrorPrototype;
+  b_rangeErrorPrototype = builtins._internal->b_rangeErrorPrototype;
+  b_referenceErrorPrototype = builtins._internal->b_referenceErrorPrototype;
+  b_syntaxErrorPrototype = builtins._internal->b_syntaxErrorPrototype;
+  b_typeErrorPrototype = builtins._internal->b_typeErrorPrototype;
+  b_uriErrorPrototype = builtins._internal->b_uriErrorPrototype;
 }