Changeset 23546 in webkit

Timestamp:

Jun 14, 2007 7:51:14 PM (17 years ago)

Author:

staikos

Message:

Add evaluateJavaScript() method

Location:

trunk/WebKitQt

Files:

• Api/qwebframe.cpp (modified) (2 diffs)
• Api/qwebframe.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKitQt/Api/qwebframe.cpp

@@ -49 +49 @@
 #include "bindings/runtime.h"
 #include "bindings/runtime_root.h"
+#include "kjs_proxy.h"
+#include "kjs_binding.h"
 #include "ExecState.h"
 #include "object.h"
@@ -390 +392 @@
 }
 
+QString QWebFrame::evaluateJavaScript(const QString& scriptSource)
+{
+    KJSProxy *proxy = d->frame->scriptProxy();
+    QString rc;
+    if (proxy) {
+        KJS::JSValue *v = proxy->evaluate(String(), 0, scriptSource, d->frame->document());
+        if (v) {
+            rc = String(v->toString(proxy->interpreter()->globalExec()));
+        }
+    }
+    return rc;
+}
+
 /*!\reimp
 */

trunk/WebKitQt/Api/qwebframe.h

@@ -57 +57 @@
     QList<QWebFrame*> childFrames() const;
 
+public Q_SLOTS:
+    QString evaluateJavaScript(const QString& scriptSource);
+
 signals:
     void cleared();

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-06-14  George Staikos  <staikos@kde.org>
+
+        Reviewed by Lars.
+
+        Add evaluateJavaScript() method.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::evaluateJavaScript):
+        * Api/qwebframe.h:
+
 2007-06-14  George Staikos  <staikos@kde.org>