Changeset 13465 in webkit for trunk/JavaScriptCore/kjs/function_object.h

Timestamp:

Mar 23, 2006, 10:28:07 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7726 REGRESSION: orbitz calendar fails (JavaScript function serialization/parsing)

• kjs/object.h: Take function name, as well as source URL and line number, when using the special overloaded construct for making functions.
• kjs/object.cpp: (KJS::JSObject::construct): Ditto.
• kjs/function_object.h: Ditto.
• kjs/function_object.cpp: (FunctionObjectImp::construct): Pass a name when constructing the function rather than null. Use "anonymous" when making a function using the default function constructor.

• kjs/nodes2string.cpp: (FuncDeclNode::streamTo): Put a line break just before a function declaration.

• unrelated fix

• kxmlcore/HashMapPtrSpec.h: Add missing needed friend declaration.

LayoutTests:

• test for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7726 REGRESSION: orbitz calendar fails (JavaScript function serialization/parsing)

• fast/js/resources/function-names.js: Added.
• fast/js/function-names.html: Generated.
• fast/js/function-names-expected.txt: Generated.

WebCore:

Reviewed by Maciej.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7726 REGRESSION: orbitz calendar fails (JavaScript function serialization/parsing)

Test: fast/js/function-names.html

• dom/Document.h: Add function name parameter to createHTMLEventListener.
• dom/Document.cpp: (WebCore::Document::createHTMLEventListener): Pass function name when calling createHTMLEventHandler. (WebCore::Document::setHTMLWindowEventListener): Pass attribute name as function name when calling createHTMLEventListener.

• html/HTMLElement.cpp: (WebCore::HTMLElement::setHTMLEventListener): Pass attribute name as function name when calling createHTMLEventListener.

• khtml/ecma/kjs_events.h: Add a function name parameter to JSLazyEventListener.
• khtml/ecma/kjs_events.cpp: (KJS::JSLazyEventListener::JSLazyEventListener): Take and store a function name. (KJS::JSLazyEventListener::parseCode): Pass function name when constructing the function.

• khtml/ecma/kjs_proxy.h: Add a function name parameter to createHTMLEventHandler and createSVGEventHandler.
• khtml/ecma/kjs_proxy.cpp: (WebCore::KJSProxy::createHTMLEventHandler): Pass function name when creating a JSLazyEventListener. (WebCore::KJSProxy::createSVGEventHandler): Ditto.

• ksvg2/events/JSSVGLazyEventListener.h: Add a function name parameter to JSSVGLazyEventListener.
• ksvg2/events/JSSVGLazyEventListener.cpp: (WebCore::JSSVGLazyEventListener::JSSVGLazyEventListener): Pass the function name on to the base class constructor.

• ksvg2/misc/SVGDocumentExtensions.h: Add function name parameter to createSVGEventListener.
• ksvg2/misc/SVGDocumentExtensions.cpp: (WebCore::SVGDocumentExtensions::createSVGEventListener): Pass function name when calling createSVGEventHandler.

• ksvg2/svg/SVGElement.cpp: (WebCore::SVGElement::addSVGEventListener):
• ksvg2/svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::addSVGWindowEventListner): Pass attribute name as function name when calling createSVGEventListener.

• WebCore.xcodeproj/project.pbxproj: Moved generation script to the top.

File:

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

trunk/JavaScriptCore/kjs/function_object.h

@@ -3 +3 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
+ *  Copyright (C) 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -67 +68 @@
   class FunctionObjectImp : public InternalFunctionImp {
   public:
-    FunctionObjectImp(ExecState *exec, FunctionPrototype *funcProto);
+    FunctionObjectImp(ExecState*, FunctionPrototype*);
     virtual ~FunctionObjectImp();
 
     virtual bool implementsConstruct() const;
-    virtual JSObject *construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber);
-    virtual JSObject *construct(ExecState *exec, const List &args);
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
+    virtual JSObject* construct(ExecState*, const List& args);
+    virtual JSObject* construct(ExecState*, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber);
+    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List& args);
   };