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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 71c4ca55a57b82db360534bab630f126c1d5ed97..ac274e7d9f834793de6f16f312004b938209bde4 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-03-23  Darin Adler  <darin@apple.com>
+
+        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.
+
 2006-03-23  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/function_object.cpp b/JavaScriptCore/kjs/function_object.cpp
index 80af858367820c515488fb80003081c06b4b979c..d11012cbe52cd035ba3c8bb2c35f5a2ef3120c40 100644 (file)
--- a/JavaScriptCore/kjs/function_object.cpp
+++ b/JavaScriptCore/kjs/function_object.cpp
@@ -2,7 +2,7 @@
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -164,7 +164,7 @@ bool FunctionObjectImp::implementsConstruct() const
 }
 
 // ECMA 15.3.2 The Function Constructor
-JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber)
+JSObject* FunctionObjectImp::construct(ExecState* exec, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
 {
   UString p("");
   UString body;
@@ -207,7 +207,7 @@ JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args, const
   scopeChain.push(exec->dynamicInterpreter()->globalObject());
   FunctionBodyNode *bodyNode = progNode.get();
 
-  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), bodyNode, scopeChain);
+  FunctionImp* fimp = new DeclaredFunctionImp(exec, functionName, bodyNode, scopeChain);
   
   // parse parameter list. throw syntax error on illegal identifiers
   int len = p.size();
@@ -250,13 +250,13 @@ JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args, const
 }
 
 // ECMA 15.3.2 The Function Constructor
-JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args)
+JSObject* FunctionObjectImp::construct(ExecState* exec, const List& args)
 {
-  return FunctionObjectImp::construct(exec, args, UString(), 0);
+  return construct(exec, args, "anonymous", UString(), 0);
 }
 
 // ECMA 15.3.1 The Function Constructor Called as a Function
-JSValue *FunctionObjectImp::callAsFunction(ExecState *exec, JSObject */*thisObj*/, const List &args)
+JSValue* FunctionObjectImp::callAsFunction(ExecState* exec, JSObject* /*thisObj*/, const List &args)
 {
-  return construct(exec,args);
+  return construct(exec, args);
 }

diff --git a/JavaScriptCore/kjs/function_object.h b/JavaScriptCore/kjs/function_object.h
index 9bcb412607ad55eb62f2cef9b85f5f23ac37e0f3..ee9cc60e2d8cfa2702e21c83b547e642d4552cf5 100644 (file)
--- a/JavaScriptCore/kjs/function_object.h
+++ b/JavaScriptCore/kjs/function_object.h
@@ -2,6 +2,7 @@
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
+ *  Copyright (C) 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -66,13 +67,13 @@ namespace KJS {
    */
   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);
   };
 
 } // namespace

diff --git a/JavaScriptCore/kjs/nodes2string.cpp b/JavaScriptCore/kjs/nodes2string.cpp
index 7516f6106f2f640ba9a9b37c0daf56f7f08f2145..cfc7ed047c8b7be56c619f26020c86ff1e4a0b29 100644 (file)
--- a/JavaScriptCore/kjs/nodes2string.cpp
+++ b/JavaScriptCore/kjs/nodes2string.cpp
@@ -707,7 +707,7 @@ void ParameterNode::streamTo(SourceStream &s) const
 
 void FuncDeclNode::streamTo(SourceStream &s) const
 {
-  s << "function " << ident << "(" << param << ")" << body;
+  s << SourceStream::Endl << "function " << ident << "(" << param << ")" << body;
 }
 
 void FuncExprNode::streamTo(SourceStream &s) const

diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index 30733d17d878939d34b1163e09b6d5146e2286de..bee49aa17138a0d5601e3b60c71e0fad849733ed 100644 (file)
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -3,7 +3,7 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -415,13 +415,13 @@ bool JSObject::implementsConstruct() const
   return false;
 }
 
-JSObject *JSObject::construct(ExecState */*exec*/, const List &/*args*/)
+JSObject* JSObject::construct(ExecState*, const List& /*args*/)
 {
   assert(false);
   return NULL;
 }
 
-JSObject *JSObject::construct(ExecState *exec, const List &args, const UString &/*sourceURL*/, int /*lineNumber*/)
+JSObject* JSObject::construct(ExecState* exec, const List& args, const Identifier& /*functionName*/, const UString& /*sourceURL*/, int /*lineNumber*/)
 {
   return construct(exec, args);
 }

diff --git a/JavaScriptCore/kjs/object.h b/JavaScriptCore/kjs/object.h
index c37b4e584f660f2a42f6c13223ff2e054cf8b0e3..9ea4e66a69c2d46b7f27ec6049e2d437176df905 100644 (file)
--- a/JavaScriptCore/kjs/object.h
+++ b/JavaScriptCore/kjs/object.h
@@ -3,7 +3,7 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -369,8 +369,8 @@ namespace KJS {
     /**
      * Implementation of the [[Construct]] internal property
      */
-    virtual JSObject *construct(ExecState *exec, const List &args);
-    virtual JSObject *construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber);
+    virtual JSObject* construct(ExecState* exec, const List& args);
+    virtual JSObject* construct(ExecState* exec, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber);
 
     /**
      * Whether or not the object implements the call() method. If this returns

diff --git a/JavaScriptCore/kxmlcore/HashMapPtrSpec.h b/JavaScriptCore/kxmlcore/HashMapPtrSpec.h
index 2bd26f2e73a01bf77b8233c9775ee26c37dbb085..58a6309bd77272cb47e19ce4140fa3bb47081397 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashMapPtrSpec.h
+++ b/JavaScriptCore/kxmlcore/HashMapPtrSpec.h
@@ -35,6 +35,8 @@ namespace KXMLCore {
     {
     };
 
+    template<typename P, typename Mapped> class PtrHashConstIteratorAdapter;
+
     template<typename P, typename Mapped>
     class PtrHashIteratorAdapter {
     private:
@@ -47,6 +49,7 @@ namespace KXMLCore {
         typedef ValueType *PointerType;
         
         friend class HashMap<P *, Mapped, PtrHash<P *>, HashTraits<P *>, HashTraits<Mapped> >;
+        friend class PtrHashConstIteratorAdapter<P, Mapped>;
         
     public:
         PtrHashIteratorAdapter() {}

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1d7d0acf6bda29ed5d46e3f04b96a826ed0872c9..9a76c70ffd36a75dc5a280df5d12aeb3663718f3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-23  Darin Adler  <darin@apple.com>
+
+        - 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.
+
 2006-03-23  Tim Omernick  <timo@apple.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/fast/js/function-names-expected.txt b/LayoutTests/fast/js/function-names-expected.txt
new file mode 100644 (file)
index 0000000..fbbc4b5
--- /dev/null
+++ b/LayoutTests/fast/js/function-names-expected.txt
@@ -0,0 +1,11 @@
+This test checks the names of functions constructed two different ways.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS new Function('1').toString().replace(/[ \n]+/g, ' ') is 'function anonymous() { 1; }'
+PASS document.documentElement.onclick.toString().replace(/[ \n]+/g, ' ') is 'function onclick(event) { 2; }'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

diff --git a/LayoutTests/fast/js/function-names.html b/LayoutTests/fast/js/function-names.html
new file mode 100644 (file)
index 0000000..9925ddf
--- /dev/null
+++ b/LayoutTests/fast/js/function-names.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="resources/js-test-style.css">
+<script src="resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="resources/function-names.js"></script>
+<script src="resources/js-test-post.js"></script>
+</body>
+</html>

diff --git a/LayoutTests/fast/js/resources/function-names.js b/LayoutTests/fast/js/resources/function-names.js
new file mode 100644 (file)
index 0000000..b417608
--- /dev/null
+++ b/LayoutTests/fast/js/resources/function-names.js
@@ -0,0 +1,10 @@
+description(
+"This test checks the names of functions constructed two different ways."
+);
+
+document.documentElement.setAttribute("onclick", "2");
+
+shouldBe("new Function('1').toString().replace(/[ \\n]+/g, ' ')", "'function anonymous() { 1; }'");
+shouldBe("document.documentElement.onclick.toString().replace(/[ \\n]+/g, ' ')", "'function onclick(event) { 2; }'");
+
+var successfullyParsed = true;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 884e7cf96c76b5910aa9faf5d16886e760e7cb94..cb03545f45a3768b41aa9c06227bbe8f9cd8a890 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,51 @@
+2006-03-23  Darin Adler  <darin@apple.com>
+
+        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.
+
 2006-03-23  Tim Omernick  <timo@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f9f5b7acf1fb32cf213ee27626a303bb5ae00683..7129c22217a8de5b8ab9baadcc29dc0271ae7bae 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -2487,6 +2487,7 @@
                        isa = PBXGroup;
                        children = (
                                65C97AF208EA908800ACD273 /* config.h */,
+                               651B2B6209D12891008808C6 /* generate-derived-sources */,
                                F58EF58E02DFDFB7018635CA /* WebCore.exp */,
                                BC1A3790097C6F970019F3D8 /* bindings */,
                                65BF021F097480EF00C43196 /* bridge */,
@@ -2504,7 +2505,6 @@
                                F523D2F302DE443B018635CA /* rendering */,
                                A8C0F6DC089701F100BA5114 /* WebCore+SVG */,
                                E1F0424309839389006694EA /* xml */,
-                               651B2B6209D12891008808C6 /* generate-derived-sources */,
                                656580EC09D12B20000E61D7 /* Derived Sources */,
                                089C1665FE841158C02AAC07 /* Resources */,
                                0867D69AFE84028FC02AAC07 /* Frameworks */,

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index fc13309812f7a7b62096aedb3ca294a61f6a4f2a..08337dc55f2358b88e547b3eb0e5b56a39e0a0b2 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2278,18 +2278,18 @@ bool Document::hasWindowEventListener(const AtomicString &eventType)
     return false;
 }
 
-PassRefPtr<EventListener> Document::createHTMLEventListener(const String& code, Node *node)
+PassRefPtr<EventListener> Document::createHTMLEventListener(const String& functionName, const String& code, Node *node)
 {
-    if (Frame *frm = frame()) {
-        if (KJSProxy *proxy = frm->jScript())
-            return proxy->createHTMLEventHandler(code, node);
-    }
+    if (Frame* frm = frame())
+        if (KJSProxy* proxy = frm->jScript())
+            return proxy->createHTMLEventHandler(functionName, code, node);
     return 0;
 }
 
 void Document::setHTMLWindowEventListener(const AtomicString& eventType, Attribute* attr)
 {
-    setHTMLWindowEventListener(eventType, createHTMLEventListener(attr->value(), 0));
+    setHTMLWindowEventListener(eventType,
+        createHTMLEventListener(attr->localName().domString(), attr->value(), 0));
 }
 
 void Document::dispatchImageLoadEventSoon(HTMLImageLoader *image)

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 50baaa0424a249979b14810624b20daed2a97ad3..7c39d3b522bafc8ca9960b830433c953b0361f06 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -405,7 +405,7 @@ public:
     void removeWindowEventListener(const AtomicString& eventType, EventListener*, bool useCapture);
     bool hasWindowEventListener(const AtomicString& eventType);
 
-    PassRefPtr<EventListener> createHTMLEventListener(const String& code, Node*);
+    PassRefPtr<EventListener> createHTMLEventListener(const String& functionName, const String& code, Node*);
     
     /**
      * Searches through the document, starting from fromNode, for the next selectable element that comes after fromNode.

diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index 2f7f959b49c8a626d40cb44544d4d8995f2a2f57..6f67ce916247aa1640c95d42c000ce6f11bc566f 100644 (file)
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -790,7 +790,8 @@ bool HTMLElement::checkDTD(const Node* newChild)
 
 void HTMLElement::setHTMLEventListener(const AtomicString& eventType, Attribute* attr)
 {
-    Element::setHTMLEventListener(eventType, getDocument()->createHTMLEventListener(attr->value(), this));
+    Element::setHTMLEventListener(eventType,
+        getDocument()->createHTMLEventListener(attr->localName().domString(), attr->value(), this));
 }
 
 }

diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index 4021e212ce101c4402232125ed979a9f53026c21..faa5e0bb3d54196409732455d1608dd9dc7f509c 100644 (file)
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -210,20 +210,19 @@ void JSEventListener::clearWindowObj()
 
 // -------------------------------------------------------------------------
 
-JSLazyEventListener::JSLazyEventListener(const String& _code, Window* _win, Node* _originalNode, int lineno)
-  : JSEventListener(0, _win, true),
-    code(_code),
-    parsed(false)
-{
-    lineNumber = lineno;
-
-    // We don't retain the original node, because we assume it
+JSLazyEventListener::JSLazyEventListener(const String& functionName, const String& code, Window* win, Node* node, int lineno)
+  : JSEventListener(0, win, true)
+  , m_functionName(functionName)
+  , code(code)
+  , parsed(false)
+  , lineNumber(lineno)
+  , originalNode(node)
+{
+    // We don't retain the original node because we assume it
     // will stay alive as long as this handler object is around
     // and we need to avoid a reference cycle. If JS transfers
     // this handler to another node, parseCode will be called and
     // then originalNode is no longer needed.
-    
-    originalNode = _originalNode;
 }
 
 JSObject* JSLazyEventListener::listenerObj() const
@@ -260,7 +259,7 @@ void JSLazyEventListener::parseCode() const
         UString sourceURL(frame->url().url());
         args.append(eventParameterName());
         args.append(jsString(code));
-        listener = constr->construct(exec, args, sourceURL, lineNumber); // ### is globalExec ok ?
+        listener = constr->construct(exec, args, m_functionName, sourceURL, lineNumber); // ### is globalExec ok ?
 
         if (exec->hadException()) {
             exec->clearException();
@@ -281,6 +280,7 @@ void JSLazyEventListener::parseCode() const
     }
 
     // no more need to keep the unparsed code around
+    m_functionName = String();
     code = String();
 
     if (listener)

diff --git a/WebCore/khtml/ecma/kjs_events.h b/WebCore/khtml/ecma/kjs_events.h
index 194e86628d911aa1e5e7b7f2c2077af6ace042a9..6b52c6b5b5643c7b2dee786c92845ff3626cacb8 100644 (file)
--- a/WebCore/khtml/ecma/kjs_events.h
+++ b/WebCore/khtml/ecma/kjs_events.h
@@ -80,12 +80,13 @@ namespace KJS {
 
     class JSLazyEventListener : public JSEventListener {
     public:
-        JSLazyEventListener(const WebCore::String& code, Window*, WebCore::Node*, int lineno = 0);
-        virtual JSObject *listenerObj() const;
+        JSLazyEventListener(const WebCore::String& functionName, const WebCore::String& code, Window*, WebCore::Node*, int lineno = 0);
+        virtual JSObject* listenerObj() const;
     private:
-        virtual JSValue *eventParameterName() const;
+        virtual JSValue* eventParameterName() const;
         void parseCode() const;
 
+        mutable WebCore::String m_functionName;
         mutable WebCore::String code;
         mutable bool parsed;
         int lineNumber;

diff --git a/WebCore/khtml/ecma/kjs_proxy.cpp b/WebCore/khtml/ecma/kjs_proxy.cpp
index c5cd32bb4b5230dfcacb3082530d39ab2157a68a..fdc8689b90ce4d58668fbc9f720a2ffc0ce8dfac 100644 (file)
--- a/WebCore/khtml/ecma/kjs_proxy.cpp
+++ b/WebCore/khtml/ecma/kjs_proxy.cpp
@@ -92,19 +92,19 @@ void KJSProxy::clear() {
   }
 }
 
-EventListener *KJSProxy::createHTMLEventHandler(const String& code, Node *node)
+EventListener* KJSProxy::createHTMLEventHandler(const String& functionName, const String& code, Node *node)
 {
     initScriptIfNeeded();
     JSLock lock;
-    return new JSLazyEventListener(code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
+    return new JSLazyEventListener(functionName, code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
 }
 
 #if SVG_SUPPORT
-EventListener *KJSProxy::createSVGEventHandler(const String& code, Node *node)
+EventListener* KJSProxy::createSVGEventHandler(const String& functionName, const String& code, Node *node)
 {
     initScriptIfNeeded();
     JSLock lock;
-    return new JSSVGLazyEventListener(code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
+    return new JSSVGLazyEventListener(functionName, code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
 }
 #endif
 

diff --git a/WebCore/khtml/ecma/kjs_proxy.h b/WebCore/khtml/ecma/kjs_proxy.h
index 734698b951aef1ac8714d907c456a3a2f667f160..15f79f1d99e81db0bed4cf6f69614796701532b9 100644 (file)
--- a/WebCore/khtml/ecma/kjs_proxy.h
+++ b/WebCore/khtml/ecma/kjs_proxy.h
@@ -42,9 +42,9 @@ public:
     ~KJSProxy();
     KJS::JSValue* evaluate(const String& filename, int baseLine, const String& code, Node*);
     void clear();
-    EventListener* createHTMLEventHandler(const String& code, Node*);
+    EventListener* createHTMLEventHandler(const String& functionName, const String& code, Node*);
 #if SVG_SUPPORT
-    EventListener* createSVGEventHandler(const String& code, Node*);
+    EventListener* createSVGEventHandler(const String& functionName, const String& code, Node*);
 #endif
     void finishedWithEvent(Event*);
     KJS::ScriptInterpreter *interpreter();

diff --git a/WebCore/ksvg2/events/JSSVGLazyEventListener.cpp b/WebCore/ksvg2/events/JSSVGLazyEventListener.cpp
index c7cddb675a941970250b17f3fc187e4344a133dc..bcb7bc586bd1d83c83c83e23b9ec325a14f966a6 100644 (file)
--- a/WebCore/ksvg2/events/JSSVGLazyEventListener.cpp
+++ b/WebCore/ksvg2/events/JSSVGLazyEventListener.cpp
@@ -28,8 +28,8 @@ using namespace KJS;
 
 namespace WebCore {
 
-JSSVGLazyEventListener::JSSVGLazyEventListener(const String& code, KJS::Window* win, Node* node, int lineno)
-    : JSLazyEventListener(code, win, node, lineno)
+JSSVGLazyEventListener::JSSVGLazyEventListener(const String& functionName, const String& code, KJS::Window* win, Node* node, int lineno)
+    : JSLazyEventListener(functionName, code, win, node, lineno)
 {
 }
 

diff --git a/WebCore/ksvg2/events/JSSVGLazyEventListener.h b/WebCore/ksvg2/events/JSSVGLazyEventListener.h
index 2dc941152ff217582ca6f2f246d886a4b1d39fe7..e8031136c7b95805cdb195064bad67056d9addc2 100644 (file)
--- a/WebCore/ksvg2/events/JSSVGLazyEventListener.h
+++ b/WebCore/ksvg2/events/JSSVGLazyEventListener.h
@@ -29,10 +29,11 @@ namespace WebCore {
 
     class JSSVGLazyEventListener : public KJS::JSLazyEventListener {
     public:
-        JSSVGLazyEventListener(const String& code, KJS::Window*, Node*, int lineno = 0);
+        JSSVGLazyEventListener(const String& functionName, const String& code, KJS::Window*, Node*, int lineno = 0);
     private:
-        virtual KJS::JSValue *eventParameterName() const;
+        virtual KJS::JSValue* eventParameterName() const;
     };
+
 }
 
 #endif // SVG_SUPPORT

diff --git a/WebCore/ksvg2/misc/SVGDocumentExtensions.cpp b/WebCore/ksvg2/misc/SVGDocumentExtensions.cpp
index a783a711df6ce8c347a3cc3dd0f84d13ff713de5..3240dc2a5298dcc1b59dc347bee02bfd978a65b8 100644 (file)
--- a/WebCore/ksvg2/misc/SVGDocumentExtensions.cpp
+++ b/WebCore/ksvg2/misc/SVGDocumentExtensions.cpp
@@ -42,12 +42,11 @@ SVGDocumentExtensions::~SVGDocumentExtensions()
     delete m_timeScheduler;
 }
 
-PassRefPtr<EventListener> SVGDocumentExtensions::createSVGEventListener(const String& code, Node *node)
+PassRefPtr<EventListener> SVGDocumentExtensions::createSVGEventListener(const String& functionName, const String& code, Node *node)
 {
-    if (Frame *frame = m_doc->frame()) {
-        if (KJSProxy *proxy = frame->jScript())
-            return proxy->createSVGEventHandler(code, node);
-    }
+    if (Frame* frame = m_doc->frame())
+        if (KJSProxy* proxy = frame->jScript())
+            return proxy->createSVGEventHandler(functionName, code, node);
     return 0;
 }
 

diff --git a/WebCore/ksvg2/misc/SVGDocumentExtensions.h b/WebCore/ksvg2/misc/SVGDocumentExtensions.h
index 8b7070301b758f4453c1613cdd16116e13d37acc..0a2f074ff803907afb9e425a52848599b23e22d4 100644 (file)
--- a/WebCore/ksvg2/misc/SVGDocumentExtensions.h
+++ b/WebCore/ksvg2/misc/SVGDocumentExtensions.h
@@ -31,18 +31,18 @@ using KXMLCore::PassRefPtr;
 
 namespace WebCore {
 
-class TimeScheduler;
 class Document;
 class EventListener;
-class String;
 class Node;
+class String;
+class TimeScheduler;
 
 class SVGDocumentExtensions {
 public:
     SVGDocumentExtensions(Document*);
     ~SVGDocumentExtensions();
     
-    PassRefPtr<EventListener> createSVGEventListener(const String& code, Node*);
+    PassRefPtr<EventListener> createSVGEventListener(const String& functionName, const String& code, Node*);
 
     TimeScheduler* timeScheduler() const { return m_timeScheduler; }
     

diff --git a/WebCore/ksvg2/svg/SVGElement.cpp b/WebCore/ksvg2/svg/SVGElement.cpp
index e7ee3143daaa9c9315a2e9cd0f7773e011504854..a374413b64cc732b9a569601f1886132b636247f 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGElement.cpp
@@ -108,7 +108,8 @@ AtomicString SVGElement::tryGetAttributeNS(const String& namespaceURI, const Str
 
 void SVGElement::addSVGEventListener(const AtomicString& eventType, const Attribute* attr)
 {
-    Element::setHTMLEventListener(eventType, getDocument()->accessSVGExtensions()->createSVGEventListener(attr->value(), this));
+    Element::setHTMLEventListener(eventType, getDocument()->accessSVGExtensions()->
+        createSVGEventListener(attr->localName().domString(), attr->value(), this));
 }
 
 void SVGElement::parseMappedAttribute(MappedAttribute *attr)

diff --git a/WebCore/ksvg2/svg/SVGSVGElement.cpp b/WebCore/ksvg2/svg/SVGSVGElement.cpp
index 2acadc017e5db70c97601d06af7fea98f6ea3683..6793cdd2c99d989e91dda967d239afa74bae319c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGSVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGSVGElement.cpp
@@ -227,7 +227,8 @@ void SVGSVGElement::addSVGWindowEventListner(const AtomicString& eventType, cons
 {
     // FIXME: None of these should be window events long term.
     // Once we propertly support SVGLoad, etc.
-    RefPtr<EventListener> listener = getDocument()->accessSVGExtensions()->createSVGEventListener(attr->value(), this);
+    RefPtr<EventListener> listener = getDocument()->accessSVGExtensions()->
+        createSVGEventListener(attr->localName().domString(), attr->value(), this);
     getDocument()->setHTMLWindowEventListener(eventType, listener.release());
 }