Changeset 102656 in webkit

Timestamp:

Dec 12, 2011 8:07:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Implement the JavaScriptCore bindings for eventListenerHandlerLocation
​https://bugs.webkit.org/show_bug.cgi?id=74313

Patch by Konrad Piascik <​kpiascik@rim.com> on 2011-12-12
Reviewed by Geoffrey Garen.

Open any page in Web Inspector and look at the event listeners. They should now
link to the script which created them.

• bindings/js/ScriptEventListener.cpp:

(WebCore::eventListenerHandlerLocation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptEventListener.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Konrad Piascik  <kpiascik@rim.com>
+
+        2011-12-12  Konrad Piascik  <kpiascik@rim.com>
+
+        Implement the JavaScriptCore bindings for eventListenerHandlerLocation
+        https://bugs.webkit.org/show_bug.cgi?id=74313
+
+        Reviewed by Geoffrey Garen.
+
+        Open any page in Web Inspector and look at the event listeners. They should now
+        link to the script which created them.
+
+        * bindings/js/ScriptEventListener.cpp:
+        (WebCore::eventListenerHandlerLocation):
+
 2011-12-12  Yosifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/bindings/js/ScriptEventListener.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37 +38 @@
 #include "JSNode.h"
 #include "Frame.h"
+#include <runtime/Executable.h>
+#include <runtime/JSFunction.h>
 #include <runtime/JSLock.h>
 
@@ -104 +107 @@
 }
 
-bool eventListenerHandlerLocation(Document*, EventListener*, String&, int&)
+bool eventListenerHandlerLocation(Document* document, EventListener* eventListener, String& sourceName, int& lineNumber)
 {
-    // FIXME: Add support for getting function location.
-    return false;
+    const JSEventListener* jsListener = JSEventListener::cast(eventListener);
+    if (!jsListener)
+        return false;
+    JSC::JSObject* jsObject = jsListener->jsFunction(document);
+    if (!jsObject)
+        return false;
+    JSC::JSFunction* jsFunction = static_cast<JSFunction*>(jsObject);
+    if (!jsFunction || jsFunction->isHostFunction())
+        return false;
+    JSC::FunctionExecutable* funcExecutable = jsFunction->jsExecutable();
+    if (!funcExecutable)
+        return false;
+    lineNumber = funcExecutable->lineNo();
+    sourceName = ustringToString(funcExecutable->sourceURL());
+    return true;
 }