Changeset 109599 in webkit

Timestamp:

Mar 2, 2012 12:30:59 PM (12 years ago)

Author:

arv@chromium.org

Message:

[V8] Make inline event attributes use evt for SVG and event otherwise
​https://bugs.webkit.org/show_bug.cgi?id=80167

Reviewed by Ojan Vafai.

Source/WebCore:

Test: fast/dom/inline-event-attributes-event-param-name.html

• bindings/v8/V8LazyEventListener.cpp:

(WebCore::V8LazyEventListener::prepareListenerObject):

LayoutTests:

• fast/dom/inline-event-attributes-event-param-name-expected.txt: Added.
• fast/dom/inline-event-attributes-event-param-name.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/inline-event-attributes-event-param-name-expected.txt (added)
• LayoutTests/fast/dom/inline-event-attributes-event-param-name.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/V8LazyEventListener.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-02  Erik Arvidsson  <arv@chromium.org>
+
+        [V8] Make inline event attributes use evt for SVG and event otherwise
+        https://bugs.webkit.org/show_bug.cgi?id=80167
+
+        Reviewed by Ojan Vafai.
+
+        * fast/dom/inline-event-attributes-event-param-name-expected.txt: Added.
+        * fast/dom/inline-event-attributes-event-param-name.html: Added.
+
 2012-03-02  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Erik Arvidsson  <arv@chromium.org>
+
+        [V8] Make inline event attributes use evt for SVG and event otherwise
+        https://bugs.webkit.org/show_bug.cgi?id=80167
+
+        Reviewed by Ojan Vafai.
+
+        Test: fast/dom/inline-event-attributes-event-param-name.html
+
+        * bindings/v8/V8LazyEventListener.cpp:
+        (WebCore::V8LazyEventListener::prepareListenerObject):
+
 2012-03-02  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/bindings/v8/V8LazyEventListener.cpp

@@ -116 +116 @@
     // Don't use new lines so that lines in the modified handler
     // have the same numbers as in the original code.
-    // FIXME: What about m_eventParameterName from JSLazyEventListener?
     // FIXME: This approach is a giant hack! What if m_code escapes to run
     //        arbitrary script?
-    String code = "(function (evt) {" \
+    String eventParameterName = m_isSVGEvent ? "evt" : "event";
+    String code = "(function(";
+    code.append(eventParameterName);
+    code.append(") {" \
             "with (this.ownerDocument ? this.ownerDocument : {}) {" \
             "with (this.form ? this.form : {}) {" \
             "with (this) {" \
-            "return (function(evt){";
+            "return (function(");
+    code.append(eventParameterName);
+    code.append("){");
     code.append(m_code);
     // Insert '\n' otherwise //-style comments could break the handler.
-    code.append(  "\n}).call(this, evt);}}}})");
+    code.append("\n}).call(this, ");
+    code.append(eventParameterName);
+    code.append(");}}}})");
     v8::Handle<v8::String> codeExternalString = v8ExternalString(code);
     v8::Handle<v8::Script> script = V8Proxy::compileScript(codeExternalString, m_sourceURL, m_position);
@@ -157 +163 @@
                 toStringResult.append(m_functionName);
                 toStringResult.append("(");
-                toStringResult.append(m_isSVGEvent ? "evt" : "event");
+                toStringResult.append(eventParameterName);
                 toStringResult.append(") {\n  ");
                 toStringResult.append(m_code);